Make generating names more performant (#79)

src/Finder/CpuInfoFinder.php

@@ -16,8 +16,6 @@
 use function file_get_contents;
 use function is_file;
 use function sprintf;
-use function strrpos;
-use function substr;
 use function substr_count;
 use const PHP_EOL;
 
@@ -70,8 +68,7 @@ public function find(): ?int
 
     public function toString(): string
     {
-        /** @phpstan-ignore-next-line */
-        return substr(__CLASS__, strrpos(__CLASS__, '\\') + 1);
+        return 'CpuInfoFinder';
     }
 
     private static function getCpuInfo(): ?string

src/Finder/DummyCpuCoreFinder.php

@@ -14,8 +14,6 @@
 namespace Fidry\CpuCoreCounter\Finder;
 
 use function sprintf;
-use function strrpos;
-use function substr;
 
 /**
  * This finder returns whatever value you gave to it. This is useful for testing
@@ -52,9 +50,7 @@ public function find(): ?int
     public function toString(): string
     {
         return sprintf(
-            '%s(value=%d)',
-            /** @phpstan-ignore-next-line */
-            substr(__CLASS__, strrpos(__CLASS__, '\\') + 1),
+            'DummyCpuCoreFinder(value=%d)',
             $this->count
         );
     }

src/Finder/HwLogicalFinder.php

@@ -25,4 +25,9 @@ protected function getCommand(): string
     {
         return 'sysctl -n hw.logicalcpu';
     }
+
+    public function toString(): string
+    {
+        return 'HwLogicalFinder';
+    }
 }

src/Finder/HwPhysicalFinder.php

@@ -25,4 +25,9 @@ protected function getCommand(): string
     {
         return 'sysctl -n hw.physicalcpu';
     }
+
+    public function toString(): string
+    {
+        return 'HwPhysicalFinder';
+    }
 }

src/Finder/NProcFinder.php

@@ -19,8 +19,6 @@
 use function function_exists;
 use function is_int;
 use function sprintf;
-use function strrpos;
-use function substr;
 use function trim;
 use const FILTER_VALIDATE_INT;
 use const PHP_EOL;
@@ -117,9 +115,7 @@ public function find(): ?int
     public function toString(): string
     {
         return sprintf(
-            '%s(all=%s)',
-            /** @phpstan-ignore-next-line */
-            substr(__CLASS__, strrpos(__CLASS__, '\\') + 1),
+            'NProcFinder(all=%s)',
             $this->all ? 'true' : 'false'
         );
     }

src/Finder/NProcessorFinder.php

@@ -24,4 +24,9 @@ protected function getCommand(): string
     {
         return 'getconf NPROCESSORS_ONLN';
     }
+
+    public function toString(): string
+    {
+        return 'NProcessorFinder';
+    }
 }

src/Finder/NullCpuCoreFinder.php

@@ -13,9 +13,6 @@
 
 namespace Fidry\CpuCoreCounter\Finder;
 
-use function strrpos;
-use function substr;
-
 /**
  * This finder returns whatever value you gave to it. This is useful for testing.
  */
@@ -33,7 +30,6 @@ public function find(): ?int
 
     public function toString(): string
     {
-        /** @phpstan-ignore-next-line */
-        return substr(__CLASS__, strrpos(__CLASS__, '\\') + 1);
+        return 'NullCpuCoreFinder';
     }
 }

src/Finder/ProcOpenBasedFinder.php

@@ -18,8 +18,6 @@
 use function function_exists;
 use function is_int;
 use function sprintf;
-use function strrpos;
-use function substr;
 use function trim;
 use const FILTER_VALIDATE_INT;
 use const PHP_EOL;
@@ -83,14 +81,6 @@ public function find(): ?int
             : self::countCpuCores($stdout);
     }
 
