Add a way to get the logical and physical number of cores for Windows (…

…#52)

src/CpuCoreCounter.php

@@ -17,7 +17,7 @@
 use Fidry\CpuCoreCounter\Finder\CpuInfoFinder;
 use Fidry\CpuCoreCounter\Finder\HwLogicalFinder;
 use Fidry\CpuCoreCounter\Finder\NProcFinder;
-use Fidry\CpuCoreCounter\Finder\WindowsWmicFinder;
+use Fidry\CpuCoreCounter\Finder\WindowsWmicLogicalFinder;
 
 final class CpuCoreCounter
 {
@@ -97,7 +97,7 @@ public static function getDefaultFinders(): array
     {
         return [
             new NProcFinder(),
-            new WindowsWmicFinder(),
+            new WindowsWmicLogicalFinder(),
             new HwLogicalFinder(),
             new CpuInfoFinder(),
         ];

src/Finder/WindowsWmicFinder.php → src/Finder/WindowsWmicLogicalFinder.php

@@ -16,11 +16,11 @@
 use function defined;
 
 /**
- * Find the number of CPU cores for Windows.
+ * Find the number of logical CPU cores for Windows.
  *
  * @see https://github.com/paratestphp/paratest/blob/c163539818fd96308ca8dc60f46088461e366ed4/src/Runners/PHPUnit/Options.php#L912-L916
  */
-final class WindowsWmicFinder extends PopenBasedFinder
+final class WindowsWmicLogicalFinder extends PopenBasedFinder
 {
     /**
      * @return positive-int|null

src/Finder/WindowsWmicPhysicalFinder.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Fidry CPUCounter Config package.
+ *
+ * (c) Théo FIDRY <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Fidry\CpuCoreCounter\Finder;
+
+use function defined;
+
+/**
+ * Find the number of physical CPU cores for Windows.
+ *
+ * @see https://github.com/paratestphp/paratest/blob/c163539818fd96308ca8dc60f46088461e366ed4/src/Runners/PHPUnit/Options.php#L912-L916
+ */
+final class WindowsWmicPhysicalFinder extends PopenBasedFinder
+{
+    /**
+     * @return positive-int|null
+     */
+    public function find(): ?int
+    {
+        if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
+            // Skip if not on Windows. Rely on PHP to detect the platform
+            // rather than reading the platform name or others.
+            return null;
+        }
+
+        return parent::find();
+    }
+
+    protected function getCommand(): string
+    {
+        return 'wmic cpu get NumberOfProcessors';
+    }
+}

tests/Finder/WindowsWmicTest.php → tests/Finder/WindowsWmicLogicalFinderTest.php

@@ -14,17 +14,17 @@
 namespace Fidry\CpuCoreCounter\Test\Finder;
 
 use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
-use Fidry\CpuCoreCounter\Finder\WindowsWmicFinder;
+use Fidry\CpuCoreCounter\Finder\WindowsWmicLogicalFinder;
 
 /**
- * @covers \Fidry\CpuCoreCounter\Finder\WindowsWmicFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\WindowsWmicLogicalFinder
  *
  * @internal
  */
-final class WindowsWmicTest extends PopenBasedFinderTestCase
+final class WindowsWmicLogicalFinderTest extends PopenBasedFinderTestCase
 {
     protected function getFinder(): PopenBasedFinder
     {
-        return new WindowsWmicFinder();
+        return new WindowsWmicLogicalFinder();
     }
 }

tests/Finder/WindowsWmicPhysicalFinderTest.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Fidry CPUCounter Config package.
+ *
+ * (c) Théo FIDRY <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Fidry\CpuCoreCounter\Test\Finder;
+
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\WindowsWmicPhysicalFinder;
+
+/**
+ * @covers \Fidry\CpuCoreCounter\Finder\WindowsWmicPhysicalFinder
+ *
+ * @internal
+ */
+final class WindowsWmicPhysicalFinderTest extends PopenBasedFinderTestCase
+{
+    protected function getFinder(): PopenBasedFinder
+    {
+        return new WindowsWmicPhysicalFinder();
+    }
+}