Closes #5316

sebastianbergmann · Feb 27, 2024 · 3dd465e · 3dd465e
1 parent 9ba4d35
commit 3dd465e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 57 deletions.
diff --git a/src/Framework/MockObject/MockBuilder.php b/src/Framework/MockObject/MockBuilder.php
@@ -56,7 +56,6 @@ final class MockBuilder
     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;
@@ -101,7 +100,7 @@ public function getMock(): MockObject
             $this->originalConstructor,
             $this->originalClone,
             $this->autoload,
-            $this->cloneArguments,
+            false,
             $this->callOriginalMethods,
             $this->proxyTarget,
             false,
@@ -269,46 +268,6 @@ public function enableAutoload(): self
         return $this;
     }
 
-    /**
-     * Disables the cloning of arguments passed to mocked methods.
-     *
-     * @return $this
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5315
-     */
-    public function disableArgumentCloning(): self
-    {
-        if (!$this->calledFromTestCase()) {
-            EventFacade::emitter()->testTriggeredPhpunitDeprecation(
-                $this->testCase->valueObjectForEvents(),
-                'MockBuilder::disableArgumentCloning() is deprecated and will be removed in PHPUnit 12 without replacement.',
-            );
-        }
-
-        $this->cloneArguments = false;
-
-        return $this;
-    }
-
-    /**
-     * Enables the cloning of arguments passed to mocked methods.
-     *
-     * @return $this
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5315
-     */
-    public function enableArgumentCloning(): self
-    {
-        EventFacade::emitter()->testTriggeredPhpunitDeprecation(
-            $this->testCase->valueObjectForEvents(),
-            'MockBuilder::enableArgumentCloning() is deprecated and will be removed in PHPUnit 12 without replacement.',
-        );
-
-        $this->cloneArguments = true;
-
-        return $this;
-    }
-
     /**
      * @return $this
      */

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

diff --git a/tests/unit/Framework/MockObject/TestDoubleTestCase.php b/tests/unit/Framework/MockObject/TestDoubleTestCase.php
@@ -89,20 +89,6 @@ public function testObjectsPassedAsArgumentAreNotClonedByDefault(): void
         $this->assertSame($object, $double->doSomething($object));
     }
 
-    #[IgnorePhpunitDeprecations]
-    public function testCloningOfObjectsPassedAsArgumentCanBeEnabled(): void
-    {
-        $object = new stdClass;
-
-        $double = $this->getMockBuilder(InterfaceWithMethodThatExpectsObject::class)
-            ->enableArgumentCloning()
-            ->getMock();
-
-        $double->method('doSomething')->willReturnArgument(0);
-
-        $this->assertNotSame($object, $double->doSomething($object));
-    }
-
     final public function testMethodCanBeConfiguredToReturnOneOfItsArguments(): void
     {
         $double = $this->createTestDouble(InterfaceWithReturnTypeDeclaration::class);