Simplify usage of php-invoker

Author: sebastianbergmann

build.xml

@@ -34,23 +34,13 @@
     </target>
 
     <target name="install-dependencies" unless="dependencies-installed" depends="-dependencies-installed,validate-composer-json" description="Install dependencies with Composer">
-        <copy file="${basedir}/composer.json" tofile="${basedir}/build/tmp/composer.json"/>
-
-        <exec executable="${basedir}/tools/composer" taskname="composer">
-            <arg value="require"/>
-            <arg value="--no-update"/>
-            <arg value="phpunit/php-invoker:^2.0"/>
-        </exec>
-
         <exec executable="${basedir}/tools/composer" taskname="composer">
             <arg value="update"/>
             <arg value="--no-interaction"/>
             <arg value="--no-progress"/>
             <arg value="--no-ansi"/>
             <arg value="--no-suggest"/>
         </exec>
-
-        <move file="${basedir}/build/tmp/composer.json" tofile="${basedir}/composer.json"/>
     </target>
 
     <target name="check-dependencies" description="Performs check for outdated dependencies">

composer.json

@@ -19,6 +19,7 @@
     "support": {
         "issues": "https://github.com/sebastianbergmann/phpunit/issues"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": "^7.3",
@@ -35,6 +36,7 @@
         "phpspec/prophecy": "^1.8.1",
         "phpunit/php-code-coverage": "^7.0.7",
         "phpunit/php-file-iterator": "^2.0.2",
+        "phpunit/php-invoker": "^3.0",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.1.2",
         "sebastian/comparator": "^3.0.2",
@@ -58,7 +60,6 @@
         "sort-packages": true
     },
     "suggest": {
-        "phpunit/php-invoker": "^2.0.0",
         "ext-soap": "*",
         "ext-xdebug": "*"
     },

src/Framework/TestResult.php

@@ -659,10 +659,12 @@ public function run(Test $test): void
         Timer::start();
 
         try {
+            $invoker = new Invoker;
+
             if (!$test instanceof WarningTestCase &&
                 $this->enforceTimeLimit &&
                 ($this->defaultTimeLimit || $test->getSize() != \PHPUnit\Util\Test::UNKNOWN) &&
-                \extension_loaded('pcntl') && \class_exists(Invoker::class)) {
+                $invoker->canInvokeWithTimeout()) {
                 switch ($test->getSize()) {
                     case \PHPUnit\Util\Test::SMALL:
                         $_timeout = $this->timeoutForSmallTests;
@@ -685,7 +687,6 @@ public function run(Test $test): void
                         break;
                 }
 
-                $invoker = new Invoker;
                 $invoker->invoke([$test, 'runBare'], [], $_timeout);
             } else {
                 $test->runBare();

src/TextUI/TestRunner.php

@@ -592,15 +592,10 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
         $result->beStrictAboutTodoAnnotatedTests($arguments['disallowTodoAnnotatedTests']);
         $result->beStrictAboutResourceUsageDuringSmallTests($arguments['beStrictAboutResourceUsageDuringSmallTests']);
 
-        if ($arguments['enforceTimeLimit'] === true) {
-            if (!\class_exists(Invoker::class)) {
-                $this->writeMessage('Error', 'Package phpunit/php-invoker is required for enforcing time limits');
-            }
-
-            if (!\extension_loaded('pcntl') || \strpos(\ini_get('disable_functions'), 'pcntl') !== false) {
-                $this->writeMessage('Error', 'PHP extension pcntl is required for enforcing time limits');
-            }
+        if ($arguments['enforceTimeLimit'] === true && !(new Invoker)->canInvokeWithTimeout()) {
+            $this->writeMessage('Error', 'PHP extension pcntl is required for enforcing time limits');
         }
+
         $result->enforceTimeLimit($arguments['enforceTimeLimit']);
         $result->setDefaultTimeLimit($arguments['defaultTimeLimit']);
         $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']);