Use Ray.Aop's new binding injector _setBindings

composer.json

@@ -14,7 +14,7 @@
         "koriym/attributes": "^1.0.4",
         "koriym/null-object": "^1.0",
         "koriym/param-reader": "^1.0",
-        "ray/aop": "^2.16",
+        "ray/aop": "^2.x-dev",
         "ray/compiler": "^1.10.3"
     },
     "require-dev": {
@@ -47,10 +47,11 @@
         "cs": ["phpcs --standard=./phpcs.xml src tests"],
         "cs-fix": ["phpcbf src tests"],
         "clean": ["phpstan clear-result-cache", "psalm --clear-cache", "rm -rf tests/tmp/*.php"],
-        "sa": ["psalm -m -c psalm.xml --show-info=true", "phpstan analyse -c phpstan.neon --no-progress "],
+        "sa": ["psalm -m -c psalm.xml --show-info=false", "phpstan analyse -c phpstan.neon --no-progress "],
         "metrics": ["@test", "phpmetrics --report-html=build/metrics --exclude=Exception --log-junit=build/junit.xml --junit=build/junit.xml src"],
         "phpmd": ["phpmd src/di text ./phpmd.xml"],
-        "build": ["@cs", "@sa", "@pcov", "@metrics"]
+        "build": ["@cs", "@sa", "@pcov", "@metrics"],
+        "baseline": ["phpstan analyse -c phpstan.neon --generate-baseline", "psalm --set-baseline=psalm-baseline.xml"]
     },
     "extra": {
         "bamarni-bin": {

phpstan-baseline.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Negated boolean expression is always false\.$#'
+			identifier: booleanNot.alwaysFalse
+			count: 1
+			path: src/di/AnnotatedClassMethods.php

psalm-baseline.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
+  <file src="src/di/AnnotatedClassMethods.php">
+    <DocblockTypeContradiction occurrences="2">
+      <code>! $constructor</code>
+      <code>$constructor</code>
+    </DocblockTypeContradiction>
+  </file>
+  <file src="src/di/AspectBind.php">
+    <MixedArrayOffset occurrences="1">
+      <code>$instantiatedBindings[$methodName]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="3">
+      <code>$interceptorClassName</code>
+      <code>$interceptorClassNames</code>
+      <code>$methodName</code>
+    </MixedAssignment>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>$instantiatedBindings</code>
+      <code>array&lt;non-empty-string, list&lt;MethodInterceptor&gt;&gt;</code>
+    </MixedReturnTypeCoercion>
+  </file>
+  <file src="src/di/Dependency.php">
+    <InvalidArgument occurrences="1">
+      <code>$pointcuts</code>
+    </InvalidArgument>
+  </file>
+  <file src="src/di/NewInstance.php">
+    <InvalidArgument occurrences="1">
+      <code>$this-&gt;bind-&gt;inject($container)</code>
+    </InvalidArgument>
+  </file>
+</files>

psalm.xml

@@ -4,6 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config https://psalm.dev/schema/config"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src/di"/>

src/di/AnnotatedClassMethods.php

@@ -9,6 +9,8 @@
 use Ray\Di\Di\InjectInterface;
 use Ray\Di\Di\Named;
 
+use function assert;
+
 use const PHP_VERSION_ID;
 
 final class AnnotatedClassMethods
@@ -38,6 +40,7 @@ public function getConstructorName(ReflectionClass $class): Name
             }
         }
 
+        assert($constructor instanceof ReflectionMethod);
         $named = $constructor->getAnnotation(Named::class);
         if ($named instanceof Named) {
             return new Name($named->value);

src/di/AspectBind.php

@@ -22,7 +22,7 @@ public function __construct(AopBind $bind)
     /**
      * Instantiate interceptors
      *
-     * @return array<string, list<MethodInterceptor>>
+     * @return array<non-empty-string, list<MethodInterceptor>>
      */
     public function inject(Container $container): array
     {

src/di/BindValidator.php

@@ -42,7 +42,7 @@ public function to(string $interface, string $class): ReflectionClass
             throw new InvalidType("[{$class}] is no implemented [{$interface}] interface");
         }
 
-        return new ReflectionClass($class); // @phpstan-ignore-line
+        return new ReflectionClass($class);
     }
 
     /**

src/di/NewInstance.php

@@ -5,6 +5,7 @@
 namespace Ray\Di;
 
 use Ray\Aop\Bind as AopBind;
+use Ray\Aop\WeavedInterface;
 use ReflectionClass;
 use ReflectionException;
 
@@ -94,15 +95,22 @@ public function accept(VisitorInterface $visitor): void
 
     private function postNewInstance(Container $container, object $instance): object
     {
-        // bind dependency injected interceptors
-        if ($this->bind instanceof AspectBind) {
-            assert(isset($instance->bindings));
-            $instance->bindings = $this->bind->inject($container);
-        }
+        $this->enableAop($instance, $container);
 
         // setter injection
         ($this->setterMethods)($instance, $container);
 
         return $instance;
     }
+
+    public function enableAop(object $instance, Container $container): void
+    {
+        if (! $this->bind instanceof AspectBind) {
+            return;
+        }
+
+        assert($instance instanceof WeavedInterface);
+
+        $instance->_setBindings($this->bind->inject($container));  // Ray.Aop ^2.18
+    }
 }

tests/di/AnnotatedClassTest.php

@@ -21,7 +21,7 @@ protected function setUp(): void
 
     public function testInvoke(): void
     {
-        $newInstance = $this->annotatedClass->getNewInstance(new ReflectionClass(FakeCar::class));
+        $newInstance = $this->annotatedClass->getNewInstance(new ReflectionClass(FakeCar::class)); // @phpstan-ignore-line
         $this->assertInstanceOf(NewInstance::class, $newInstance);
         $container = new Container();
         (new Bind($container, FakeTyreInterface::class))->to(FakeTyre::class);

tests/di/ModuleTest.php

@@ -7,6 +7,8 @@
 use PHPUnit\Framework\TestCase;
 use Ray\Di\Exception\NotFound;
 
+use function str_replace;
+
 class ModuleTest extends TestCase
 {
     public function testNew(): void
@@ -50,14 +52,17 @@ public function testActivate(): void
     public function testtoString(): void
     {
         $string = (string) new FakeLogStringModule();
-        $this->assertSame('-array => (array)
+        $normalize = static function (string $str): string {
+            return str_replace(["\r\n", "\r"], "\n", $str);
+        };
+        $this->assertSame($normalize('-array => (array)
 -bool => (boolean) 1
 -int => (integer) 1
 -null => (NULL)
 -object => (object) stdClass
 -string => (string) 1
 Ray\Di\FakeAopInterface- => (dependency) Ray\Di\FakeAop (aop) +returnSame(Ray\Di\FakeDoubleInterceptor)
 Ray\Di\FakeDoubleInterceptor- => (dependency) Ray\Di\FakeDoubleInterceptor
-Ray\Di\FakeRobotInterface- => (provider) (dependency) Ray\Di\FakeRobotProvider', $string);
+Ray\Di\FakeRobotInterface- => (provider) (dependency) Ray\Di\FakeRobotProvider'), $normalize($string));
     }
 }