Merge pull request #141 from guisaldanha/master

jdecool · web-flow · commit 80d981e8a3f1 · 2022-05-06T22:16:55.000+02:00
Fix in convertHexToRGB method. PHP 8.1 does not allow the input strin…
diff --git a/src/Core/ImageWorkshopLib.php b/src/Core/ImageWorkshopLib.php
@@ -70,16 +70,16 @@ public static function calculatePositions($containerWidth, $containerHeight, $la
     /**
      * Convert Hex color to RGB color format
      *
-     * @param string $hex
+     * @param string|null $hex
      *
      * @return array
      */
     public static function convertHexToRGB($hex)
     {
         return array(
-            'R' => (int) base_convert(substr($hex, 0, 2), 16, 10),
-            'G' => (int) base_convert(substr($hex, 2, 2), 16, 10),
-            'B' => (int) base_convert(substr($hex, 4, 2), 16, 10),
+            'R' => (int) base_convert(substr($hex ?? '', 0, 2), 16, 10),
+            'G' => (int) base_convert(substr($hex ?? '', 2, 2), 16, 10),
+            'B' => (int) base_convert(substr($hex ?? '', 4, 2), 16, 10),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,16 +70,16 @@ public static function calculatePositions($containerWidth, $containerHeight, $la`
`70`	`70`	`/**`
`71`	`71`	`* Convert Hex color to RGB color format`
`72`	`72`	`*`
`73`		`- * @param string $hex`
	`73`	`+ * @param string\|null $hex`
`74`	`74`	`*`
`75`	`75`	`* @return array`
`76`	`76`	`*/`
`77`	`77`	`public static function convertHexToRGB($hex)`
`78`	`78`	`{`
`79`	`79`	`return array(`
`80`		`- 'R' => (int) base_convert(substr($hex, 0, 2), 16, 10),`
`81`		`- 'G' => (int) base_convert(substr($hex, 2, 2), 16, 10),`
`82`		`- 'B' => (int) base_convert(substr($hex, 4, 2), 16, 10),`
	`80`	`+ 'R' => (int) base_convert(substr($hex ?? '', 0, 2), 16, 10),`
	`81`	`+ 'G' => (int) base_convert(substr($hex ?? '', 2, 2), 16, 10),`
	`82`	`+ 'B' => (int) base_convert(substr($hex ?? '', 4, 2), 16, 10),`
`83`	`83`	`);`
`84`	`84`	`}`
`85`	`85`