fix: fixes mixed types being stubbed as mixed|null

souplette-php · Jan 10, 2024 · a0aef67 · a0aef67
1 parent 86427a1
commit a0aef67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/mocks/functions.php b/mocks/functions.php
@@ -5,6 +5,7 @@
 use ArrayAccess;
 use Traversable;
 
+function mixed_arg(mixed $arg): void {}
 function nullable_arg(?string $arg): void {}
 function variadic_arg(string ...$arg): void {}
 function default_arg(string $arg = 'foo'): void {}

diff --git a/src/Internal/AstBuilder.php b/src/Internal/AstBuilder.php
@@ -329,7 +329,7 @@ private function buildType(ReflectionType $type): string
                     default => $this->resolveName($name),
                 },
             };
-            if ($type->allowsNull() && $name !== 'null') {
+            if ($type->allowsNull() && !\in_array($name, ['mixed', 'null'])) {
                 return "{$name}|null";
             }
             return $name;

diff --git a/tests/Generator/FunctionsTest.php b/tests/Generator/FunctionsTest.php
@@ -9,6 +9,7 @@
 use function Souplette\Chicot\Mocks\default_arg;
 use function Souplette\Chicot\Mocks\dnf_arg;
 use function Souplette\Chicot\Mocks\intersection_arg;
+use function Souplette\Chicot\Mocks\mixed_arg;
 use function Souplette\Chicot\Mocks\nullable_arg;
 use function Souplette\Chicot\Mocks\union_arg;
 use function Souplette\Chicot\Mocks\variadic_arg;
@@ -27,6 +28,12 @@ public function testFunctions(callable $fn, string $expected): void
 
     public static function functionsProvider(): iterable
     {
+        yield 'mixed arg' => [
+            mixed_arg(...),
+            <<<'PHP'
+            function mixed_arg(mixed $arg) : void {}
+            PHP,
+        ];
         yield 'nullable arg' => [
             nullable_arg(...),
             <<<'PHP'