Closes #5247

sebastianbergmann · Oct 6, 2024 · a79078c · a79078c
1 parent b2f75a1
commit a79078c
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 296 deletions.
diff --git a/ChangeLog-12.0.md b/ChangeLog-12.0.md
@@ -6,6 +6,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 
 ### Removed
 
+* [#5247](https://github.com/sebastianbergmann/phpunit/issues/5247): `TestCase::getMockForAbstractClass()`
 * [#5978](https://github.com/sebastianbergmann/phpunit/issues/5978): Support for PHP 8.2
 
 [12.0.0]: https://github.com/sebastianbergmann/phpunit/compare/11.5...main
diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md
@@ -18,7 +18,6 @@ This functionality is currently [hard-deprecated](https://phpunit.de/backward-co
 | Issue                                                             | Description                                                                    | Since  | Replacement                                                                             |
 |-------------------------------------------------------------------|--------------------------------------------------------------------------------|--------|-----------------------------------------------------------------------------------------|
 | [#5240](https://github.com/sebastianbergmann/phpunit/issues/5240) | `TestCase::createTestProxy()`                                                  | 10.1.0 |                                                                                         |
-| [#5241](https://github.com/sebastianbergmann/phpunit/issues/5241) | `TestCase::getMockForAbstractClass()`                                          | 10.1.0 |                                                                                         |
 | [#5242](https://github.com/sebastianbergmann/phpunit/issues/5242) | `TestCase::getMockFromWsdl()`                                                  | 10.1.0 |                                                                                         |
 | [#5243](https://github.com/sebastianbergmann/phpunit/issues/5243) | `TestCase::getMockForTrait()`                                                  | 10.1.0 |                                                                                         |
 | [#5244](https://github.com/sebastianbergmann/phpunit/issues/5244) | `TestCase::getObjectForTrait()`                                                | 10.1.0 |                                                                                         |

diff --git a/src/Event/Emitter/DispatchingEmitter.php b/src/Event/Emitter/DispatchingEmitter.php
@@ -517,22 +517,6 @@ public function testCreatedMockObjectForTrait(string $traitName): void
         );
     }
 
-    /**
-     * @param class-string $className
-     *
-     * @throws InvalidArgumentException
-     * @throws UnknownEventTypeException
-     */
-    public function testCreatedMockObjectForAbstractClass(string $className): void
-    {
-        $this->dispatcher->dispatch(
-            new Test\MockObjectForAbstractClassCreated(
-                $this->telemetryInfo(),
-                $className,
-            ),
-        );
-    }
-
     /**
      * @param class-string $originalClassName
      * @param class-string $mockClassName

diff --git a/src/Event/Emitter/Emitter.php b/src/Event/Emitter/Emitter.php
@@ -122,11 +122,6 @@ public function testCreatedMockObjectForIntersectionOfInterfaces(array $interfac
      */
     public function testCreatedMockObjectForTrait(string $traitName): void;
 
-    /**
-     * @param class-string $className
-     */
-    public function testCreatedMockObjectForAbstractClass(string $className): void;
-
     /**
      * @param class-string $originalClassName
      * @param class-string $mockClassName

diff --git a/src/Event/Events/Test/TestDouble/MockObjectForAbstractClassCreated.php b/src/Event/Events/Test/TestDouble/MockObjectForAbstractClassCreated.php
diff --git a/src/Event/Events/Test/TestDouble/MockObjectForAbstractClassCreatedSubscriber.php b/src/Event/Events/Test/TestDouble/MockObjectForAbstractClassCreatedSubscriber.php
diff --git a/src/Event/Facade.php b/src/Event/Facade.php
@@ -209,7 +209,6 @@ private function registerDefaultTypes(TypeMap $typeMap): void
             Test\WarningTriggered::class,
 
             Test\MockObjectCreated::class,
-            Test\MockObjectForAbstractClassCreated::class,
             Test\MockObjectForIntersectionOfInterfacesCreated::class,
             Test\MockObjectForTraitCreated::class,
             Test\MockObjectFromWsdlCreated::class,

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -1478,52 +1478,6 @@ final protected function createTestProxy(string $originalClassName, array $const
         return $testProxy;
     }
 
-    /**
-     * Creates a mock object for the specified abstract class with all abstract
-     * methods of the class mocked. Concrete methods are not mocked by default.
-     * To mock concrete methods, use the 7th parameter ($mockedMethods).
-     *
-     * @template RealInstanceType of object
-     *
-     * @param class-string<RealInstanceType> $originalClassName
-     * @param array<mixed>                   $arguments
-     * @param list<non-empty-string>         $mockedMethods
-     *
-     * @throws InvalidArgumentException
-     * @throws MockObjectException
-     *
-     * @return MockObject&RealInstanceType
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5241
-     */
-    final protected function getMockForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = [], bool $cloneArguments = false): MockObject
-    {
-        Event\Facade::emitter()->testTriggeredPhpunitDeprecation(
-            $this->valueObjectForEvents(),
-            'getMockForAbstractClass() is deprecated and will be removed in PHPUnit 12 without replacement.',
-        );
-
-        $mockObject = (new MockGenerator)->mockObjectForAbstractClass(
-            $originalClassName,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $mockedMethods,
-            $cloneArguments,
-        );
-
-        $this->registerMockObject($mockObject);
-
-        Event\Facade::emitter()->testCreatedMockObjectForAbstractClass($originalClassName);
-
-        assert($mockObject instanceof $originalClassName);
-        assert($mockObject instanceof MockObject);
-
-        return $mockObject;
-    }
-
     /**
      * Creates a mock object based on the given WSDL file.
      *

diff --git a/tests/unit/Event/Emitter/DispatchingEmitterTest.php b/tests/unit/Event/Emitter/DispatchingEmitterTest.php
@@ -1138,42 +1138,6 @@ public function notify(Test\MockObjectForTraitCreated $event): void
         $this->assertSame($traitName, $event->traitName());
     }
 
-    public function testTestMockObjectCreatedForAbstractClassDispatchesTestDoubleMockObjectCreatedForAbstractClassEvent(): void
-    {
-        $className = stdClass::class;
-
-        $subscriber = new class extends RecordingSubscriber implements Test\MockObjectForAbstractClassCreatedSubscriber
-        {
-            public function notify(Test\MockObjectForAbstractClassCreated $event): void
-            {
-                $this->record($event);
-            }
-        };
-
-        $dispatcher = $this->dispatcherWithRegisteredSubscriber(
-            Test\MockObjectForAbstractClassCreatedSubscriber::class,
-            Test\MockObjectForAbstractClassCreated::class,
-            $subscriber,
-        );
-
-        $telemetrySystem = $this->telemetrySystem();
-
-        $emitter = new DispatchingEmitter(
-            $dispatcher,
-            $telemetrySystem,
-        );
-
-        $emitter->testCreatedMockObjectForAbstractClass($className);
-
-        $this->assertSame(1, $subscriber->recordedEventCount());
-
-        $event = $subscriber->lastRecordedEvent();
-
-        $this->assertInstanceOf(Test\MockObjectForAbstractClassCreated::class, $event);
-
-        $this->assertSame($className, $event->className());
-    }
-
     public function testTestMockObjectCreatedFromWsdlDispatchesTestDoubleMockObjectCreatedFromWsdlEvent(): void
     {
         $wsdlFile          = __FILE__;

diff --git a/tests/unit/Event/Events/TestDouble/MockObjectForAbstractClassCreatedTest.php b/tests/unit/Event/Events/TestDouble/MockObjectForAbstractClassCreatedTest.php
diff --git a/tests/unit/Framework/MockObject/Creation/GetMockForAbstractClassTest.php b/tests/unit/Framework/MockObject/Creation/GetMockForAbstractClassTest.php