Merge pull request #211 from koriym/nullable-mixed

Fixed to not make mixed nullable
ray-di · May 13, 2024 · 284cec0 · 284cec0
2 parents da2abe9 + c1ba333
commit 284cec0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/TypeString.php b/src/TypeString.php
@@ -39,7 +39,7 @@ public function __invoke(?ReflectionType $type): string
         if ($type instanceof ReflectionNamedType) {
             $typeStr = self::getFqnType($type);
             // Check for Nullable in single types
-            if ($type->allowsNull() && $type->getName() !== 'null') {
+            if ($typeStr !== 'mixed' && $type->allowsNull() && $type->getName() !== 'null') {
                 $typeStr = $this->nullableStr . $typeStr;
             }
 

diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -342,4 +342,12 @@ public function testNewInstanceWithAnonymousClass(): void
         $this->assertInstanceOf(FakeAnonymousClass::class, $mock);
         $this->assertInstanceOf(WeavedInterface::class, $mock);
     }
+
+    /** @requires PHP 8.0 */
+    public function testMethodWithMixedArgument(): void
+    {
+        $mock = $this->compiler->newInstance(FakeMixedParamClass::class, [], $this->bind);
+        $this->assertInstanceOf(FakeMixedParamClass::class, $mock);
+        $this->assertInstanceOf(WeavedInterface::class, $mock);
+    }
 }
diff --git a/tests/Fake/FakeMixedParamClass.php b/tests/Fake/FakeMixedParamClass.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Aop;
+
+class FakeMixedParamClass
+{
+    public function returnSame(mixed $param): void
+    {
+    }
+}