Merge branch '11.2'

Author: sebastianbergmann

src/Framework/MockObject/Generator/Generator.php

@@ -578,15 +578,28 @@ private function userDefinedInterfaceMethods(string $interfaceName): array
     private function getObject(MockType $mockClass, string $type = '', bool $callOriginalConstructor = false, array $arguments = [], bool $callOriginalMethods = false, ?object $proxyTarget = null, bool $returnValueGeneration = true): object
     {
         $className = $mockClass->generate();
-        $object    = $this->instantiate($className, $callOriginalConstructor, $arguments);
+
+        try {
+            $object = (new ReflectionClass($className))->newInstanceWithoutConstructor();
+            // @codeCoverageIgnoreStart
+        } catch (\ReflectionException $e) {
+            throw new ReflectionException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e,
+            );
+            // @codeCoverageIgnoreEnd
+        }
+
+        $reflector = new ReflectionObject($object);
 
         if ($object instanceof StubInternal && $mockClass instanceof MockClass) {
             /**
              * @psalm-suppress MissingThrowsDocblock
              *
              * @noinspection PhpUnhandledExceptionInspection
              */
-            (new ReflectionObject($object))->getProperty('__phpunit_state')->setValue(
+            $reflector->getProperty('__phpunit_state')->setValue(
                 $object,
                 new TestDoubleState($mockClass->configurableMethods(), $returnValueGeneration),
             );
@@ -596,6 +609,20 @@ private function getObject(MockType $mockClass, string $type = '', bool $callOri
             }
         }
 
+        if ($callOriginalConstructor && $reflector->getConstructor() !== null) {
+            try {
+                $reflector->getConstructor()->invokeArgs($object, $arguments);
+                // @codeCoverageIgnoreStart
+            } catch (\ReflectionException $e) {
+                throw new ReflectionException(
+                    $e->getMessage(),
+                    $e->getCode(),
+                    $e,
+                );
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
         return $object;
     }
 
@@ -1003,44 +1030,6 @@ trait_exists($className, false)) {
         }
     }
 
-    /**
-     * @psalm-param class-string $className
-     *
-     * @throws ReflectionException
-     */
-    private function instantiate(string $className, bool $callOriginalConstructor, array $arguments): object
-    {
-        if ($callOriginalConstructor) {
-            if (count($arguments) === 0) {
-                return new $className;
-            }
-
-            try {
-                return (new ReflectionClass($className))->newInstanceArgs($arguments);
-                // @codeCoverageIgnoreStart
-            } catch (\ReflectionException $e) {
-                throw new ReflectionException(
-                    $e->getMessage(),
-                    $e->getCode(),
-                    $e,
-                );
-            }
-            // @codeCoverageIgnoreEnd
-        }
-
-        try {
-            return (new ReflectionClass($className))->newInstanceWithoutConstructor();
-            // @codeCoverageIgnoreStart
-        } catch (\ReflectionException $e) {
-            throw new ReflectionException(
-                $e->getMessage(),
-                $e->getCode(),
-                $e,
-            );
-            // @codeCoverageIgnoreEnd
-        }
-    }
-
     /**
      * @psalm-param class-string $type
      *

tests/unit/Framework/MockObject/Creation/MockBuilderTest.php

@@ -170,8 +170,6 @@ public function testCreatesMockObjectForUnknownType(): void
     #[TestDox('Mocked methods can be called from the original constructor of a partially mocked class')]
     public function testOnlyMethodCalledInConstructorWorks(): void
     {
-        $this->markTestIncomplete('https://github.com/sebastianbergmann/phpunit/issues/5857');
-
         $double = $this->getMockBuilder(ClassCallingMethodInConstructor::class)
             ->onlyMethods(['reset'])
             ->getMock();