From dc6c487cd02afbf135463db364f61f768afa6597 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sat, 24 May 2014 23:07:34 +0700
Subject: [PATCH] Fix test error

---
 src/PhpWord/Element/Image.php                  | 10 +++++++---
 src/PhpWord/Settings.php                       |  2 +-
 src/PhpWord/Shared/Html.php                    |  4 ++--
 src/PhpWord/Writer/Word2007/Part/Numbering.php |  1 -
 tests/PhpWord/Tests/Element/ImageTest.php      |  1 +
 tests/PhpWord/Tests/Element/SectionTest.php    |  2 +-
 tests/PhpWord/Tests/SettingsTest.php           |  2 +-
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index de859ad2..a1cb8250 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -312,9 +312,13 @@ class Image extends AbstractElement
         } else {
             $actualSource = $source;
         }
-        if ($actualSource === null) {
-            return null;
-        }
+
+        // Can't find any case where $actualSource = null hasn't captured by
+        // preceding exceptions. Please uncomment when you find the case and
+        // put the case into Element\ImageTest.
+        // if ($actualSource === null) {
+        //     return null;
+        // }
 
         // Read image binary data and convert to hex/base64 string
         if ($this->sourceType == self::SOURCE_GD) {
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 8d9e2ace..cb74389a 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -344,7 +344,7 @@ class Settings
         // Parse config file
         $config = array();
         if ($configFile !== null) {
-            $config = parse_ini_file($configFile);
+            $config = @parse_ini_file($configFile);
             if ($config === false) {
                 return $config;
             }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 4faacfb1..501d2404 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -214,7 +214,7 @@ class Html
              */
             case 'li':
                 $cNodes = $node->childNodes;
-                if ($cNodes->length > 0) {
+                if (count($cNodes) > 0) {
                     $text = '';
                     foreach ($cNodes as $cNode) {
                         if ($cNode->nodeName == '#text') {
@@ -240,7 +240,7 @@ class Html
          */
         if ($node->nodeName != 'li') {
             $cNodes = $node->childNodes;
-            if ($cNodes->length > 0) {
+            if (count($cNodes) > 0) {
                 foreach ($cNodes as $cNode) {
                     self::parseNode($cNode, $newobject, $styles, $data);
                 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Numbering.php b/src/PhpWord/Writer/Word2007/Part/Numbering.php
index df5abd9b..05cbf7b9 100644
--- a/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -145,7 +145,6 @@ class Numbering extends AbstractPart
         $xmlWriter->startElement('w:tab');
         $xmlWriter->writeAttribute('w:val', 'num');
         $xmlWriter->writeAttributeIf($tabPos !== null, 'w:pos', $tabPos);
-        $xmlWriter->writeAttribute('w:pos', $tabPos);
         $xmlWriter->endElement(); // w:tab
         $xmlWriter->endElement(); // w:tabs
 
diff --git a/tests/PhpWord/Tests/Element/ImageTest.php b/tests/PhpWord/Tests/Element/ImageTest.php
index b04b5fe6..11b33d87 100644
--- a/tests/PhpWord/Tests/Element/ImageTest.php
+++ b/tests/PhpWord/Tests/Element/ImageTest.php
@@ -38,6 +38,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($oImage->getSource(), $src);
         $this->assertEquals($oImage->getMediaId(), md5($src));
         $this->assertEquals($oImage->isWatermark(), false);
+        $this->assertEquals($oImage->getSourceType(), Image::SOURCE_LOCAL);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oImage->getStyle());
     }
 
diff --git a/tests/PhpWord/Tests/Element/SectionTest.php b/tests/PhpWord/Tests/Element/SectionTest.php
index 271e81e3..af7595e2 100644
--- a/tests/PhpWord/Tests/Element/SectionTest.php
+++ b/tests/PhpWord/Tests/Element/SectionTest.php
@@ -73,7 +73,7 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     {
         $expected = 'landscape';
         $object = new Section(0);
-        $object->setSettings(array('orientation' => $expected));
+        $object->setSettings(array('orientation' => $expected, 'foo' => null));
         $this->assertEquals($expected, $object->getSettings()->getOrientation());
     }
 
diff --git a/tests/PhpWord/Tests/SettingsTest.php b/tests/PhpWord/Tests/SettingsTest.php
index 36565eb1..61364034 100644
--- a/tests/PhpWord/Tests/SettingsTest.php
+++ b/tests/PhpWord/Tests/SettingsTest.php
@@ -111,6 +111,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.ini.dist'));
 
         // Test with invalid file
-        $this->assertEmpty(Settings::loadConfig(__DIR__ . '/files/xsl/passthrough.xsl'));
+        $this->assertEmpty(Settings::loadConfig(__DIR__ . '/../../../phpunit.xml.dist'));
     }
 }