fix(package): minor fix

Author: rtm-ctrlz

.gitignore

@@ -1,4 +1,3 @@
 /vendor/
 /composer.lock
 /test/report-junit.xml
-/test/phpunit.cache.xml

phpcs.xml.dist

@@ -7,9 +7,10 @@
     <arg name="basepath" value="."/>
     <arg name="extensions" value="php"/>
     <arg name="report" value="full"/>
-    <arg name="ignore" value="vendor"/>
     <arg value="psv"/>
     <config name="ignore_warnings_on_exit" value="1"/>
+    <arg name="cache" value="./test/caches/phpcs.cache"/>
+    <arg name="ignore" value="vendor,test/caches"/>
 
     <!-- Target -->
     <file>./src</file>

phpstan.neon.dist

@@ -3,6 +3,10 @@ parameters:
   paths:
     - ./src
     - ./test
+  tmpDir: ./test/caches/phpstan.cache
+  excludePaths:
+    analyseAndScan:
+      - ./test/caches/phpstan.cache
   bootstrapFiles:
     - ./test/phpstan/runkit7.stub.php
   ignoreErrors:

src/Phpunit/MockedFunction.php

@@ -5,12 +5,16 @@
 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
 {
     /** @var GenericMockedFunction */
@@ -48,14 +52,26 @@ static function (...$args) use (&$mockObject, &$method) {
             }
         );
 
-        $method     = $this->mockedFunction->getShortName();
-        $mockObject = $testCase->getMockBuilder(EmptyClass::class)
-                               ->disableOriginalConstructor()
-                               ->disableOriginalClone()
-                               ->disableArgumentCloning()
-                               ->disallowMockingUnknownTypes()
-                               ->addMethods([$method])
-                               ->getMock();
+        $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);
 
         if ($invocationRule === null) {
             $this->invocationMocker = $mockObject->method($method);

src/Phpunit/MockedMethod.php

@@ -5,13 +5,16 @@
 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\ClassMethod\MockedClassMethod;
 use QratorLabs\Smocky\EmptyClass;
 use ReflectionException;
 
+use function assert;
+
 class MockedMethod
 {
     /**
@@ -44,14 +47,25 @@ public function __construct(
         string $method,
         InvocationOrder $invocationRule = null
     ) {
-        $this->mockObject = $testCase
-            ->getMockBuilder(EmptyClass::class)
-            ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
-            ->addMethods([$method])
-            ->getMock();
+        $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);
 
         if ($invocationRule === null) {
             $this->invocationMocker = $this->mockObject->method($method);

test/caches/.gitignore

@@ -0,0 +1,2 @@
+*
+!/.gitignore

test/phpunit/Constant/UndefinedClassConstantTest.php

@@ -24,12 +24,6 @@
  */
 class UndefinedClassConstantTest extends TestCase
 {
-    public function testMissingConstantException(): void
-    {
-        $this->expectException(ReflectionException::class);
-        new UndefinedClassConstant(ClassWithConstants::class, 'CONST_UNDEFINED');
-    }
-
     /**
      * @return Generator<string, array{string, string}>
      */
@@ -54,26 +48,29 @@ public function dataCoreConstants(): Generator
      */
     public function testCoreConstants(string $class, string $constantName): void
     {
-        $ex = new class extends RuntimeException {
+        $ex  = new class extends RuntimeException {
         };
         $cls = get_class($ex);
 
-        $prev = set_error_handler(static function (int $errno, string $errstr) use ($cls) {
+        set_error_handler(static function (int $errno, string $errstr) use ($cls) {
             throw new $cls($errstr, $errno);
         }, E_WARNING);
 
 
         $this->expectException($cls);
         try {
             new UndefinedClassConstant($class, $constantName);
-        } catch (Throwable $ex) {
-            if ($prev) {
-                set_error_handler($prev);
-            }
-            throw $ex;
+        } finally {
+            restore_error_handler();
         }
     }
 
+    public function testMissingConstantException(): void
+    {
+        $this->expectException(ReflectionException::class);
+        new UndefinedClassConstant(ClassWithConstants::class, 'CONST_UNDEFINED');
+    }
+
     /**
      * @param string               $class
      * @param string               $constantName

test/phpunit/Constant/UndefinedGlobalConstantTest.php

@@ -17,8 +17,6 @@
 use function set_error_handler;
 use function uniqid;
 
-use const E_WARNING;
-
 /**
  * @internal
  */
@@ -36,19 +34,15 @@ public function testOnlyUserDefined(): void
         };
         $cls = get_class($ex);
 
-        $prev = set_error_handler(static function (int $errno, string $errstr) use ($cls) {
+        set_error_handler(static function (int $errno, string $errstr) use ($cls) {
             throw new $cls($errstr, $errno);
-        }, E_WARNING);
-
+        });
 
         $this->expectException($cls);
         try {
             new UndefinedGlobalConstant('PHP_VERSION');
-        } catch (Throwable $ex) {
-            if ($prev) {
-                set_error_handler($prev);
-            }
-            throw $ex;
+        } finally {
+            restore_error_handler();
         }
     }