Merge pull request #293 from ray-di/php84

Update CI to support PHP 8.4 and include PHP 8.3 in old_stable

.github/workflows/continuous-integration.yml

@@ -9,6 +9,6 @@ jobs:
   ci:
     uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
     with:
-      old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
-      current_stable: 8.3
+      old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
+      current_stable: 8.4
       script: demo/run.php

composer.json

@@ -14,12 +14,12 @@
         "koriym/attributes": "^1.0.4",
         "koriym/null-object": "^1.0",
         "koriym/param-reader": "^1.0",
-        "ray/aop": "^2.14",
+        "ray/aop": "^2.16",
         "ray/compiler": "^1.10.3"
     },
     "require-dev": {
         "ext-pdo": "*",
-        "phpunit/phpunit": "^8.5.24 || ^9.5",
+        "phpunit/phpunit": "^8.5.40 || ^9.5",
         "bamarni/composer-bin-plugin": "^1.4"
     },
     "config": {

src/di/Argument.php

@@ -91,7 +91,7 @@ public function getMeta(): string
     /**
      * {@inheritDoc}
      */
-    public function serialize(): ?string
+    public function serialize(): ?string // @phpstan-ignore-line
     {
         return serialize($this->__serialize());
     }

src/di/Bind.php

@@ -218,7 +218,7 @@ private function getStringName(array $name): string
              * @param array-key $key
              */
             static function (array $carry, $key) use ($name): array {
-                if (! is_string($key)) {
+                if (! is_string($key)) { // @phpstan-ignore-line
                     throw new InvalidToConstructorNameParameter((string) $key);
                 }
 

src/di/Di/Inject.php

@@ -25,7 +25,7 @@ final class Inject implements InjectInterface
     public $optional = false;
 
     /**
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings(PHPMD.BooleanArgumentFlag) // @phpstan-ignore-line
      */
     public function __construct(bool $optional = false)
     {

src/di/InjectionPoint.php

@@ -107,7 +107,7 @@ public function __unserialize(array $array): void
         [$this->pClass, $this->pFunction, $this->pName] = $array;
     }
 
-    public function serialize(): ?string
+    public function serialize(): ?string // @phpstan-ignore-line
     {
         return serialize($this->__serialize());
     }

src/di/MultiBinding/LazyProvider.php

@@ -7,8 +7,6 @@
 use Ray\Di\InjectorInterface;
 use Ray\Di\ProviderInterface;
 
-use function assert;
-
 /**
  * @template T of ProviderInterface
  */
@@ -31,7 +29,6 @@ public function __construct(string $class)
     public function __invoke(InjectorInterface $injector)
     {
         $provider = $injector->getInstance($this->class);
-        assert($provider instanceof ProviderInterface);
 
         return $provider->get();
     }

src/di/Name.php

@@ -150,11 +150,12 @@ private function parseName(string $name): array
             $exploded = explode('=', $keyValue);
             if (isset($exploded[1])) {
                 [$key, $value] = $exploded;
-                assert(is_string($key));
                 if (isset($key[0]) && $key[0] === '$') {
+                    assert(is_string($key)); // @phpstan-ignore-line
                     $key = substr($key, 1);
                 }
 
+                /** @psalm-suppress MixedArgument */
                 $names[trim($key)] = trim($value);
             }
         }

tests/di/ArgumentsTest.php

@@ -8,8 +8,6 @@
 use ReflectionMethod;
 use ReflectionParameter;
 
-use function assert;
-use function is_object;
 use function spl_object_hash;
 
 class ArgumentsTest extends TestCase
@@ -29,7 +27,6 @@ public function testInject(): void
         $this->assertInstanceOf(FakeTyre::class, $parameters[0]);
         $this->assertInstanceOf(FakeTyre::class, $parameters[1]);
         $param0 = $parameters[0];
-        assert(is_object($param0));
         $this->assertNotSame(spl_object_hash($param0), $parameters[1]);
     }
 

tests/di/DependencyTest.php

@@ -115,7 +115,7 @@ public function testInjectInterceptor(): void
         $isWeave = (new ReflectionClass($instance))->implementsInterface(WeavedInterface::class);
         $this->assertTrue($isWeave);
         assert(property_exists($instance, 'bindings'));
-        $this->assertArrayHasKey('returnSame', $instance->bindings);
+        $this->assertArrayHasKey('returnSame', (array) $instance->bindings);
     }
 
     /**

tests/di/Fake/FakePhp8Car.php

@@ -63,7 +63,7 @@ public function setQualiferMirrors(#[FakeRight] FakeMirrorInterface $rightMirror
     }
 
     #[Inject]
-    public function notQualifer(#[FakeNotQualifer] FakeMirrorInterface $rightMirror =  null): void
+    public function notQualifer(#[FakeNotQualifer] ?FakeMirrorInterface $rightMirror =  null): void
     {
     }
 

tests/di/GrapherTest.php

@@ -9,10 +9,8 @@
 
 use function assert;
 use function file_get_contents;
-use function is_object;
 use function is_string;
 use function passthru;
-use function property_exists;
 use function unserialize;
 
 class GrapherTest extends TestCase
@@ -28,8 +26,6 @@ public function testGetInstanceWithArgs(): void
         $grapher = new Grapher(new FakeUntargetModule(), __DIR__ . '/tmp');
         $instance = $grapher->newInstanceArgs(FakeUntargetChild::class, ['1']);
         $this->assertInstanceOf(FakeUntargetChild::class, $instance);
-        assert(is_object($instance));
-        assert(property_exists($instance, 'val'));
         $this->assertSame('1', $instance->val);
     }
 

tests/di/InjectorTest.php

@@ -16,7 +16,6 @@
 use function file_get_contents;
 use function is_string;
 use function passthru;
-use function property_exists;
 use function serialize;
 use function spl_object_hash;
 use function unlink;
@@ -184,7 +183,6 @@ public function testAnnotationBasedInjection(): Injector
         $this->assertInstanceOf(FakeMirrorInterface::class, $car->spareMirror);
         $this->assertSame(spl_object_hash($car->rightMirror), spl_object_hash($car->spareMirror));
         $this->assertInstanceOf(FakeHandle::class, $car->handle);
-        assert($car->handle instanceof FakeHandle);
         $this->assertSame($car->handle->logo, 'momo');
 
         return $injector;
@@ -242,7 +240,6 @@ public function testSerializeBuiltinBinding(): void
         $injector = unserialize(serialize(new Injector()));
         assert($injector instanceof InjectorInterface);
         $instance = $injector->getInstance(FakeBuiltin::class);
-        assert(property_exists($instance, 'injector'));
         $this->assertInstanceOf(Injector::class, $instance->injector);
     }
 
@@ -430,9 +427,7 @@ protected function configure()
         $instance = $injector->getInstance(FakeAop::class);
         $result = $instance->returnSame(2);
         $this->assertSame(2, $result);
-        assert(property_exists($instance, 'bindings'));
-        assert(isset($instance->bindings['returnSame'][0]));
-        $this->assertInstanceOf(NullInterceptor::class, $instance->bindings['returnSame'][0]);
+        $this->assertInstanceOf(NullInterceptor::class, $instance->bindings['returnSame'][0]); // @phpstan-ignore-line
     }
 
     public function testModuleArray(): void

vendor-bin/tools/composer.json

@@ -3,10 +3,10 @@
         "doctrine/coding-standard": "^9.0",
         "phpmd/phpmd": "^2.9",
         "phpmetrics/phpmetrics": "^2.7",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^2.0",
         "squizlabs/php_codesniffer": "^3.5",
         "vimeo/psalm": "^4.2",
-        "phpstan/phpstan-phpunit": "^1.1",
+        "phpstan/phpstan-phpunit": "^2.0",
         "psalm/plugin-phpunit": "^0.17.0"
     },
     "config": {