Merge pull request #277 from WyriHaximus/drop-dreprecated-methods

Drop deprecated methods

Author: WyriHaximus

composer.json

@@ -43,7 +43,8 @@
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "ergebnis/composer-normalize": true,
       "icanhazstring/composer-unused": true,
-      "infection/extension-installer": true
+      "infection/extension-installer": true,
+      "phpstan/extension-installer": true
     },
     "platform": {
       "php": "8.2.13"

composer.lock

@@ -1,10 +1,6 @@
 parameters:
 	excludePaths:
 		- tests/bootstrap.php
-	ignoreErrors:
-		- '#Method WyriHaximus\\AsyncTestUtilities\\CallableStub::__invoke\(\) is not final, but since the containing class is abstract, it should be.#'
-		- '#Call to deprecated method expectCallableExactly\(\)#'
-		- '#Call to deprecated method expectCallableOnce\(\)#'
 	ergebnis:
 		noExtends:
 			classesAllowedToBeExtended:

etc/qa/phpstan.neon

@@ -4,44 +4,10 @@
 
 namespace WyriHaximus\AsyncTestUtilities;
 
-use PHPUnit\Framework\MockObject\Rule\InvokedCount;
 use WyriHaximus\React\PHPUnit\RunTestsInFibersTrait;
 use WyriHaximus\TestUtilities\TestCase;
 
 abstract class AsyncTestCase extends TestCase
 {
     use RunTestsInFibersTrait;
-
-    private const INVOKE_ARRAY = ['__invoke'];
-
-    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
-    final protected function expectCallableExactly(int $amount): callable
-    {
-        return $this->getCallableMock(self::exactly($amount));
-    }
-
-    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
-    final protected function expectCallableOnce(): callable
-    {
-        return $this->getCallableMock(self::once());
-    }
-
-    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
-    final protected function expectCallableNever(): callable
-    {
-        return $this->getCallableMock(self::never());
-    }
-
-    /** @psalm-suppress InvalidReturnType */
-    private function getCallableMock(InvokedCount $invokedCount): callable
-    {
-        $mock = $this->getMockBuilder(CallableStub::class)->onlyMethods(self::INVOKE_ARRAY)->getMock();
-        /** @psalm-suppress InternalMethod */
-        $mock
-            ->expects($invokedCount)
-            ->method('__invoke');
-
-        /** @psalm-suppress InvalidReturnStatement */
-        return $mock;
-    }
 }

src/AsyncTestCase.php

@@ -34,18 +34,4 @@ public function testFiberGetCurrentReturnsAFiberInstance(): void
     {
         self::assertInstanceOf(Fiber::class, Fiber::getCurrent());
     }
-
-    public function testExpectCallableExactly(): void
-    {
-        $callable = $this->expectCallableExactly(3);
-
-        $callable();
-        $callable();
-        $callable();
-    }
-
-    public function testExpectCallableOnce(): void
-    {
-        $this->expectCallableOnce()();
-    }
 }