Merge branch 'sebastianbergmann:main' into feature/support-multidimen…

…sional-and-associative-arrays-when-canonicalize
sebastianbergmann · Aug 14, 2023 · fdff613 · fdff613
2 parents 5b1cbe3 + 175f8df
commit fdff613
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
 
 name: "CI"
 
+env:
+  COMPOSER_ROOT_VERSION: "5.0-dev"
+
 permissions:
   contents: read
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.3"
     },
     "config": {
         "platform": {

diff --git a/tests/MockObjectComparatorTest.php b/tests/MockObjectComparatorTest.php
@@ -12,7 +12,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\UsesClass;
-use PHPUnit\Framework\MockObject\Generator;
+use PHPUnit\Framework\MockObject\Generator\Generator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use stdClass;