Merge pull request #14822 from cakephp/type-error-php-8

Fix TypeError on PHP 8
cakephp · Jul 22, 2020 · b487171 · b487171
2 parents 61403ca + 7706031
commit b487171
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Utility/Text.php b/src/Utility/Text.php
@@ -226,13 +226,13 @@ public static function insert(string $str, array $data, array $options = []): st
 
         $dataKeys = array_keys($data);
         $hashKeys = array_map('crc32', $dataKeys);
-        /** @var array<string, string> $tempData */
+        /** @var array<string, string|int> $tempData */
         $tempData = array_combine($dataKeys, $hashKeys);
         krsort($tempData);
 
         foreach ($tempData as $key => $hashVal) {
             $key = sprintf($format, preg_quote($key, '/'));
-            $str = preg_replace($key, $hashVal, $str);
+            $str = preg_replace($key, (string)$hashVal, $str);
         }
         /** @var array<string, mixed> $dataReplacements */
         $dataReplacements = array_combine($hashKeys, array_values($data));