Refactor tests and dependencies:

- Remove unused `NamedArgumentsTest`.
- Replace outdated PHPUnit docblock annotations with attributes.
- Use `createStub` instead of `createMock` where applicable.
- Update to PHPUnit 12 schema in `phpunit.xml`.
- Set workflow PHP version to 8.3.
- Minor adjustments in `Container` and `bootstrap.php` for improved modern compatibility.

Author: antonmedv

.github/workflows/check.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -47,7 +47,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
 
       - name: Validate composer.json and composer.lock
         run: composer validate

phpunit.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd">
+  <source>
     <include>
       <directory>src/</directory>
       <directory>recipe/</directory>
@@ -9,16 +14,18 @@
       <directory suffix=".php">vendor/</directory>
       <directory>bin/</directory>
     </exclude>
-  </coverage>
+  </source>
   <testsuites>
     <testsuite name="Src">
       <directory>tests/src/</directory>
     </testsuite>
     <testsuite name="Legacy">
       <directory>tests/legacy/</directory>
+      <exclude>tests/legacy/AbstractTest.php</exclude>
     </testsuite>
     <testsuite name="Joy">
       <directory>tests/joy/</directory>
+      <exclude>tests/joy/JoyTest.php</exclude>
     </testsuite>
   </testsuites>
 </phpunit>

src/Component/Pimple/Container.php

@@ -176,7 +176,7 @@ public function factory(callable $callable)
             throw new ExpectedInvokableException('Service definition is not a Closure or invokable object.');
         }
 
-        $this->factories->attach($callable);
+        $this->factories->offsetSet($callable, null);
 
         return $callable;
     }
@@ -198,7 +198,7 @@ public function protect(callable $callable)
             throw new ExpectedInvokableException('Callable is not a Closure or invokable object.');
         }
 
-        $this->protected->attach($callable);
+        $this->protected->offsetSet($callable, null);
 
         return $callable;
     }
@@ -270,8 +270,8 @@ public function extend(string $id, callable $callable)
         };
 
         if (isset($this->factories[$factory])) {
-            $this->factories->detach($factory);
-            $this->factories->attach($extended);
+            $this->factories->offsetUnset($factory);
+            $this->factories->offsetSet($extended, null);
         }
 
         return $this[$id] = $extended;

tests/bootstrap.php

@@ -32,10 +32,10 @@
 // Init repository
 $repository = __REPOSITORY__;
 
-`cd $repository && git init`;
-$branch = trim(`git rev-parse --abbrev-ref HEAD`);
-`cd $repository && git checkout -B $branch 2>&1`;
-`cd $repository && git add .`;
-`cd $repository && git config user.name 'Anton Medvedev'`;
-`cd $repository && git config user.email 'anton.medv@example.com'`;
-`cd $repository && git commit -m 'first commit'`;
+shell_exec("cd $repository && git init");
+$branch = trim(shell_exec('git rev-parse --abbrev-ref HEAD'));
+shell_exec("cd $repository && git checkout -B $branch 2>&1");
+shell_exec("cd $repository && git add .");
+shell_exec("cd $repository && git config user.name 'Anton Medvedev'");
+shell_exec("cd $repository && git config user.email 'anton.medv@example.com'");
+shell_exec("cd $repository && git commit -m 'first commit'");

tests/legacy/DeployTest.php

@@ -7,6 +7,7 @@
 
 namespace Deployer;
 
+use PHPUnit\Framework\Attributes\Depends;
 use Symfony\Component\Console\Output\Output;
 
 class DeployTest extends AbstractTest
@@ -76,9 +77,7 @@ public function testKeepReleases()
         }
     }
 
-    /**
-     * @depends testKeepReleases
-     */
+    #[Depends('testKeepReleases')]
     public function testRollback()
     {
         $this->dep(self::RECIPE, 'rollback');
@@ -106,9 +105,7 @@ public function testFail()
         }
     }
 
-    /**
-     * @depends testFail
-     */
+    #[Depends('testFail')]
     public function testCleanup()
     {
         $this->dep(self::RECIPE, 'deploy:cleanup');

tests/legacy/NamedArgumentsTest.php

@@ -46,7 +46,7 @@ public function testDeploy()
             self::assertFileExists($deployPath . '/shared/.env');
             self::assertFileExists($deployPath . '/current/config/test.yaml');
             self::assertFileExists($deployPath . '/shared/config/test.yaml');
-            self::assertEquals(1, intval(`cd $deployPath && ls -1 releases | wc -l`));
+            self::assertEquals(1, intval(shell_exec("cd $deployPath && ls -1 releases | wc -l")));
         }
     }
 }

tests/legacy/YamlTest.php

@@ -9,6 +9,8 @@
 
 use Deployer\Host\HostCollection;
 use Deployer\Task\TaskCollection;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
 
 class CollectionTest extends TestCase
@@ -22,9 +24,7 @@ public static function collections()
         ];
     }
 
-    /**
-     * @dataProvider collections
-     */
+    #[DataProvider('collections')]
     public function testCollection($collection)
     {
         $this->assertInstanceOf(Collection::class, $collection);
@@ -40,10 +40,8 @@ public function testCollection($collection)
         }));
     }
 
-    /**
-     * @dataProvider collections
-     * @depends      testCollection
-     */
+    #[DataProvider('collections')]
+    #[Depends('testCollection')]
     public function testException($collection)
     {
         $this->expectException(\InvalidArgumentException::class);