fix(package): minor fix

QratorLabs · Feb 19, 2024 · 42631f6 · 42631f6
1 parent 9400cbc
commit 42631f6
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 47 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -11,4 +11,6 @@ parameters:
     - ./test/phpstan/runkit7.stub.php
   ignoreErrors:
     - path: test/phpunit/Helpers/ClassWithMethods.php
-      message: '/^Method .*\\ClassWithMethods::privateMethod\(\) is unused\.$/'
+      message: '/^Method .*\\ClassWithMethods::privateMethod\(\) is unused\.$/'
+    - path: src/Phpunit/AbstractMocked.php
+      message: '/^Parameter #\d+ \S+ of method PHPUnit\\Framework\\MockObject\\Generator\\Generator::testDouble\(\)/'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
         backupGlobals="true"
-        cacheResultFile="./test/phpunit.cache.xml"
+        cacheResultFile="./test/caches/phpunit.cache.xml"
 >
   <coverage>
     <include>

diff --git a/src/Phpunit/AbstractMocked.php b/src/Phpunit/AbstractMocked.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace QratorLabs\Smocky\Phpunit;
+
+use PHPUnit\Framework\MockObject\Generator\Generator;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use QratorLabs\Smocky\EmptyClass;
+use ReflectionMethod;
+
+use function assert;
+
+abstract class AbstractMocked
+{
+    /**
+     * @return MockObject&EmptyClass
+     */
+    protected static function createEmptyMock(TestCase $testCase, string $method): MockObject
+    {
+        $args = [
+            EmptyClass::class,  // string $type
+            true,               // bool $mockObject
+            true,               // bool $markAsMockObject
+            [$method],          // ?array $methods = []
+            [],                 // array $arguments = []
+            '',                 // string $mockClassName = ''
+            false,              // bool $callOriginalConstructor = true
+            false,              // bool $callOriginalClone = true
+            true,               // bool $callAutoload = true
+            false,              // bool $cloneArguments = true
+            false,              // bool $callOriginalMethods = false
+            null,               // object $proxyTarget = null
+            false,              // bool $allowMockingUnknownTypes = true
+            true,               // bool $returnValueGeneration = true
+        ];
+
+        if (count($args) > (new ReflectionMethod(Generator::class, 'testDouble'))->getNumberOfParameters()) {
+            // 10 -> 11 transition
+            unset($args[2]);
+        }
+
+        $mockObject = (new Generator())->testDouble(...$args);
+        assert($mockObject instanceof EmptyClass);
+        assert($mockObject instanceof MockObject);
+        $testCase->registerMockObject($mockObject);
+
+        return $mockObject;
+    }
+}
diff --git a/src/Phpunit/MockedFunction.php b/src/Phpunit/MockedFunction.php
@@ -5,17 +5,12 @@
 namespace QratorLabs\Smocky\Phpunit;
 
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-use PHPUnit\Framework\MockObject\Generator\Generator;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 use PHPUnit\Framework\TestCase;
-use QratorLabs\Smocky\EmptyClass;
 use QratorLabs\Smocky\Functions\MockedFunction as GenericMockedFunction;
 use ReflectionException;
 
-use function assert;
-
-class MockedFunction
+class MockedFunction extends AbstractMocked
 {
     /** @var GenericMockedFunction */
     private $mockedFunction;
@@ -53,25 +48,7 @@ static function (...$args) use (&$mockObject, &$method) {
         );
 
         $method = $this->mockedFunction->getShortName();
-
-        $mockObject = (new Generator())->testDouble(
-            EmptyClass::class,
-            true,
-            true,
-            [$method],
-            [],
-            '',
-            false,
-            false,
-            true,
-            false,
-            false,
-            null,
-            false
-        );
-        assert($mockObject instanceof EmptyClass);
-        assert($mockObject instanceof MockObject);
-        $testCase->registerMockObject($mockObject);
+        $mockObject = self::createEmptyMock($testCase, $method);
 
         if ($invocationRule === null) {
             $this->invocationMocker = $mockObject->method($method);

diff --git a/src/Phpunit/MockedMethod.php b/src/Phpunit/MockedMethod.php
@@ -15,7 +15,7 @@
 
 use function assert;
 
-class MockedMethod
+class MockedMethod extends AbstractMocked
 {
     /**
      * @var MockedClassMethod
@@ -47,25 +47,7 @@ public function __construct(
         string $method,
         InvocationOrder $invocationRule = null
     ) {
-        $mockObject = (new Generator())->testDouble(
-            EmptyClass::class,
-            true,
-            true,
-            [$method],
-            [],
-            '',
-            false,
-            false,
-            true,
-            false,
-            false,
-            null,
-            false
-        );
-        assert($mockObject instanceof EmptyClass);
-        assert($mockObject instanceof MockObject);
-        $this->mockObject = $mockObject;
-        $testCase->registerMockObject($this->mockObject);
+        $this->mockObject = self::createEmptyMock($testCase, $method);
 
         if ($invocationRule === null) {
             $this->invocationMocker = $this->mockObject->method($method);