Move the finders into a dedicated Finder namespace (#48)

theofidry · Dec 7, 2022 · 89a5259 · 89a5259
1 parent 49c34df
commit 89a5259
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ $cores = (new CpuCoreCounter($finders))->getCount();
 
 ```php
 // Use CPUInfo first & don't use Nproc
-use Fidry\CpuCoreCounter\CpuInfoFinder;use Fidry\CpuCoreCounter\HwLogicalFinder;use Fidry\CpuCoreCounter\WindowsWmicFinder;$finders = [
+$finders = [
     new CpuInfoFinder(),
     new WindowsWmicFinder(),
     new HwLogicalFinder(),

diff --git a/src/CpuCoreCounter.php b/src/CpuCoreCounter.php
@@ -13,6 +13,12 @@
 
 namespace Fidry\CpuCoreCounter;
 
+use Fidry\CpuCoreCounter\Finder\CpuCoreFinder;
+use Fidry\CpuCoreCounter\Finder\CpuInfoFinder;
+use Fidry\CpuCoreCounter\Finder\HwLogicalFinder;
+use Fidry\CpuCoreCounter\Finder\NProcFinder;
+use Fidry\CpuCoreCounter\Finder\WindowsWmicFinder;
+
 final class CpuCoreCounter
 {
     /**

diff --git a/src/CpuCoreFinder.php → src/Finder/CpuCoreFinder.php b/src/CpuCoreFinder.php → src/Finder/CpuCoreFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 interface CpuCoreFinder
 {

diff --git a/src/CpuInfoFinder.php → src/Finder/CpuInfoFinder.php b/src/CpuInfoFinder.php → src/Finder/CpuInfoFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 use function file_get_contents;
 use function is_file;

diff --git a/src/HwLogicalFinder.php → src/Finder/HwLogicalFinder.php b/src/HwLogicalFinder.php → src/Finder/HwLogicalFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 /**
  * Find the number of logical CPU cores for Linux, BSD and OSX.

diff --git a/src/HwPhysicalFinder.php → src/Finder/HwPhysicalFinder.php b/src/HwPhysicalFinder.php → src/Finder/HwPhysicalFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 /**
  * Find the number of physical CPU cores for Linux, BSD and OSX.

diff --git a/src/NProcFinder.php → src/Finder/NProcFinder.php b/src/NProcFinder.php → src/Finder/NProcFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 use Fidry\CpuCoreCounter\Exec\ExecException;
 use Fidry\CpuCoreCounter\Exec\ShellExec;

diff --git a/src/PopenBasedFinder.php → src/Finder/PopenBasedFinder.php b/src/PopenBasedFinder.php → src/Finder/PopenBasedFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 use function fgets;
 use function filter_var;

diff --git a/src/WindowsWmicFinder.php → src/Finder/WindowsWmicFinder.php b/src/WindowsWmicFinder.php → src/Finder/WindowsWmicFinder.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter;
+namespace Fidry\CpuCoreCounter\Finder;
 
 use function defined;
 

diff --git a/tests/CpuCoreCounterTest.php b/tests/CpuCoreCounterTest.php
@@ -15,8 +15,9 @@
 
 use Exception;
 use Fidry\CpuCoreCounter\CpuCoreCounter;
-use Fidry\CpuCoreCounter\CpuCoreFinder;
+use Fidry\CpuCoreCounter\Finder\CpuCoreFinder;
 use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound;
+use Fidry\CpuCoreCounter\Test\Finder\DummyCpuCoreFinder;
 use PHPUnit\Framework\TestCase;
 use function get_class;
 use function is_int;

diff --git a/tests/CpuInfoFinderTest.php → tests/Finder/CpuInfoFinderTest.php b/tests/CpuInfoFinderTest.php → tests/Finder/CpuInfoFinderTest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\CpuInfoFinder;
+use Fidry\CpuCoreCounter\Finder\CpuInfoFinder;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Fidry\CpuCoreCounter\CpuInfoFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\CpuInfoFinder
  *
  * @internal
  */

diff --git a/tests/DummyCpuCoreFinder.php → tests/Finder/DummyCpuCoreFinder.php b/tests/DummyCpuCoreFinder.php → tests/Finder/DummyCpuCoreFinder.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\CpuCoreFinder;
+use Fidry\CpuCoreCounter\Finder\CpuCoreFinder;
 
 final class DummyCpuCoreFinder implements CpuCoreFinder
 {

diff --git a/tests/DummyPopenBasedFinder.php → tests/Finder/DummyPopenBasedFinder.php b/tests/DummyPopenBasedFinder.php → tests/Finder/DummyPopenBasedFinder.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
 
 final class DummyPopenBasedFinder extends PopenBasedFinder
 {

diff --git a/tests/HwLogicalFinderTest.php → tests/Finder/HwLogicalFinderTest.php b/tests/HwLogicalFinderTest.php → tests/Finder/HwLogicalFinderTest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\HwLogicalFinder;
-use Fidry\CpuCoreCounter\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\HwLogicalFinder;
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
 
 /**
- * @covers \Fidry\CpuCoreCounter\HwLogicalFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\HwLogicalFinder
  *
  * @internal
  */

diff --git a/tests/HwPhysicalFinderTest.php → tests/Finder/HwPhysicalFinderTest.php b/tests/HwPhysicalFinderTest.php → tests/Finder/HwPhysicalFinderTest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\HwPhysicalFinder;
-use Fidry\CpuCoreCounter\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\HwPhysicalFinder;
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
 
 /**
- * @covers \Fidry\CpuCoreCounter\HwPhysicalFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\HwPhysicalFinder
  *
  * @internal
  */

diff --git a/tests/NProcFinderTest.php → tests/Finder/NProcFinderTest.php b/tests/NProcFinderTest.php → tests/Finder/NProcFinderTest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\NProcFinder;
+use Fidry\CpuCoreCounter\Finder\NProcFinder;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Fidry\CpuCoreCounter\NProcFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\NProcFinder
  *
  * @internal
  */

diff --git a/tests/PopenBasedFinderTest.php → tests/Finder/PopenBasedFinderTest.php b/tests/PopenBasedFinderTest.php → tests/Finder/PopenBasedFinderTest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Fidry\CpuCoreCounter\PopenBasedFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\PopenBasedFinder
  *
  * @internal
  */

diff --git a/tests/PopenBasedFinderTestCase.php → tests/Finder/PopenBasedFinderTestCase.php b/tests/PopenBasedFinderTestCase.php → tests/Finder/PopenBasedFinderTestCase.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
 use PHPUnit\Framework\TestCase;
 
 abstract class PopenBasedFinderTestCase extends TestCase

diff --git a/tests/WindowsWmicTest.php → tests/Finder/WindowsWmicTest.php b/tests/WindowsWmicTest.php → tests/Finder/WindowsWmicTest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Fidry\CpuCoreCounter\Test;
+namespace Fidry\CpuCoreCounter\Test\Finder;
 
-use Fidry\CpuCoreCounter\PopenBasedFinder;
-use Fidry\CpuCoreCounter\WindowsWmicFinder;
+use Fidry\CpuCoreCounter\Finder\PopenBasedFinder;
+use Fidry\CpuCoreCounter\Finder\WindowsWmicFinder;
 
 /**
- * @covers \Fidry\CpuCoreCounter\WindowsWmicFinder
+ * @covers \Fidry\CpuCoreCounter\Finder\WindowsWmicFinder
  *
  * @internal
  */