Fix handling of invalid values for the HwFinder and WindowsWmic finder (

#22)
theofidry · Dec 4, 2022 · 2c088b8 · 2c088b8
1 parent f01ffc5
commit 2c088b8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/HwFinder.php b/src/HwFinder.php
@@ -14,9 +14,13 @@
 namespace Fidry\CpuCounter;
 
 use function fgets;
+use function filter_var;
+use function is_int;
 use function is_resource;
 use function pclose;
 use function popen;
+use function trim;
+use const FILTER_VALIDATE_INT;
 
 /**
  * Find the number of CPU cores for Linux, BSD and OSX.
@@ -51,6 +55,8 @@ public function find(): ?int
      */
     public static function countCpuCores(string $process): ?int
     {
-        return (int) $process;
+        $cpuCount = filter_var(trim($process), FILTER_VALIDATE_INT);
+
+        return is_int($cpuCount) && $cpuCount > 0 ? $cpuCount : null;
     }
 }
diff --git a/src/WindowsWmicFinder.php b/src/WindowsWmicFinder.php
@@ -14,9 +14,13 @@
 namespace Fidry\CpuCounter;
 
 use function fgets;
+use function filter_var;
+use function is_int;
 use function is_resource;
 use function pclose;
 use function popen;
+use function trim;
+use const FILTER_VALIDATE_INT;
 
 /**
  * Find the number of CPU cores for Windows.
@@ -51,6 +55,8 @@ public function find(): ?int
      */
     public static function countCpuCores(string $process): ?int
     {
-        return (int) $process;
+        $cpuCount = filter_var(trim($process), FILTER_VALIDATE_INT);
+
+        return is_int($cpuCount) && $cpuCount > 0 ? $cpuCount : null;
     }
 }
diff --git a/tests/HwFinderTest.php b/tests/HwFinderTest.php
@@ -37,6 +37,13 @@ public function test_it_can_count_the_number_of_cpu_cores(
 
     public static function processProvider(): iterable
     {
+        yield 'empty' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         // MyMachine™
         yield 'example from an OSX machine' => [
             <<<'EOF'
@@ -45,5 +52,13 @@ public static function processProvider(): iterable
                 EOF,
             3,
         ];
+
+        yield 'no processor' => [
+            <<<'EOF'
+                0
+
+                EOF,
+            null,
+        ];
     }
 }
diff --git a/tests/WindowsWmicTest.php b/tests/WindowsWmicTest.php
@@ -37,12 +37,27 @@ public function test_it_can_count_the_number_of_cpu_cores(
 
     public static function wmicProvider(): iterable
     {
+        yield 'empty' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         yield 'example from a Windows machine' => [
             <<<'EOF'
                 3
 
                 EOF,
             3,
         ];
+
+        yield 'no processor' => [
+            <<<'EOF'
+                0
+
+                EOF,
+            null,
+        ];
     }
 }