Merge branch '10.5' into 11.3

sebastianbergmann · Aug 12, 2024 · f759fa0 · f759fa0
2 parents 18ec59a + c2d9a77
commit f759fa0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "phpunit/php-timer": "^7.0.1",
         "sebastian/cli-parser": "^3.0.2",
         "sebastian/code-unit": "^3.0.1",
-        "sebastian/comparator": "^6.0.1",
+        "sebastian/comparator": "^6.0.2",
         "sebastian/diff": "^6.0.2",
         "sebastian/environment": "^7.2.0",
         "sebastian/exporter": "^6.1.3",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php b/tests/unit/Framework/Constraint/Equality/IsEqualCanonicalizingTest.php
@@ -192,8 +192,8 @@ public static function provider(): array
 +++ Actual
 @@ @@
  stdClass Object (
--    0 => 'bar'
-+    0 => 'foo'
+-    'foo' => 'bar'
++    'bar' => 'foo'
  )
 
 EOT,

diff --git a/tests/unit/Metadata/Api/CodeCoverageTest.php b/tests/unit/Metadata/Api/CodeCoverageTest.php
@@ -105,31 +105,31 @@ public static function linesToBeCoveredProvider(): array
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(29, 46),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46),
                 ],
                 NamespaceCoverageClassTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
                 ],
                 NamespaceCoverageMethodTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
+                    TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
                 ],
                 NamespaceCoverageCoversClassTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
                 ],
                 NamespaceCoverageCoversClassPublicTest::class,
                 'testSomething',
@@ -270,31 +270,31 @@ public static function linesToBeUsedProvider(): array
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(29, 46),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46),
                 ],
                 NamespaceCoverageClassTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
                 ],
                 NamespaceCoverageMethodTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
+                    TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
                 ],
                 NamespaceCoverageCoversClassTest::class,
                 'testSomething',
             ],
 
             [
                 [
-                    TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
+                    TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
                 ],
                 NamespaceCoverageCoversClassPublicTest::class,
                 'testSomething',