Merge pull request #6637 from ddevsr/patch-1

MGatner · web-flow · commit 9b810b82bc56 · 2022-10-06T12:34:04.000-04:00
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
@@ -46,9 +46,10 @@ function dot_array_search(string $index, array $array)
     function _array_search_dot(array $indexes, array $array)
     {
         // Grab the current index
-        $currentIndex = $indexes ? array_shift($indexes) : null;
+        $currentIndex    = $indexes ? array_shift($indexes) : null;
+        $intCurrentIndex = (int) $currentIndex;
 
-        if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*')) {
+        if (empty($currentIndex) && $intCurrentIndex !== 0 || (! isset($array[$currentIndex]) && $currentIndex !== '*')) {
             return null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,10 @@ function dot_array_search(string $index, array $array)`
`46`	`46`	`function _array_search_dot(array $indexes, array $array)`
`47`	`47`	`{`
`48`	`48`	`// Grab the current index`
`49`		`- $currentIndex = $indexes ? array_shift($indexes) : null;`
	`49`	`+ $currentIndex = $indexes ? array_shift($indexes) : null;`
	`50`	`+ $intCurrentIndex = (int) $currentIndex;`
`50`	`51`
`51`		`- if ((empty($currentIndex) && (int) $currentIndex !== 0) \|\| (! isset($array[$currentIndex]) && $currentIndex !== '*')) {`
	`52`	`+ if (empty($currentIndex) && $intCurrentIndex !== 0 \|\| (! isset($array[$currentIndex]) && $currentIndex !== '*')) {`
`52`	`53`	`return null;`
`53`	`54`	`}`
`54`	`55`