Fix mocking classes with new initializers in method and attribute params on PHP 8.1

composer.json

@@ -51,6 +51,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Fixture\\": "tests/Fixture/",
             "test\\": "tests/"
         },
         "files": [

psalm-baseline.xml

@@ -1575,6 +1575,7 @@
       <code><![CDATA[$method->getParameters()]]></code>
       <code><![CDATA[$overrides[$class_name][$method->getName()]]]></code>
       <code><![CDATA[$overrides[strtolower($class->getName())][$method->getName()]]]></code>
+      <code><![CDATA[$param->__toString()]]></code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code>$param</code>

src/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php

@@ -70,8 +70,20 @@ protected function renderParams(Method $method, $config)
 
                     if (is_object($defaultValue)) {
                         $prefix = get_class($defaultValue);
-                        if ($isPhp81 && enum_exists($prefix)) {
-                            $prefix = var_export($defaultValue, true);
+                        if ($isPhp81) {
+                            if (enum_exists($prefix)) {
+                                $prefix = var_export($defaultValue, true);
+                            } elseif (
+                                !$param->isDefaultValueConstant() &&
+                                // "Parameter #1 [ <optional> F\Q\CN $a = new \F\Q\CN(param1, param2: 2) ]
+                                preg_match(
+                                    '#<optional>\s.*?\s=\snew\s(.*?)\s]$#',
+                                    $param->__toString(),
+                                    $matches
+                                ) === 1
+                            ) {
+                                $prefix = 'new ' . $matches[1];
+                            }
                         }
                     } else {
                         $prefix = var_export($defaultValue, true);
@@ -158,7 +170,7 @@ private function renderMethodBody($method, $config)
 
         $body .= "\$ret = {$invoke}(__FUNCTION__, \$argv);\n";
 
-        if (! in_array($method->getReturnType(), ['never','void'], true)) {
+        if (! in_array($method->getReturnType(), ['never', 'void'], true)) {
             $body .= "return \$ret;\n";
         }
 

tests/Fixture/PHP81/A.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+class A
+{
+    public function __construct(
+        private int $x = 1
+    ) {
+    }
+
+    public function test(): int
+    {
+        return $this->x;
+    }
+}

tests/Fixture/PHP81/B.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+class B
+{
+    public function __construct(
+        private int $x
+    ) {
+    }
+
+    public function test(): int
+    {
+        return $this->x;
+    }
+}

tests/Fixture/PHP81/C.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+class C
+{
+    public function __construct(
+        private int $x = 1,
+        private B $b = new B(1)
+    ) {
+    }
+
+    public function test(): int
+    {
+        return $this->x + $this->b->test();
+    }
+}

tests/Fixture/PHP81/HandlerClass.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+class HandlerClass
+{
+    public function doStuff(MockClass $mockClass): string
+    {
+        return $mockClass->test('test');
+    }
+}

tests/Fixture/PHP81/MockClass.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+use DateTime;
+
+class MockClass
+{
+    public function __construct(
+        public A $a = new A(),
+        protected B $b = new B(1),
+        private C $c = new C(b: new B(1), x: 2),
+        public DateTime $dateTime = new DateTime(),
+    ) {
+    }
+
+    public function test(
+        string $msg,
+        #[SomeAttribute(param: new A())]
+        A $a = new A(),
+        B $b = new B(1),
+        C $c = new C(x: 2),
+        DateTime $dateTime = new DateTime(),
+    ): string {
+        return $msg . ' - ' . $a->test() . ' - ' . $b->test() . ' - ' . $c->test() . ' - ' . $dateTime->format('Y-m-d');
+    }
+}

tests/Fixture/PHP81/SomeAttribute.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixture\PHP81;
+
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class SomeAttribute
+{
+    public function __construct(
+        public object $param = new stdClass()
+    ) {
+    }
+}

tests/Unit/PHP81/Php81LanguageFeaturesTest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace test\Unit\PHP81;
+
+use Fixture\PHP81\HandlerClass;
+use Fixture\PHP81\MockClass;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+/**
+ * @requires PHP 8.1.0-dev
+ */
+class Php81LanguageFeaturesTest extends MockeryTestCase
+{
+    public function testNewInitializerExpression()
+    {
+        $class = mock(MockClass::class)
+            ->expects('test')
+            ->with('test')
+            ->andReturn('it works')
+            ->getMock();
+
+        self::assertSame('it works', (new HandlerClass())->doStuff($class));
+    }
+}