Update to PHPUnit 10

.gitignore

@@ -9,3 +9,4 @@
 /.phpcs-cache
 /phpcs.xml
 /.phpbench
+/.phpunit.cache/

composer.json

@@ -34,7 +34,7 @@
         "laminas/laminas-dependency-plugin": "^2.2",
         "mikey179/vfsstream": "^1.6.11",
         "phpbench/phpbench": "^1.2.9",
-        "phpunit/phpunit": "^9.6.5",
+        "phpunit/phpunit": "^10.0.17",
         "psalm/plugin-phpunit": "^0.18.4",
         "vimeo/psalm": "^5.8.0"
     },

phpunit.xml.dist

@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="./vendor/autoload.php"
-    colors="true">
-    <coverage includeUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-
-    <testsuites>
-        <testsuite name="laminas-servicemanager Test Suite">
-            <directory>./test/</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <exclude>
-            <group>disable</group>
-        </exclude>
-    </groups>
-
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-    </php>
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         cacheDirectory=".phpunit.cache">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="laminas-servicemanager Test Suite">
+      <directory>./test/</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>disable</group>
+    </exclude>
+  </groups>
 </phpunit>

psalm-baseline.xml

@@ -449,10 +449,6 @@
     <MissingClosureReturnType>
       <code>static function ($container, $name, $callback) {</code>
     </MissingClosureReturnType>
-    <MissingConstructor>
-      <code>$creationContext</code>
-      <code>$creationContext</code>
-    </MissingConstructor>
     <MixedArrayAssignment>
       <code><![CDATA[$object[$shared ? $method : 'build'][]]]></code>
     </MixedArrayAssignment>
@@ -524,8 +520,8 @@
   </file>
   <file src="test/Exception/CyclicAliasExceptionTest.php">
     <InvalidDocblock>
-      <code>public function aliasesProvider(): array</code>
-      <code>public function cyclicAliasProvider(): array</code>
+      <code>public static function aliasesProvider(): array</code>
+      <code>public static function cyclicAliasProvider(): array</code>
     </InvalidDocblock>
     <MixedInferredReturnType>
       <code><![CDATA[array<

src/Test/CommonPluginManagerTrait.php

@@ -8,6 +8,7 @@
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use ReflectionClass;
 use ReflectionProperty;
+use stdClass;
 
 use function method_exists;
 
@@ -58,7 +59,7 @@ public function testRegisteringInvalidElementRaisesException()
     public function testLoadingInvalidElementRaisesException()
     {
         $manager = $this->getPluginManager();
-        $manager->setInvokableClass('test', static::class);
+        $manager->setInvokableClass('test', stdClass::class);
         $this->expectException($this->getServiceNotFoundException());
         $manager->get('test');
     }
@@ -76,9 +77,9 @@ public function testPluginAliasesResolve($alias, $expected)
     /**
      * @return array
      */
-    public function aliasProvider()
+    public static function aliasProvider(): array
     {
-        $manager    = $this->getPluginManager();
+        $manager    = self::getPluginManager();
         $reflection = new ReflectionProperty($manager, 'aliases');
         $data       = [];
         foreach ($reflection->getValue($manager) as $alias => $expected) {
@@ -101,7 +102,7 @@ protected function getServiceNotFoundException(): string
      *
      * @return AbstractPluginManager
      */
-    abstract protected function getPluginManager();
+    abstract protected static function getPluginManager();
 
     /**
      * Returns the FQCN of the exception thrown under v2 by `validatePlugin()`

test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php

@@ -31,7 +31,7 @@ protected function setUp(): void
         $this->factory   = new ReflectionBasedAbstractFactory();
     }
 
-    public function nonClassRequestedNames(): array
+    public static function nonClassRequestedNames(): array
     {
         return [
             'non-class-string' => ['non-class-string'],

test/AbstractPluginManagerTest.php

@@ -32,10 +32,10 @@ final class AbstractPluginManagerTest extends TestCase
 {
     use CommonServiceLocatorBehaviorsTrait;
 
-    public function createContainer(array $config = []): ServiceManager
+    public static function createContainer(array $config = []): ServiceManager
     {
-        $this->creationContext = new ServiceManager();
-        return new TestAsset\LenientPluginManager($this->creationContext, $config);
+        self::$creationContext = new ServiceManager();
+        return new TestAsset\LenientPluginManager(self::$creationContext, $config);
     }
 
     public function testInjectCreationContextInFactories(): void
@@ -101,7 +101,7 @@ public function testCachesInstanceByDefaultIfNoOptionsArePassed(): void
         self::assertSame($first, $second);
     }
 
-    public function shareByDefaultSettings(): array
+    public static function shareByDefaultSettings(): array
     {
         return [
             'true'  => [true],
@@ -248,7 +248,7 @@ public function testCanPassConfigInterfaceAsFirstConstructorArgumentWithDeprecat
         self::assertSame($pluginManager, $pluginManager->getCreationContext());
     }
 
-    public function invalidConstructorArguments(): array
+    public static function invalidConstructorArguments(): array
     {
         return [
             'true'       => [true],

test/CommonServiceLocatorBehaviorsTrait.php

@@ -53,14 +53,14 @@ trait CommonServiceLocatorBehaviorsTrait
     /**
      * The creation context container; used in some mocks for comparisons; set during createContainer.
      */
-    protected ServiceManager|null $creationContext;
+    protected static ServiceManager|null $creationContext;
 
     /**
      * @psalm-param ServiceManagerConfigurationType $config
      * @return ServiceManager
      * @todo This will need to be static for future versions of PHPUnit
      */
-    abstract public function createContainer(array $config = []);
+    abstract public static function createContainer(array $config = []);
 
     public function testIsSharedByDefault(): void
     {
@@ -271,7 +271,7 @@ public function testInitializersAreRunAfterCreation(): void
         $initializer
             ->expects(self::once())
             ->method('__invoke')
-            ->with($this->creationContext, self::isInstanceOf(stdClass::class));
+            ->with(self::$creationContext, self::isInstanceOf(stdClass::class));
 
         // We call it twice to make sure that the initializer is only called once
 
@@ -551,7 +551,7 @@ public function testCanSpecifyAbstractFactoryUsingStringViaConfiguration(): void
         self::assertInstanceOf(DateTime::class, $dateTime);
     }
 
-    public function invalidFactories(): array
+    public static function invalidFactories(): array
     {
         return [
             'null'                 => [null],
@@ -566,9 +566,9 @@ public function invalidFactories(): array
         ];
     }
 
-    public function invalidAbstractFactories(): array
+    public static function invalidAbstractFactories(): array
     {
-        $factories                     = $this->invalidFactories();
+        $factories                     = self::invalidFactories();
         $factories['non-class-string'] = ['non-callable-string', 'valid class name'];
 
         return $factories;
@@ -610,9 +610,9 @@ public function testCanSpecifyInitializerUsingStringViaConfiguration(): void
         self::assertEquals('bar', $instance->foo, '"foo" property was not properly injected');
     }
 
-    public function invalidInitializers(): array
+    public static function invalidInitializers(): array
     {
-        $factories                     = $this->invalidFactories();
+        $factories                     = self::invalidFactories();
         $factories['non-class-string'] = ['non-callable-string', 'callable or an instance of'];
 
         return $factories;
@@ -643,9 +643,9 @@ public function testGetRaisesExceptionWhenNoFactoryIsResolved(): void
         $serviceManager->get('Some\Unknown\Service');
     }
 
-    public function invalidDelegators(): array
+    public static function invalidDelegators(): array
     {
-        $invalidDelegators                        = $this->invalidFactories();
+        $invalidDelegators                        = self::invalidFactories();
         $invalidDelegators['invalid-classname']   = ['not-a-class-name', 'invalid delegator'];
         $invalidDelegators['non-invokable-class'] = [stdClass::class];
 
@@ -852,12 +852,14 @@ public function testCanInjectSharingRules(): void
     }
 
     /** @return array<string, array{0: string, 1: mixed[]}> */
-    public function methodsAffectedByOverrideSettings(): array
+    public static function methodsAffectedByOverrideSettings(): array
     {
         //  name                        => [ 'method to invoke',  [arguments for invocation]]
+        $that = new stdClass();
+
         return [
             'setAlias'                  => ['setAlias', ['foo', 'bar']],
-            'setInvokableClass'         => ['setInvokableClass', ['foo', self::class]],
+            'setInvokableClass'         => ['setInvokableClass', ['foo', stdClass::class]],
             'setFactory'                => [
                 'setFactory',
                 [
@@ -866,9 +868,9 @@ static function (): void {
                     },
                 ],
             ],
-            'setService'                => ['setService', ['foo', $this]],
+            'setService'                => ['setService', ['foo', $that]],
             'setShared'                 => ['setShared', ['foo', false]],
-            'mapLazyService'            => ['mapLazyService', ['foo', self::class]],
+            'mapLazyService'            => ['mapLazyService', ['foo', stdClass::class]],
             'addDelegator'              => [
                 'addDelegator',
                 [
@@ -891,11 +893,11 @@ static function (): void {
                     ],
                 ],
             ],
-            'configure-service'         => ['configure', [['services' => ['foo' => $this]]]],
+            'configure-service'         => ['configure', [['services' => ['foo' => $that]]]],
             'configure-shared'          => ['configure', [['shared' => ['foo' => false]]]],
             'configure-lazy-service'    => [
                 'configure',
-                [['lazy_services' => ['class_map' => ['foo' => self::class]]]],
+                [['lazy_services' => ['class_map' => ['foo' => stdClass::class]]]],
             ],
         ];
     }
@@ -946,7 +948,7 @@ public function testCanRetrieveParentContainerViaGetServiceLocatorWithDeprecatio
 
             return true;
         }, E_USER_DEPRECATED);
-        self::assertSame($this->creationContext, $container->getServiceLocator());
+        self::assertSame(self::$creationContext, $container->getServiceLocator());
         restore_error_handler();
     }
 
@@ -1047,7 +1049,7 @@ public function testConsistencyOverInternalStates(
      *
      * @return list<array{0: ServiceManager, 1: string, 2: list<string>, 3: bool}>
      */
-    public function provideConsistencyOverInternalStatesTests(): array
+    public static function provideConsistencyOverInternalStatesTests(): array
     {
         $config1                      = [
             'factories'          => [
@@ -1103,7 +1105,7 @@ public function provideConsistencyOverInternalStatesTests(): array
         $tests = [];
 
         foreach ($configs as $config) {
-            $smTemplate = $this->createContainer($config);
+            $smTemplate = self::createContainer($config);
 
             // setup sharing, services are always shared
             $names = array_fill_keys(array_keys($config['services']), true);

test/ExamplePluginManagerTest.php

@@ -18,7 +18,7 @@ final class ExamplePluginManagerTest extends TestCase
 {
     use CommonPluginManagerTrait;
 
-    protected function getPluginManager(): V2v3PluginManager
+    protected static function getPluginManager(): V2v3PluginManager
     {
         return new V2v3PluginManager(new ServiceManager());
     }

test/Exception/CyclicAliasExceptionTest.php

@@ -33,7 +33,7 @@ public function testFromCyclicAlias(string $alias, array $aliases, string $expec
      *     array{0:non-empty-string,1:array<non-empty-string,non-empty-string>,non-empty-string}
      * >
      */
-    public function cyclicAliasProvider(): array
+    public static function cyclicAliasProvider(): array
     {
         return [
             'a -> a'           => [
@@ -110,7 +110,7 @@ public function testFromAliasesMap(array $aliases, string $expectedMessage): voi
     /**
      * @return array<string, array{0: array<string, string>, string}>
      */
-    public function aliasesProvider(): array
+    public static function aliasesProvider(): array
     {
         return [
             'empty set'                            => [

test/ServiceManagerTest.php

@@ -30,10 +30,10 @@ final class ServiceManagerTest extends TestCase
     /**
      * @psalm-param ServiceManagerConfigurationType $config
      */
-    public function createContainer(array $config = []): ServiceManager
+    public static function createContainer(array $config = []): ServiceManager
     {
         $container             = new ServiceManager($config);
-        $this->creationContext = $container;
+        self::$creationContext = $container;
 
         return $container;
     }
@@ -120,7 +120,7 @@ static function (ContainerInterface $container, string $name, callable $callback
         self::assertEquals('bar', $instance->foo);
     }
 
-    public function shareProvider(): array
+    public static function shareProvider(): array
     {
         $sharedByDefault          = true;
         $serviceShared            = true;
@@ -546,7 +546,7 @@ public function testWontShareServiceWhenRequestedByAlias(array $config, string $
      *     2:non-empty-string
      * }>
      */
-    public function aliasedServices(): array
+    public static function aliasedServices(): array
     {
         return [
             'invokables'         => [

test/Tool/ConfigDumperCommandTest.php

@@ -73,7 +73,7 @@ public function testEmitsHelpWhenNoArgumentsProvided(): void
         self::assertEquals(0, $this->command->__invoke([]));
     }
 
-    public function helpArguments(): array
+    public static function helpArguments(): array
     {
         return [
             'short'   => ['-h'],
@@ -82,7 +82,7 @@ public function helpArguments(): array
         ];
     }
 
-    public function ignoreUnresolvedArguments(): array
+    public static function ignoreUnresolvedArguments(): array
     {
         return [
             'short' => ['-i'],

test/Tool/FactoryCreatorCommandTest.php

@@ -57,7 +57,7 @@ public function assertHelp($stream = STDOUT): void
             );
     }
 
-    public function helpArguments(): array
+    public static function helpArguments(): array
     {
         return [
             'short'   => ['-h'],
@@ -75,7 +75,7 @@ public function testEmitsHelpWhenHelpArgumentProvidedAsFirstArgument(string $arg
         self::assertSame(0, $this->command->__invoke([$argument]));
     }
 
-    public function invalidArguments(): array
+    public static function invalidArguments(): array
     {
         return [
             'string'    => ['string'],