Closes #5311

sebastianbergmann · Jul 19, 2024 · 6eb5e38 · 6eb5e38
1 parent 6e69c0b
commit 6eb5e38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 74 deletions.
diff --git a/src/Framework/MockObject/MockBuilder.php b/src/Framework/MockObject/MockBuilder.php
@@ -15,7 +15,6 @@
 use function debug_backtrace;
 use PHPUnit\Event\Facade as EventFacade;
 use PHPUnit\Framework\InvalidArgumentException;
-use PHPUnit\Framework\MockObject\Generator\CannotUseAddMethodsException;
 use PHPUnit\Framework\MockObject\Generator\ClassIsEnumerationException;
 use PHPUnit\Framework\MockObject\Generator\ClassIsFinalException;
 use PHPUnit\Framework\MockObject\Generator\DuplicateMethodException;
@@ -39,33 +38,28 @@ final class MockBuilder
     private readonly TestCase $testCase;
 
     /**
-     * @var class-string|trait-string
+     * @psalm-var class-string|trait-string
      */
     private readonly string $type;
 
     /**
-     * @var list<non-empty-string>
+     * @psalm-var list<non-empty-string>
      */
     private array $methods          = [];
     private bool $emptyMethodsArray = false;
 
     /**
-     * @var ?class-string
+     * @psalm-var ?class-string
      */
-    private ?string $mockClassName = null;
-
-    /**
-     * @var array<mixed>
-     */
-    private array $constructorArgs         = [];
-    private bool $originalConstructor      = true;
-    private bool $originalClone            = true;
-    private bool $autoload                 = true;
-    private bool $cloneArguments           = false;
-    private bool $callOriginalMethods      = false;
-    private ?object $proxyTarget           = null;
-    private bool $allowMockingUnknownTypes = true;
-    private bool $returnValueGeneration    = true;
+    private ?string $mockClassName      = null;
+    private array $constructorArgs      = [];
+    private bool $originalConstructor   = true;
+    private bool $originalClone         = true;
+    private bool $autoload              = true;
+    private bool $cloneArguments        = false;
+    private bool $callOriginalMethods   = false;
+    private ?object $proxyTarget        = null;
+    private bool $returnValueGeneration = true;
     private readonly Generator $generator;
 
     /**
@@ -109,7 +103,7 @@ public function getMock(): MockObject
             $this->cloneArguments,
             $this->callOriginalMethods,
             $this->proxyTarget,
-            $this->allowMockingUnknownTypes,
+            false,
             $this->returnValueGeneration,
         );
 
@@ -320,42 +314,6 @@ public function enableArgumentCloning(): self
         return $this;
     }
 
-    /**
-     * @return $this
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5308
-     */
-    public function allowMockingUnknownTypes(): self
-    {
-        EventFacade::emitter()->testTriggeredPhpunitDeprecation(
-            $this->testCase->valueObjectForEvents(),
-            'MockBuilder::allowMockingUnknownTypes() is deprecated and will be removed in PHPUnit 12 without replacement.',
-        );
-
-        $this->allowMockingUnknownTypes = true;
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5308
-     */
-    public function disallowMockingUnknownTypes(): self
-    {
-        if (!$this->calledFromTestCase()) {
-            EventFacade::emitter()->testTriggeredPhpunitDeprecation(
-                $this->testCase->valueObjectForEvents(),
-                'MockBuilder::disallowMockingUnknownTypes() is deprecated and will be removed in PHPUnit 12 without replacement.',
-            );
-        }
-
-        $this->allowMockingUnknownTypes = false;
-
-        return $this;
-    }
-
     /**
      * @return $this
      */

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -1419,7 +1419,6 @@ final protected function createPartialMock(string $originalClassName, array $met
             ->disableOriginalConstructor()
             ->disableOriginalClone()
             ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->onlyMethods($methods);
 
         if (!self::generateReturnValuesForTestDoubles()) {

diff --git a/tests/unit/Framework/MockObject/Creation/MockBuilderTest.php b/tests/unit/Framework/MockObject/Creation/MockBuilderTest.php
@@ -74,22 +74,6 @@ public function testCreatesPartialMockObjectForExtendableClass(): void
         $this->assertTrue($double->doSomething());
     }
 
-    #[IgnorePhpunitDeprecations]
-    #[TestDox('allowMockingUnknownTypes() can be used to allow mocking of unknown types')]
-    public function testCreatesMockObjectForUnknownType(): void
-    {
-        $type = 'Type_' . substr(md5((string) mt_rand()), 0, 8);
-
-        assert(!class_exists($type) && !interface_exists($type) && !trait_exists($type));
-
-        $double = $this->getMockBuilder($type)
-            ->allowMockingUnknownTypes()
-            ->getMock();
-
-        $this->assertInstanceOf($type, $double);
-        $this->assertInstanceOf(MockObject::class, $double);
-    }
-
     #[IgnorePhpunitDeprecations]
     public function testDefaultBehaviourCanBeConfiguredExplicitly(): void
     {
@@ -98,8 +82,6 @@ public function testDefaultBehaviourCanBeConfiguredExplicitly(): void
             ->enableOriginalClone()
             ->enableAutoload()
             ->enableArgumentCloning()
-            ->disableProxyingToOriginalMethods()
-            ->allowMockingUnknownTypes()
             ->enableAutoReturnValueGeneration()
             ->getMock();