fixes

Author: Javier Garcia

src/PhpWord/Shared/Html.php

@@ -20,9 +20,9 @@
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
-use PhpOffice\PhpWord\Settings;
 
 /**
  * Common Html functions
@@ -50,7 +50,7 @@ class Html
      *                + IMG_SRC_SEARCH: optional to speed up images loading from remote url when files can be found locally
      *                + IMG_SRC_REPLACE: optional to speed up images loading from remote url when files can be found locally
      */
-    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null )
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null)
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
@@ -303,9 +303,8 @@ private static function parseSpan($node, &$styles)
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
      */
-    private static function parseTable($node, $element, &$styles )
+    private static function parseTable($node, $element, &$styles)
     {
-
         $elementStyles = self::parseInlineStyle($node, $styles['table']);
 
         $newElement = $element->addTable($elementStyles);
@@ -656,45 +655,46 @@ private static function parseImage($node, $element)
                     break;
             }
         }
-        if( strpos( $src, "data:image" ) !== false ){
-  				if( ! is_dir( self::$imgdir ) )
-  					mkdir( self::$imgdir ) ;
-
-  				$match = array();
-  				preg_match( '/data:image\/(\w+);base64,(.+)/', $src, $match );
+        if (strpos($src, 'data:image') !== false) {
+            if (!is_dir(self::$imgdir)) {
+                mkdir(self::$imgdir);
+            }
 
-  				$src = $imgFile = self::$imgdir . uniqid() . "." . $match[1];
+            $match = array();
+            preg_match('/data:image\/(\w+);base64,(.+)/', $src, $match);
 
-  				$ifp = fopen( $imgFile, "wb");
+            $src = $imgFile = self::$imgdir . uniqid() . '.' . $match[1];
 
-  			  fwrite($ifp, base64_decode( $match[2] ) );
-  			  fclose($ifp);
+            $ifp = fopen($imgFile, 'wb');
 
-  			}
-  			$src= urldecode($src);
+            fwrite($ifp, base64_decode($match[2]));
+            fclose($ifp);
+        }
+        $src = urldecode($src);
 
-  			if( ! is_file( $src )
+        if (!is_file($src)
             && !is_null(self::$options)
             && isset(self::$options['IMG_SRC_SEARCH'])
-            && isset(self::$options['IMG_SRC_REPLACE'])){
-  				$src = str_replace( self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src );
-  			}
-
-  			if(! is_file($src)){
-  				if($imgBlob=file_get_contents($src)){
-            $tmpDir= Settings::getTempDir().'/';
-  					if( ! is_dir( $tmpDir ) )
-  						mkdir( $tmpDir ) ;
-  					$match = array();
-  					preg_match( '/.+\.(\w+)$/', $src, $match );
-  					$src = $tmpDir . uniqid() . "." . $match[1];
-
-  					$ifp = fopen( $src, "wb");
-
-  				  fwrite($ifp, $imgBlob );
-  				  fclose($ifp);
-  				}
-  			}
+            && isset(self::$options['IMG_SRC_REPLACE'])) {
+            $src = str_replace(self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src);
+        }
+
+        if (!is_file($src)) {
+            if ($imgBlob = file_get_contents($src)) {
+                $tmpDir = Settings::getTempDir() . '/';
+                if (!is_dir($tmpDir)) {
+                    mkdir($tmpDir);
+                }
+                $match = array();
+                preg_match('/.+\.(\w+)$/', $src, $match);
+                $src = $tmpDir . uniqid() . '.' . $match[1];
+
+                $ifp = fopen($src, 'wb');
+
+                fwrite($ifp, $imgBlob);
+                fclose($ifp);
+            }
+        }
         $newElement = $element->addImage($src, $style);
 
         return $newElement;

tests/PhpWord/Shared/HtmlTest.php

@@ -115,6 +115,7 @@ public function testParseTextDecoration()
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
     }
+
     /**
      * Test font
      */
@@ -478,16 +479,17 @@ public function testParseRemoteImage()
         $baseXpath = '/w:document/w:body/w:p/w:r';
         $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
     }
+
     /**
      * Test parsing of remote img that can be found locally
      */
     public function testParseRemoteLocalImage()
     {
         $src = 'https://fakedomain.io/images/firefox.png';
         $localPath = __DIR__ . '/../_files/images/';
-        $options= array(
-          'IMG_SRC_SEARCH'=> 'https://fakedomain.io/images/',
-          'IMG_SRC_REPLACE'=> $localPath
+        $options = array(
+          'IMG_SRC_SEARCH'  => 'https://fakedomain.io/images/',
+          'IMG_SRC_REPLACE' => $localPath,
         );
 
         $phpWord = new \PhpOffice\PhpWord\PhpWord();