Integrate FidryCpuCoreCounter

paratestphp · Dec 11, 2022 · 33c5146 · 33c5146
1 parent 7b0595a
commit 33c5146
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -38,13 +38,14 @@
         "ext-pcre": "*",
         "ext-reflection": "*",
         "ext-simplexml": "*",
+        "fidry/cpu-core-counter": "^0.4.0",
         "jean85/pretty-package-versions": "^2.0.5",
         "phpunit/php-code-coverage": "^9.2.19",
         "phpunit/php-file-iterator": "^3.0.6",
         "phpunit/php-timer": "^5.0.3",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^9.5.27",
         "sebastian/environment": "^5.1.4",
-        "symfony/console": "^5.4.12 || ^6.2",
+        "symfony/console": "^5.4.12 || ^6.2.1",
         "symfony/process": "^5.4.11 || ^6.2"
     },
     "require-dev": {

diff --git a/src/Runners/PHPUnit/Options.php b/src/Runners/PHPUnit/Options.php
@@ -4,6 +4,8 @@
 
 namespace ParaTest\Runners\PHPUnit;
 
+use Fidry\CpuCoreCounter\CpuCoreCounter;
+use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound;
 use InvalidArgumentException;
 use ParaTest\Util\Str;
 use PHPUnit\TextUI\DefaultResultPrinter;
@@ -22,9 +24,7 @@
 use function dirname;
 use function escapeshellarg;
 use function explode;
-use function fgets;
 use function file_exists;
-use function file_get_contents;
 use function implode;
 use function in_array;
 use function intdiv;
@@ -34,10 +34,7 @@
 use function is_numeric;
 use function is_string;
 use function ksort;
-use function pclose;
-use function popen;
 use function preg_match;
-use function preg_match_all;
 use function realpath;
 use function sprintf;
 use function strlen;
@@ -899,30 +896,11 @@ private static function isAbsolutePath(string $path): bool
      */
     public static function getNumberOfCPUCores(): int
     {
-        $cores = 2;
-        if (is_file('/proc/cpuinfo')) {
-            // Linux (and potentially Windows with linux sub systems)
-            $cpuinfo = file_get_contents('/proc/cpuinfo');
-            assert($cpuinfo !== false);
-            preg_match_all('/^processor/m', $cpuinfo, $matches);
-            $cores = count($matches[0]);
-        // @codeCoverageIgnoreStart
-        } elseif (DIRECTORY_SEPARATOR === '\\') {
-            // Windows
-            if (($process = @popen('wmic cpu get NumberOfLogicalProcessors', 'rb')) !== false) {
-                fgets($process);
-                $cores = (int) fgets($process);
-                pclose($process);
-            }
-        } elseif (($process = @popen('sysctl -n hw.ncpu', 'rb')) !== false) {
-            // *nix (Linux, BSD and Mac)
-            $cores = (int) fgets($process);
-            pclose($process);
+        try {
+            return (new CpuCoreCounter())->getCount();
+        } catch (NumberOfCpuCoreNotFound $exception) {
+            return 2;
         }
-
-        // @codeCoverageIgnoreEnd
-
-        return $cores;
     }
 
     /** @return string[]|null */