Merge pull request #2449 from PHPOffice/pr2415

Progi1984 · web-flow · commit 34276d3e8ebb · 2023-08-30T14:46:30.000+02:00
TemplateProcessor : Fixed choose dimention for Float Value
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Word2007 Reader : Read hyperlingks in headings by @hannesdorn in #2433
 - PclZip : strtr using empty string by @spl1nes in #2432
 - Fixed PHP 8.2 deprecated about Allow access to an undefined property by @DAdq26 in #2440
+- Template Processor : Fixed choose dimention for Float Value by @gdevilbat in #2449
 
 ### Miscellaneous
 
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
@@ -437,7 +437,7 @@ private function chooseImageDimension($baseValue, $inlineValue, $defaultValue)
         if (null === $value && isset($inlineValue)) {
             $value = $inlineValue;
         }
-        if (!preg_match('/^([0-9]*(cm|mm|in|pt|pc|px|%|em|ex|)|auto)$/i', $value ?? '')) {
+        if (!preg_match('/^([0-9.]*(cm|mm|in|pt|pc|px|%|em|ex|)|auto)$/i', $value ?? '')) {
             $value = null;
         }
         if (null === $value) {

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ private function chooseImageDimension($baseValue, $inlineValue, $defaultValue)`
`437`	`437`	`if (null === $value && isset($inlineValue)) {`
`438`	`438`	`$value = $inlineValue;`
`439`	`439`	`}`
`440`		`- if (!preg_match('/^([0-9]*(cm\|mm\|in\|pt\|pc\|px\|%\|em\|ex\|)\|auto)$/i', $value ?? '')) {`
	`440`	`+ if (!preg_match('/^([0-9.]*(cm\|mm\|in\|pt\|pc\|px\|%\|em\|ex\|)\|auto)$/i', $value ?? '')) {`
`441`	`441`	`$value = null;`
`442`	`442`	`}`
`443`	`443`	`if (null === $value) {`