Remove unnecessary code (#32)

theofidry · Dec 4, 2022 · 7454c93 · 7454c93
1 parent fcf6d38
commit 7454c93
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 12 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -27,6 +27,7 @@
         EOF,
     74_000,
 );
+$config->addRules(['mb_str_functions' => false]);
 $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
 
 return $config->setFinder($finder);
diff --git a/Makefile b/Makefile
@@ -13,7 +13,8 @@ COVERAGE_INFECTION = $(COVERAGE_XML) $(COVERAGE_JUNIT)
 TARGET_MSI = 100
 
 INFECTION_BIN = tools/infection
-INFECTION = $(INFECTION_BIN) --skip-initial-tests --coverage=$(COVERAGE_DIR) --show-mutations --ansi
+INFECTION = $(INFECTION_BIN) --skip-initial-tests --coverage=$(COVERAGE_DIR) --only-covered --show-mutations --ansi
+INFECTION_WITH_INITIAL_TESTS = $(INFECTION_BIN) --only-covered --show-mutations --ansi
 
 PHPUNIT_BIN = vendor/bin/phpunit
 PHPUNIT = php -d zend.enable_gc=0 $(PHPUNIT_BIN)
@@ -132,7 +133,11 @@ phpunit_coverage_html: $(PHPUNIT_BIN) vendor
 
 .PHONY: infection
 infection: ## Runs infection
-infection: $(INFECTION_BIN) $(COVERAGE_INFECTION) vendor
+infection: $(INFECTION_BIN) vendor
+	$(INFECTION_WITH_INITIAL_TESTS)
+
+.PHONY: _infection
+_infection: $(INFECTION_BIN) $(COVERAGE_XML) $(COVERAGE_JUNIT) vendor
 	$(INFECTION)
 
 .PHONY: security
@@ -160,9 +165,15 @@ vendor: composer.json
 $(PHPUNIT_BIN): vendor
 	touch -c $@
 
-$(COVERAGE_INFECTION): $(PHPUNIT_BIN) $(SRC_TESTS_FILES) phpunit.xml.dist
+$(COVERAGE_XML): $(PHPUNIT_BIN) $(SRC_TESTS_FILES) phpunit.xml.dist
+	$(PHPUNIT_COVERAGE_INFECTION)
+	touch -c $@
+	touch -c $(COVERAGE_JUNIT)
+
+$(COVERAGE_JUNIT): $(PHPUNIT_BIN) $(SRC_TESTS_FILES) phpunit.xml.dist
 	$(PHPUNIT_COVERAGE_INFECTION)
 	touch -c $@
+	touch -c $(COVERAGE_XML)
 
 # PHP-CS-Fixer itself does not depend on the vendor but the config file yes
 $(PHP_CS_FIXER_BIN): $(PHIVE_BIN) vendor

diff --git a/infection.json b/infection.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "./vendor/infection/infection/resources/schema.json",
+    "$schema": "./tools/infection/resources/schema.json",
     "ignoreMsiWithNoMutations": true,
     "logs": {
         "text": ".build/infection/infection-log.txt"
@@ -11,5 +11,15 @@
             "src"
         ]
     },
-    "timeout": 10
+    "timeout": 10,
+
+    "mutators": {
+        "@default": true,
+        "ArrayItemRemoval": {
+            "ignore": [
+                "Fidry\\CpuCounter\\CpuCoreCounter::getDefaultFinders"
+            ]
+        },
+        "PublicVisibility": false
+    }
 }
diff --git a/src/CpuInfoFinder.php b/src/CpuInfoFinder.php
@@ -15,7 +15,7 @@
 
 use function file_get_contents;
 use function is_file;
-use function mb_substr_count;
+use function substr_count;
 
 /**
  * Find the number of CPU cores looking up at the cpuinfo file which is available
@@ -58,7 +58,7 @@ private static function getCpuInfo(): ?string
      */
     public static function countCpuCores(string $cpuInfo): ?int
     {
-        $processorCount = mb_substr_count($cpuInfo, 'processor');
+        $processorCount = substr_count($cpuInfo, 'processor');
 
         return $processorCount > 0 ? $processorCount : null;
     }

