Merge remote-tracking branch 'upstream/develop' into 4.5

obozdag · Jan 18, 2024 · 787382c · 787382c
2 parents e931659 + 0788018
commit 787382c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -1361,11 +1361,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to method SplFileInfo\\:\\:getBasename\\(\\) with incorrect case\\: getBaseName$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Files/File.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,

diff --git a/system/Files/File.php b/system/Files/File.php
@@ -142,7 +142,7 @@ public function getRandomName(): string
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath = rtrim($targetPath, '/') . '/';
-        $name ??= $this->getBaseName();
+        $name ??= $this->getBasename();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         $oldName = $this->getRealPath() ?: $this->__toString();

diff --git a/system/Validation/DotArrayFilter.php b/system/Validation/DotArrayFilter.php
@@ -46,7 +46,7 @@ public static function run(array $indexes, array $array): array
                 $segments
             );
 
-            $result = array_merge_recursive($result, self::filter($segments, $array));
+            $result = array_replace_recursive($result, self::filter($segments, $array));
         }
 
         return $result;

diff --git a/tests/system/Validation/DotArrayFilterTest.php b/tests/system/Validation/DotArrayFilterTest.php
@@ -182,4 +182,19 @@ public function testRunNestedArray()
         ];
         $this->assertSame($expected, $result);
     }
+
+    public function testRunReturnOrderedIndices()
+    {
+        $data = [
+            'foo' => [
+                2 => 'bar',
+                0 => 'baz',
+                1 => 'biz',
+            ],
+        ];
+
+        $result = DotArrayFilter::run(['foo.2', 'foo.0', 'foo.1'], $data);
+
+        $this->assertSame($data, $result);
+    }
 }