Still More Coverage

Author: oleibman

src/PhpWord/Reader/Word2007/Footnotes.php

@@ -81,16 +81,19 @@ public function read(PhpWord $phpWord): void
      */
     private function getElement(PhpWord $phpWord, $relationId)
     {
+        $returnVal = null;
         $getMethod = "get{$this->collection}";
         $collection = $phpWord->$getMethod()->getItems();
 
         //not found by key, looping to search by relationId
         foreach ($collection as $collectionElement) {
             if ($collectionElement->getRelationId() == $relationId) {
-                return $collectionElement;
+                $returnVal = $collectionElement;
+
+                break;
             }
         }
 
-        return null;
+        return $returnVal;
     }
 }

src/PhpWord/Shared/Css.php

@@ -41,19 +41,17 @@ public function process(): void
         $cssContent = str_replace(["\r", "\n"], '', $this->cssContent);
         preg_match_all('/(.+?)\s?\{\s?(.+?)\s?\}/', $cssContent, $cssExtracted);
         // Check if there are x selectors and x rules
-        if (count($cssExtracted[1]) != count($cssExtracted[2])) {
-            return;
-        }
-
-        foreach ($cssExtracted[1] as $key => $selector) {
-            $rules = trim($cssExtracted[2][$key]);
-            $rules = explode(';', $rules);
-            foreach ($rules as $rule) {
-                if (empty($rule)) {
-                    continue;
+        if (count($cssExtracted[1]) === count($cssExtracted[2])) {
+            foreach ($cssExtracted[1] as $key => $selector) {
+                $rules = trim($cssExtracted[2][$key]);
+                $rules = explode(';', $rules);
+                foreach ($rules as $rule) {
+                    if (empty($rule)) {
+                        continue;
+                    }
+                    [$key, $value] = explode(':', trim($rule));
+                    $this->styles[$this->sanitize($selector)][$this->sanitize($key)] = $this->sanitize($value);
                 }
-                [$key, $value] = explode(':', trim($rule));
-                $this->styles[$this->sanitize($selector)][$this->sanitize($key)] = $this->sanitize($value);
             }
         }
     }

src/PhpWord/Shared/Text.php

@@ -18,11 +18,8 @@
 
 namespace PhpOffice\PhpWord\Shared;
 
-use PhpOffice\PhpWord\Exception\Exception;
+use PhpOffice\PhpWord\Exception\Exception as WordException;
 
-/**
- * Text.
- */
 class Text
 {
     /**
@@ -37,6 +34,9 @@ class Text
      */
     private static function buildControlCharacters(): void
     {
+        if (!empty(self::$controlCharacters)) {
+            return;
+        }
         for ($i = 0; $i <= 19; ++$i) {
             if ($i != 9 && $i != 10 && $i != 13) {
                 $find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
@@ -63,9 +63,7 @@ private static function buildControlCharacters(): void
      */
     public static function controlCharacterPHP2OOXML($value = '')
     {
-        if (empty(self::$controlCharacters)) {
-            self::buildControlCharacters();
-        }
+        self::buildControlCharacters();
 
         return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $value);
     }
@@ -119,9 +117,7 @@ public static function chr($dec)
      */
     public static function controlCharacterOOXML2PHP($value = '')
     {
-        if (empty(self::$controlCharacters)) {
-            self::buildControlCharacters();
-        }
+        self::buildControlCharacters();
 
         return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $value);
     }
@@ -149,15 +145,26 @@ public static function toUTF8($value = '')
     {
         if (null !== $value && !self::isUTF8($value)) {
             // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
-            $value = (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+            $value = static::mbConvertEncoding($value);
             if ($value === false) {
-                throw new Exception('Unable to convert text to UTF-8');
+                throw new WordException('Unable to convert text to UTF-8');
             }
         }
 
         return $value;
     }
 
+    /**
+     * @param string $value
+     *
+     * @return false|string
+     */
+    protected static function mbConvertEncoding($value)
+    {
+        // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
+        return (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+    }
+
     /**
      * Returns unicode from UTF8 text.
      *

src/PhpWord/Writer/EPub3.php

@@ -72,14 +72,12 @@ public function save(string $filename): void
 
         // Add other files
         foreach ($this->parts as $partName => $fileName) {
-            if ($fileName === '') {
-                continue;
+            if ($fileName !== '') {
+                $part = $this->getWriterPart($partName);
+                if ($part instanceof AbstractPart) {
+                    $zip->addFromString($fileName, $part->write());
+                }
             }
-            $part = $this->getWriterPart($partName);
-            if (!$part instanceof AbstractPart) {
-                continue;
-            }
-            $zip->addFromString($fileName, $part->write());
         }
 
         // Close zip archive

tests/PhpWordTests/Shared/Text2.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWordTests\Shared;
+
+class Text2 extends \PhpOffice\PhpWord\Shared\Text
+{
+    /**
+     * @param string $value
+     *
+     * @return false|string
+     */
+    protected static function mbConvertEncoding($value)
+    {
+        return false;
+    }
+}

tests/PhpWordTests/Shared/TextTest.php

@@ -18,6 +18,7 @@
 
 namespace PhpOffice\PhpWordTests\Shared;
 
+use PhpOffice\PhpWord\Exception\Exception as WordException;
 use PhpOffice\PhpWord\Shared\Text;
 
 /**
@@ -87,4 +88,11 @@ public function testRemoveUnderscorePrefix(): void
     {
         self::assertEquals('item', Text::removeUnderscorePrefix('_item'));
     }
+
+    public function testFailToUtf8(): void
+    {
+        $this->expectException(WordException::class);
+        $this->expectExceptionMessage('Unable to convert text to UTF-8');
+        Text2::toUTF8("\x80");
+    }
 }

tests/PhpWordTests/SampleTest.php tests/PhpWordTests/ZampleTest.phptests/PhpWordTests/SampleTest.php renamed to tests/PhpWordTests/ZampleTest.php

@@ -23,7 +23,7 @@
 use RegexIterator;
 use RuntimeException;
 
-class SampleTest extends TestCase
+class ZampleTest extends TestCase
 {
     /** @var bool */
     protected static $alwaysTrue = true;