-    public function toString(): string
-    {
-        $class = static::class;
-
-        /** @phpstan-ignore-next-line */
-        return substr($class, strrpos($class, '\\') + 1);
-    }
-
     /**
      * @internal
      *

src/Finder/WmicLogicalFinder.php

@@ -24,4 +24,9 @@ protected function getCommand(): string
     {
         return 'wmic cpu get NumberOfLogicalProcessors';
     }
+
+    public function toString(): string
+    {
+        return 'WmicLogicalFinder';
+    }
 }

src/Finder/WmicPhysicalFinder.php

@@ -24,4 +24,9 @@ protected function getCommand(): string
     {
         return 'wmic cpu get NumberOfProcessors';
     }
+
+    public function toString(): string
+    {
+        return 'WmicPhysicalFinder';
+    }
 }

src/Finder/_NProcessorFinder.php

@@ -24,4 +24,9 @@ protected function getCommand(): string
     {
         return 'getconf _NPROCESSORS_ONLN';
     }
+
+    public function toString(): string
+    {
+        return '_NProcessorFinder';
+    }
 }

tests/Finder/CpuInfoFinderTest.php

@@ -40,7 +40,10 @@ protected function tearDown(): void
 
     public function test_it_can_describe_itself(): void
     {
-        self::assertSame('CpuInfoFinder', $this->finder->toString());
+        self::assertSame(
+            FinderShortClassName::get($this->finder),
+            $this->finder->toString()
+        );
     }
 
     /**

tests/Finder/DummyCpuCoreFinderTest.php

@@ -15,6 +15,7 @@
 
 use Fidry\CpuCoreCounter\Finder\DummyCpuCoreFinder;
 use PHPUnit\Framework\TestCase;
+use function sprintf;
 
 /**
  * @covers \Fidry\CpuCoreCounter\Finder\DummyCpuCoreFinder
@@ -34,6 +35,12 @@ public function test_it_can_describe_itself(): void
     {
         $finder = new DummyCpuCoreFinder(5);
 
-        self::assertSame('DummyCpuCoreFinder(value=5)', $finder->toString());
+        self::assertSame(
+            sprintf(
+                '%s(value=5)',
+                FinderShortClassName::get($finder)
+            ),
+            $finder->toString()
+        );
     }
 }

tests/Finder/DummyProcOpenBasedFinder.php

@@ -21,4 +21,9 @@ protected function getCommand(): string
     {
         return '';
     }
+
+    public function toString(): string
+    {
+        return 'DummyProcOpenBasedFinder';
+    }
 }

tests/Finder/FinderShortClassName.php

@@ -0,0 +1,33 @@
+<?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\CpuCoreFinder;
+use function get_class;
+use function strrpos;
+use function substr;
+
+final class FinderShortClassName
+{
+    public static function get(CpuCoreFinder $finder): string
+    {
+        $class = get_class($finder);
+
+        return substr($class, strrpos($class, '\\') + 1);
+    }
+
+    private function __construct()
+    {
+    }
+}

tests/Finder/FinderShortClassNameTest.php

@@ -0,0 +1,34 @@
+<?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 PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \Fidry\CpuCoreCounter\Test\Finder\FinderShortClassName
+ *
+ * @internal
+ */
+final class FinderShortClassNameTest extends TestCase
+{
+    public function test_it_can_find_a_finder_short_name(): void
+    {
+        $finder = new FakeFinder();
+
+        $expected = 'FakeFinder';
+        $actual = FinderShortClassName::get($finder);
+
+        self::assertSame($expected, $actual);
+    }
+}

tests/Finder/HwLogicalFinderTest.php

