From 970cb32b4566c08b0ed5b57ae200fb9299f1f0d9 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sun, 30 Mar 2014 01:17:22 +0700
Subject: [PATCH] Fix deprecated method, unused parts, initial definition, and
 @method annotation

---
 samples/Sample_13_Images.php       | 2 +-
 src/PhpWord/DocumentProperties.php | 9 ---------
 src/PhpWord/Media.php              | 1 +
 src/PhpWord/Shared/XMLWriter.php   | 1 +
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index 6841ed64..cf467464 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -17,7 +17,7 @@ $section->addTextBreak(2);
 
 $source = 'http://php.net/images/logos/php-med-trans-light.gif';
 $section->addText("Remote image from: {$source}");
-$section->addMemoryImage($source);
+$section->addImage($source);
 // End code
 
 // Save file
diff --git a/src/PhpWord/DocumentProperties.php b/src/PhpWord/DocumentProperties.php
index cc24e35a..5e982646 100644
--- a/src/PhpWord/DocumentProperties.php
+++ b/src/PhpWord/DocumentProperties.php
@@ -476,41 +476,33 @@ class DocumentProperties
         switch ($propertyType) {
             case 'empty': //    Empty
                 return '';
-                break;
             case 'null': //    Null
                 return null;
-                break;
             case 'i1': //    1-Byte Signed Integer
             case 'i2': //    2-Byte Signed Integer
             case 'i4': //    4-Byte Signed Integer
             case 'i8': //    8-Byte Signed Integer
             case 'int': //    Integer
                 return (int) $propertyValue;
-                break;
             case 'ui1': //    1-Byte Unsigned Integer
             case 'ui2': //    2-Byte Unsigned Integer
             case 'ui4': //    4-Byte Unsigned Integer
             case 'ui8': //    8-Byte Unsigned Integer
             case 'uint': //    Unsigned Integer
                 return abs((int) $propertyValue);
-                break;
             case 'r4': //    4-Byte Real Number
             case 'r8': //    8-Byte Real Number
             case 'decimal': //    Decimal
                 return (float) $propertyValue;
-                break;
             case 'lpstr': //    LPSTR
             case 'lpwstr': //    LPWSTR
             case 'bstr': //    Basic String
                 return $propertyValue;
-                break;
             case 'date': //    Date and Time
             case 'filetime': //    File Time
                 return strtotime($propertyValue);
-                break;
             case 'bool': //    Boolean
                 return ($propertyValue == 'true') ? true : false;
-                break;
             case 'cy': //    Currency
             case 'error': //    Error Status Code
             case 'vector': //    Vector
@@ -525,7 +517,6 @@ class DocumentProperties
             case 'clsid': //    Class ID
             case 'cf': //    Clipboard Data
                 return $propertyValue;
-                break;
         }
 
         return $propertyValue;
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
index 80cde281..a9a9a6af 100755
--- a/src/PhpWord/Media.php
+++ b/src/PhpWord/Media.php
@@ -242,6 +242,7 @@ class Media
             $cImg = self::countFooterMediaElements($key);
             $rID = $cImg + 1;
             $cImg++;
+            $media = array();
             $isMemImage = false;
             if (!is_null($image)) {
                 $isMemImage = $image->getIsMemImage();
diff --git a/src/PhpWord/Shared/XMLWriter.php b/src/PhpWord/Shared/XMLWriter.php
index 5b21e7b1..e27013d5 100644
--- a/src/PhpWord/Shared/XMLWriter.php
+++ b/src/PhpWord/Shared/XMLWriter.php
@@ -20,6 +20,7 @@ if (!defined('DATE_W3C')) {
 /**
  * XMLWriter wrapper
  *
+ * @method bool writeElement(string $name, string $content = null)
  * @method bool startElement(string $name)
  * @method bool writeAttribute(string $name, string $value)
  * @method bool endElement()