Move things around (#604)

theofidry · web-flow · commit 35aaaff46281 · 2022-01-26T12:34:17.000+01:00
diff --git a/src/Configuration/RegexChecker.php b/src/Configuration/RegexChecker.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Configuration;
 
 use function array_pop;
 use function count;
@@ -15,7 +15,6 @@
 use function str_split;
 use function strlen;
 
-// TODO: move this under a Configuration namespace
 final class RegexChecker
 {
     // https://www.php.net/manual/en/reference.pcre.pattern.modifiers.php
diff --git a/src/Configuration/SymbolsConfigurationFactory.php b/src/Configuration/SymbolsConfigurationFactory.php
@@ -4,7 +4,6 @@
 
 namespace Humbug\PhpScoper\Configuration;
 
-use Humbug\PhpScoper\RegexChecker;
 use Humbug\PhpScoper\Symbol\NamespaceRegistry;
 use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use InvalidArgumentException;
diff --git a/src/Container.php b/src/Container.php
@@ -15,8 +15,10 @@
 namespace Humbug\PhpScoper;
 
 use Humbug\PhpScoper\Configuration\ConfigurationFactory;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use Humbug\PhpScoper\Configuration\SymbolsConfigurationFactory;
 use Humbug\PhpScoper\Scoper\ScoperFactory;
+use Humbug\PhpScoper\Symbol\Reflector;
 use PhpParser\Lexer;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
diff --git a/src/PhpParser/TraverserFactory.php b/src/PhpParser/TraverserFactory.php
@@ -14,11 +14,9 @@
 
 namespace Humbug\PhpScoper\PhpParser;
 
-use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
 use Humbug\PhpScoper\PhpParser\NodeVisitor\NamespaceStmt\NamespaceStmtCollection;
 use Humbug\PhpScoper\PhpParser\NodeVisitor\Resolver\IdentifierResolver;
 use Humbug\PhpScoper\PhpParser\NodeVisitor\UseStmt\UseStmtCollection;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\PhpScoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
diff --git a/src/Scoper/ScoperFactory.php b/src/Scoper/ScoperFactory.php
@@ -15,13 +15,12 @@
 namespace Humbug\PhpScoper\Scoper;
 
 use Humbug\PhpScoper\Configuration\Configuration;
-use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
 use Humbug\PhpScoper\PhpParser\TraverserFactory;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\Composer\AutoloadPrefixer;
 use Humbug\PhpScoper\Scoper\Composer\InstalledPackagesScoper;
 use Humbug\PhpScoper\Scoper\Composer\JsonFileScoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use PhpParser\Parser;
 
diff --git a/src/Symbol/EnrichedReflector.php b/src/Symbol/EnrichedReflector.php
@@ -5,7 +5,6 @@
 namespace Humbug\PhpScoper\Symbol;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use function strpos;
 
 /**
diff --git a/src/Symbol/Reflector.php b/src/Symbol/Reflector.php
@@ -14,9 +14,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Symbol;
 
-use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use JetBrains\PHPStormStub\PhpStormStubsMap;
 use function array_keys;
 use function array_merge;
diff --git a/tests/Configuration/ConfigurationSymbolsConfigurationFactoryTest.php b/tests/Configuration/ConfigurationSymbolsConfigurationFactoryTest.php
@@ -4,7 +4,6 @@
 
 namespace Humbug\PhpScoper\Configuration;
 
-use Humbug\PhpScoper\RegexChecker;
 use Humbug\PhpScoper\Symbol\NamespaceRegistry;
 use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use InvalidArgumentException;
diff --git a/tests/Configuration/RegexCheckerTest.php b/tests/Configuration/RegexCheckerTest.php
@@ -2,21 +2,21 @@
 
 declare(strict_types=1);
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Configuration;
 
-use Humbug\PhpScoper\RegexChecker;
+use Humbug\PhpScoper\Configuration;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Humbug\PhpScoper\RegexChecker
+ * @covers \Humbug\PhpScoper\Configuration\RegexChecker
  */
 final class RegexCheckerTest extends TestCase
 {
     private RegexChecker $regexChecker;
 
     protected function setUp(): void
     {
-        $this->regexChecker = new RegexChecker();
+        $this->regexChecker = new Configuration\RegexChecker();
     }
 
     /**
diff --git a/tests/Console/Command/AddPrefixCommandTest.php b/tests/Console/Command/AddPrefixCommandTest.php
@@ -17,14 +17,14 @@
 use Fidry\Console\Application\SymfonyApplication;
 use Fidry\Console\Command\SymfonyCommand;
 use Humbug\PhpScoper\Configuration\ConfigurationFactory;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use Humbug\PhpScoper\Configuration\SymbolsConfigurationFactory;
 use Humbug\PhpScoper\Console\Application;
 use Humbug\PhpScoper\Container;
 use Humbug\PhpScoper\FileSystemTestCase;
 use Humbug\PhpScoper\PhpParser\FakeParser;
-use Humbug\PhpScoper\Reflector;
-use Humbug\PhpScoper\RegexChecker;
 use Humbug\PhpScoper\Scoper\Scoper;
+use Humbug\PhpScoper\Symbol\Reflector;
 use InvalidArgumentException;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Console/Command/DummyScoperFactory.php b/tests/Console/Command/DummyScoperFactory.php
@@ -5,9 +5,9 @@
 namespace Humbug\PhpScoper\Console\Command;
 
 use Humbug\PhpScoper\Configuration\Configuration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\Scoper;
 use Humbug\PhpScoper\Scoper\ScoperFactory;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use PhpParser\Parser;
 
diff --git a/tests/PhpParser/TraverserFactoryTest.php b/tests/PhpParser/TraverserFactoryTest.php
@@ -15,10 +15,10 @@
 namespace Humbug\PhpScoper\PhpParser;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\FakeScoper;
 use Humbug\PhpScoper\Scoper\PhpScoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
diff --git a/tests/PhpParser/UseStmtNameTest.php b/tests/PhpParser/UseStmtNameTest.php
@@ -7,8 +7,8 @@
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
 use Humbug\PhpScoper\PhpParser\NodeVisitor\NamespaceStmt\NamespaceStmtCollection;
 use Humbug\PhpScoper\PhpParser\NodeVisitor\UseStmt\UseStmtCollection;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Whitelist;
 use LogicException;
 use PhpParser\Node\Name;
diff --git a/tests/Scoper/Composer/InstalledPackagesScoperTest.php b/tests/Scoper/Composer/InstalledPackagesScoperTest.php
@@ -15,10 +15,10 @@
 namespace Humbug\PhpScoper\Scoper\Composer;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\FakeScoper;
 use Humbug\PhpScoper\Scoper\Scoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Scoper/Composer/JsonFileScoperTest.php b/tests/Scoper/Composer/JsonFileScoperTest.php
@@ -15,10 +15,10 @@
 namespace Humbug\PhpScoper\Scoper\Composer;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\FakeScoper;
 use Humbug\PhpScoper\Scoper\Scoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Scoper/PhpScoperSpecTest.php b/tests/Scoper/PhpScoperSpecTest.php
@@ -16,12 +16,12 @@
 
 use Error;
 use Humbug\PhpScoper\Configuration\ConfigurationKeys;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
 use Humbug\PhpScoper\Configuration\SymbolsConfigurationFactory;
 use Humbug\PhpScoper\PhpParser\TraverserFactory;
-use Humbug\PhpScoper\Reflector;
-use Humbug\PhpScoper\RegexChecker;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use Humbug\PhpScoper\Whitelist;
diff --git a/tests/Scoper/PhpScoperTest.php b/tests/Scoper/PhpScoperTest.php
@@ -17,8 +17,8 @@
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
 use Humbug\PhpScoper\PhpParser\FakeParser;
 use Humbug\PhpScoper\PhpParser\TraverserFactory;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use LogicException;
 use PhpParser\Error as PhpParserError;
diff --git a/tests/Scoper/Symfony/XmlScoperTest.php b/tests/Scoper/Symfony/XmlScoperTest.php
@@ -15,10 +15,10 @@
 namespace Humbug\PhpScoper\Scoper\Symfony;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\Scoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
 use Humbug\PhpScoper\Symbol\NamespaceRegistry;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Scoper/Symfony/YamlScoperTest.php b/tests/Scoper/Symfony/YamlScoperTest.php
@@ -15,10 +15,10 @@
 namespace Humbug\PhpScoper\Scoper\Symfony;
 
 use Humbug\PhpScoper\Configuration\SymbolsConfiguration;
-use Humbug\PhpScoper\Reflector;
 use Humbug\PhpScoper\Scoper\Scoper;
 use Humbug\PhpScoper\Symbol\EnrichedReflector;
 use Humbug\PhpScoper\Symbol\NamespaceRegistry;
+use Humbug\PhpScoper\Symbol\Reflector;
 use Humbug\PhpScoper\Symbol\SymbolRegistry;
 use Humbug\PhpScoper\Symbol\SymbolsRegistry;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Symbol/ConstantRegistryTest.php b/tests/Symbol/ConstantRegistryTest.php
@@ -14,7 +14,7 @@
 
 namespace Humbug\PhpScoper\Symbol;
 
-use Humbug\PhpScoper\RegexChecker;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Symbol/NamespaceRegistryTest.php b/tests/Symbol/NamespaceRegistryTest.php
@@ -14,7 +14,7 @@
 
 namespace Humbug\PhpScoper\Symbol;
 
-use Humbug\PhpScoper\RegexChecker;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Symbol/Reflector/EmptyReflectorTest.php b/tests/Symbol/Reflector/EmptyReflectorTest.php
@@ -12,12 +12,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Symbol\Reflector;
 
+use Humbug\PhpScoper\Symbol\Reflector;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Humbug\PhpScoper\Reflector
+ * @covers \Humbug\PhpScoper\Symbol\Reflector
  */
 class EmptyReflectorTest extends TestCase
 {
@@ -29,7 +30,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider \Humbug\PhpScoper\PhpStormStubsReflectorTest::provideClasses
+     * @dataProvider \Humbug\PhpScoper\Symbol\Reflector\PhpStormStubsReflectorTest::provideClasses
      */
     public function test_it_can_identify_internal_classes(string $class): void
     {
@@ -39,7 +40,7 @@ public function test_it_can_identify_internal_classes(string $class): void
     }
 
     /**
-     * @dataProvider \Humbug\PhpScoper\PhpStormStubsReflectorTest::provideFunctions
+     * @dataProvider \Humbug\PhpScoper\Symbol\Reflector\PhpStormStubsReflectorTest::provideFunctions
      */
     public function test_it_can_identify_internal_functions(string $class, bool $expected): void
     {
@@ -49,7 +50,7 @@ public function test_it_can_identify_internal_functions(string $class, bool $exp
     }
 
     /**
-     * @dataProvider \Humbug\PhpScoper\PhpStormStubsReflectorTest::provideConstants
+     * @dataProvider \Humbug\PhpScoper\Symbol\Reflector\PhpStormStubsReflectorTest::provideConstants
      */
     public function test_it_can_identify_internal_constants(string $class, bool $expected): void
     {
diff --git a/tests/Symbol/Reflector/PhpStormStubsReflectorTest.php b/tests/Symbol/Reflector/PhpStormStubsReflectorTest.php
@@ -12,12 +12,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Symbol\Reflector;
 
+use Humbug\PhpScoper\Symbol\Reflector;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Humbug\PhpScoper\Reflector
+ * @covers \Humbug\PhpScoper\Symbol\Reflector
  */
 class PhpStormStubsReflectorTest extends TestCase
 {
diff --git a/tests/Symbol/Reflector/UserSymbolsReflectorTest.php b/tests/Symbol/Reflector/UserSymbolsReflectorTest.php
@@ -12,12 +12,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Humbug\PhpScoper;
+namespace Humbug\PhpScoper\Symbol\Reflector;
 
+use Humbug\PhpScoper\Symbol\Reflector;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Humbug\PhpScoper\Reflector
+ * @covers \Humbug\PhpScoper\Symbol\Reflector
  */
 class UserSymbolsReflectorTest extends TestCase
 {
diff --git a/tests/Symbol/SymbolRegistryTest.php b/tests/Symbol/SymbolRegistryTest.php
@@ -14,7 +14,7 @@
 
 namespace Humbug\PhpScoper\Symbol;
 
-use Humbug\PhpScoper\RegexChecker;
+use Humbug\PhpScoper\Configuration\RegexChecker;
 use PHPUnit\Framework\TestCase;
 
 /**