@@ -23,11 +23,6 @@
  */
 final class HwLogicalFinderTest extends ProcOpenBasedFinderTestCase
 {
-    public function test_it_can_describe_itself(): void
-    {
-        self::assertSame('HwLogicalFinder', $this->getFinder()->toString());
-    }
-
     protected function getFinder(): ProcOpenBasedFinder
     {
         return new HwLogicalFinder();

tests/Finder/HwPhysicalFinderTest.php

@@ -23,11 +23,6 @@
  */
 final class HwPhysicalFinderTest extends ProcOpenBasedFinderTestCase
 {
-    public function test_it_can_describe_itself(): void
-    {
-        self::assertSame('HwPhysicalFinder', $this->getFinder()->toString());
-    }
-
     protected function getFinder(): ProcOpenBasedFinder
     {
         return new HwPhysicalFinder();

tests/Finder/NProcFinderTest.php

@@ -16,6 +16,7 @@
 use Fidry\CpuCoreCounter\Finder\CpuCoreFinder;
 use Fidry\CpuCoreCounter\Finder\NProcFinder;
 use PHPUnit\Framework\TestCase;
+use function sprintf;
 
 /**
  * @covers \Fidry\CpuCoreCounter\Finder\NProcFinder
@@ -38,12 +39,18 @@ public static function finderProvider(): iterable
     {
         yield [
             new NProcFinder(true),
-            'NProcFinder(all=true)',
+            sprintf(
+                '%s(all=true)',
+                FinderShortClassName::get(new NProcFinder())
+            )
         ];
 
         yield [
             new NProcFinder(false),
-            'NProcFinder(all=false)',
+            sprintf(
+                '%s(all=false)',
+                FinderShortClassName::get(new NProcFinder())
+            )
         ];
     }
 

tests/Finder/NProcessorFinderTest.php

@@ -23,11 +23,6 @@
  */
 final class NProcessorFinderTest extends ProcOpenBasedFinderTestCase
 {
-    public function test_it_can_describe_itself(): void
-    {
-        self::assertSame('NProcessorFinder', $this->getFinder()->toString());
-    }
-
     protected function getFinder(): ProcOpenBasedFinder
     {
         return new NProcessorFinder();

tests/Finder/NullCpuCoreFinderTest.php

@@ -34,6 +34,9 @@ public function test_it_can_describe_itself(): void
     {
         $finder = new NullCpuCoreFinder();
 
-        self::assertSame('NullCpuCoreFinder', $finder->toString());
+        self::assertSame(
+            FinderShortClassName::get($finder),
+            $finder->toString()
+        );
     }
 }

tests/Finder/OnlyOnWindowsFinderTest.php

@@ -19,6 +19,7 @@
 use PHPUnit\Framework\TestCase;
 use function define;
 use function defined;
+use function sprintf;
 
 /**
  * @covers \Fidry\CpuCoreCounter\Finder\OnlyOnWindowsFinder
@@ -31,7 +32,13 @@ public function test_it_can_describe_itself(): void
     {
         $finder = new OnlyOnWindowsFinder(new NullCpuCoreFinder());
 
-        self::assertSame('OnlyOnWindowsFinder(NullCpuCoreFinder)', $finder->toString());
+        self::assertSame(
+            sprintf(
+                '%s(NullCpuCoreFinder)',
+                FinderShortClassName::get($finder)
+            ),
+            $finder->toString()
+        );
     }
 
     public function test_it_enriches_the_decorated_finder_diagnosis(): void

tests/Finder/ProcOpenBasedFinderTest.php

@@ -84,6 +84,9 @@ public function test_it_can_describe_itself(): void
     {
         $finder = new DummyProcOpenBasedFinder();
 
-        self::assertSame('DummyProcOpenBasedFinder', $finder->toString());
+        self::assertSame(
+            FinderShortClassName::get($finder),
+            $finder->toString()
+        );
     }
 }

tests/Finder/ProcOpenBasedFinderTestCase.php

@@ -76,5 +76,13 @@ public static function processResultProvider(): iterable
         ];
     }
 
+    public function test_it_can_describe_itself(): void
+    {
+        self::assertSame(
+            FinderShortClassName::get($this->getFinder()),
+            $this->getFinder()->toString()
+        );
+    }
+
     abstract protected function getFinder(): ProcOpenBasedFinder;
 }