Fix Html::parseImage when image has no extension

PHPOffice · Sep 3, 2023 · b9a0dff · b9a0dff
1 parent c17c4c7
commit b9a0dff
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -965,7 +965,10 @@ protected static function parseImage($node, $element)
  $tmpDir = Settings::getTempDir() . '/';
  $match = [];
  preg_match('/.+\.(\w+)$/', $src, $match);
- $src = $tmpDir . uniqid() . '.' . $match[1];
+ $src = $tmpDir . uniqid();
+ if (isset($match[1])) {
+ $src .= '.' . $match[1];
+ }
 
  $ifp = fopen($src, 'wb');
 

diff --git a/tests/PhpWordTests/AbstractWebServerEmbeddedTest.php b/tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
@@ -53,6 +53,15 @@ protected static function getRemoteImageUrl()
  return 'http:https://php.net/images/logos/new-php-logo.png';
  }
 
+ protected static function getRemoteImageUrlWithoutExtension()
+ {
+ if (self::$httpServer) {
+ return self::getBaseUrl() . '/images/new-php-logo';
+ }
+
+ return 'http:https://placekitten.com/200/300';
+ }
+
  protected static function getRemoteGifImageUrl()
  {
  if (self::$httpServer) {

diff --git a/tests/PhpWordTests/Shared/HtmlTest.php b/tests/PhpWordTests/Shared/HtmlTest.php
@@ -816,6 +816,24 @@ public function testParseRemoteImage(): void
  self::assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
  }
 
+ /**
+ * Test parsing of remote img without extension.
+ */
+ public function testParseRemoteImageWithoutExtension(): void
+ {
+ $src = self::getRemoteImageUrlWithoutExtension();
+
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection();
+ $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/><img src="' . $src . '" style="float: left;"/></p>';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $baseXpath = '/w:document/w:body/w:p/w:r';
+ self::assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+ }
+
  /**
  * Test parsing embedded image.
  */

diff --git a/tests/PhpWordTests/_files/images/new-php-logo b/tests/PhpWordTests/_files/images/new-php-logo