diff --git a/src/HwFinder.php b/src/HwFinder.php
@@ -20,7 +20,6 @@
 use function is_resource;
 use function pclose;
 use function popen;
-use function trim;
 use const FILTER_VALIDATE_INT;
 
 /**
@@ -63,7 +62,7 @@ public function find(): ?int
      */
     public static function countCpuCores(string $process): ?int
     {
-        $cpuCount = filter_var(trim($process), FILTER_VALIDATE_INT);
+        $cpuCount = filter_var($process, FILTER_VALIDATE_INT);
 
         return is_int($cpuCount) && $cpuCount > 0 ? $cpuCount : null;
     }

diff --git a/src/NProcFinder.php b/src/NProcFinder.php
@@ -65,7 +65,7 @@ private static function supportsNproc(): bool
      */
     public static function countCpuCores(string $nproc): ?int
     {
-        $cpuCount = filter_var(trim($nproc), FILTER_VALIDATE_INT);
+        $cpuCount = filter_var($nproc, FILTER_VALIDATE_INT);
 
         return is_int($cpuCount) && $cpuCount > 0 ? $cpuCount : null;
     }

diff --git a/src/WindowsWmicFinder.php b/src/WindowsWmicFinder.php
@@ -21,7 +21,6 @@
 use function is_resource;
 use function pclose;
 use function popen;
-use function trim;
 use const FILTER_VALIDATE_INT;
 
 /**
@@ -64,7 +63,7 @@ public function find(): ?int
      */
     public static function countCpuCores(string $process): ?int
     {
-        $cpuCount = filter_var(trim($process), FILTER_VALIDATE_INT);
+        $cpuCount = filter_var($process, FILTER_VALIDATE_INT);
 
         return is_int($cpuCount) && $cpuCount > 0 ? $cpuCount : null;
     }

diff --git a/tests/CpuInfoFinderTest.php b/tests/CpuInfoFinderTest.php
@@ -44,6 +44,13 @@ public static function cpuInfoProvider(): iterable
             null,
         ];
 
+        yield 'whitespace' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         // $ docker run  --tty --rm --platform linux/amd64 alpine:3.14 cat /proc/cpuinfo
         yield 'example from an alpine Docker image' => [
             <<<'EOF'

diff --git a/tests/HwFinderTest.php b/tests/HwFinderTest.php
@@ -44,6 +44,13 @@ public static function processProvider(): iterable
             null,
         ];
 
+        yield 'whitespace' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         // MyMachine™
         yield 'example from an OSX machine' => [
             <<<'EOF'
@@ -52,6 +59,13 @@ public static function processProvider(): iterable
                 EOF,
             3,
         ];
+        yield 'example with extra spaces' => [
+            <<<'EOF'
+                 3
+
+                EOF,
+            3,
+        ];
 
         yield 'no processor' => [
             <<<'EOF'

diff --git a/tests/NProcFinderTest.php b/tests/NProcFinderTest.php
@@ -44,6 +44,13 @@ public static function nprocProvider(): iterable
             null,
         ];
 
+        yield 'whitespace' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         // $ docker run  --tty --rm --platform linux/amd64 alpine:3.14 nproc --all
         yield 'example from an alpine Docker image' => [
             <<<'EOF'
@@ -52,6 +59,13 @@ public static function nprocProvider(): iterable
                 EOF,
             3,
         ];
+        yield 'example with extra spaces' => [
+            <<<'EOF'
+                 3
+
+                EOF,
+            3,
+        ];
 
         yield 'no processor' => [
             <<<'EOF'

diff --git a/tests/WindowsWmicTest.php b/tests/WindowsWmicTest.php
@@ -44,6 +44,13 @@ public static function wmicProvider(): iterable
             null,
         ];
 
+        yield 'whitespace' => [
+            <<<'EOF'
+
+                EOF,
+            null,
+        ];
+
         yield 'example from a Windows machine' => [
             <<<'EOF'
                 3
@@ -52,6 +59,14 @@ public static function wmicProvider(): iterable
             3,
         ];
 
+        yield 'example from a Windows machine with extra spaces' => [
+            <<<'EOF'
+                 3
+
+                EOF,
+            3,
+        ];
+
         yield 'no processor' => [
             <<<'EOF'
                 0