Move php scanner to seperate namespace

Andreas Frömer · icanhazstring · commit c469af97f7b8 · 2020-05-21T23:28:31.000+02:00
diff --git a/config/service_manager.php b/config/service_manager.php
@@ -15,8 +15,8 @@
 use Icanhazstring\Composer\Unused\Log\Factory\DebugLoggerFactory;
 use Icanhazstring\Composer\Unused\Log\Factory\FileHandlerFactory;
 use Icanhazstring\Composer\Unused\Log\LogHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\Factory\NodeVisitorFactory;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\Factory\NodeVisitorFactory;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
 use Icanhazstring\Composer\Unused\Subject\Factory\PackageSubjectFactory;
 use Psr\Log\LoggerInterface;
 
diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,10 +2,12 @@ includes:
 	- vendor/jangregor/phpstan-prophecy/src/extension.neon
 
 parameters:
+    bootstrap: phpunit.bootstrap.php
     excludes_analyse:
         - %currentWorkingDirectory%/tests/assets
     level: max
     inferPrivatePropertyTypeFromConstructor: true
     paths:
         - src/
         - tests/
+    tmpDir: data
diff --git a/phpunit.bootstrap.php b/phpunit.bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+require __DIR__ . '/vendor/autoload.php';
+
+define('ASSET_DIR', __DIR__ . '/tests/assets');
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
+         bootstrap="phpunit.bootstrap.php"
          colors="true">
     <testsuites>
         <testsuite name="integration">
diff --git a/src/Loader/Factory/UsageLoaderFactory.php b/src/Loader/Factory/UsageLoaderFactory.php
@@ -8,7 +8,7 @@
 use Icanhazstring\Composer\Unused\Error\ErrorHandlerInterface;
 use Icanhazstring\Composer\Unused\Loader\Result;
 use Icanhazstring\Composer\Unused\Loader\UsageLoader;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
 use PhpParser\ParserFactory;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
diff --git a/src/Loader/UsageLoader.php b/src/Loader/UsageLoader.php
@@ -6,7 +6,7 @@
 
 use Composer\Composer;
 use Icanhazstring\Composer\Unused\Error\ErrorHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
 use PhpParser\NodeTraverser;
 use PhpParser\Parser;
 use Psr\Log\LoggerInterface;
diff --git a/src/Parser/PHP/Factory/NodeVisitorFactory.php b/src/Parser/PHP/Factory/NodeVisitorFactory.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Factory;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Factory;
 
 use Icanhazstring\Composer\Unused\Error\ErrorHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
-use Icanhazstring\Composer\Unused\Parser\Strategy\ClassConstStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\NewParseStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\PhpExtensionStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\StaticParseStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\UseParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\ClassConstStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\NewParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\PhpExtensionStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\StaticParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\UseParseStrategy;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
diff --git a/src/Parser/PHP/NodeVisitor.php b/src/Parser/PHP/NodeVisitor.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser;
+namespace Icanhazstring\Composer\Unused\Parser\PHP;
 
 use Icanhazstring\Composer\Unused\Error\ErrorHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\Strategy\ParseStrategyInterface;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\ParseStrategyInterface;
 use Icanhazstring\Composer\Unused\Subject\NamespaceUsage;
 use Icanhazstring\Composer\Unused\Subject\UsageInterface;
 use PhpParser\Node;
diff --git a/src/Parser/PHP/Strategy/ClassConstStrategy.php b/src/Parser/PHP/Strategy/ClassConstStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
diff --git a/src/Parser/PHP/Strategy/NewParseStrategy.php b/src/Parser/PHP/Strategy/NewParseStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
diff --git a/src/Parser/PHP/Strategy/ParseStrategyInterface.php b/src/Parser/PHP/Strategy/ParseStrategyInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 
diff --git a/src/Parser/PHP/Strategy/PhpExtensionStrategy.php b/src/Parser/PHP/Strategy/PhpExtensionStrategy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 use Psr\Log\LoggerInterface;
diff --git a/src/Parser/PHP/Strategy/StaticParseStrategy.php b/src/Parser/PHP/Strategy/StaticParseStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
diff --git a/src/Parser/PHP/Strategy/UseParseStrategy.php b/src/Parser/PHP/Strategy/UseParseStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Unused\Parser\Strategy;
+namespace Icanhazstring\Composer\Unused\Parser\PHP\Strategy;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\GroupUse;
diff --git a/tests/Integration/Di/ServiceContainerTest.php b/tests/Integration/Di/ServiceContainerTest.php
@@ -15,7 +15,7 @@
 use Icanhazstring\Composer\Unused\Loader\PackageLoader;
 use Icanhazstring\Composer\Unused\Loader\UsageLoader;
 use Icanhazstring\Composer\Unused\Log\LogHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
 use Icanhazstring\Composer\Unused\Subject\Factory\PackageSubjectFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Integration/Parser/PHP/NodeVisitorTest.php b/tests/Integration/Parser/PHP/NodeVisitorTest.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Icanhazstring\Composer\Test\Unused\Integration\Parser;
+namespace Icanhazstring\Composer\Test\Unused\Integration\Parser\PHP;
 
 use Exception;
 use Icanhazstring\Composer\Unused\Error\ErrorHandlerInterface;
-use Icanhazstring\Composer\Unused\Parser\NodeVisitor;
-use Icanhazstring\Composer\Unused\Parser\Strategy\ClassConstStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\NewParseStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\ParseStrategyInterface;
-use Icanhazstring\Composer\Unused\Parser\Strategy\PhpExtensionStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\StaticParseStrategy;
-use Icanhazstring\Composer\Unused\Parser\Strategy\UseParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\NodeVisitor;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\ClassConstStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\NewParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\ParseStrategyInterface;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\PhpExtensionStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\StaticParseStrategy;
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\UseParseStrategy;
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
 use PhpParser\ParserFactory;
@@ -34,45 +34,45 @@ public function itShouldParseUsagesDataProvider(): array
         return [
             'StaticParseStrategyShouldReturnEmptyUsageOnVariableCall'  => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/StaticVariableCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/StaticVariableCall.php',
                 'strategy'               => new StaticParseStrategy()
             ],
             'StaticParseStrategyShouldReturnEmptyUsageOnNonFQCall'     => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/StaticNonFullyQualifiedCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/StaticNonFullyQualifiedCall.php',
                 'strategy'               => new StaticParseStrategy()
             ],
             'StaticParseStrategyShouldReturnCorrectNamespaceOnFQCall'      => [
                 'expectedUsedNamespaces' => [
                     'StaticFullyQualifiedCall'
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/StaticFullyQualifiedCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/StaticFullyQualifiedCall.php',
                 'strategy'               => new StaticParseStrategy()
             ],
             'NewParseStrategyShouldReturnEmptyUsageOnDynamicClassnameCall' => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/NewInstantiateDynamicClass.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/NewInstantiateDynamicClass.php',
                 'strategy'               => new NewParseStrategy()
             ],
             'NewParseStrategyShouldReturnEmptyUsageOnNonFQCall'        => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/NewInstantiateNonFullyQualifiedCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/NewInstantiateNonFullyQualifiedCall.php',
                 'strategy'               => new NewParseStrategy()
             ],
             'NewParseStrategyShouldReturnCorrectNamespaceOnFQCall'     => [
                 'expectedUsedNamespaces' => [
                     'NewInstantiateFullyQualifiedCall'
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/NewInstantiateFullyQualifiedCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/NewInstantiateFullyQualifiedCall.php',
                 'strategy'               => new NewParseStrategy()
             ],
             'UseParseStrategyShouldReturnSingleLineImportedNamespaces' => [
                 'expectedUsedNamespaces' => [
                     'Icanhazstring\Composer',
-                    'Icanhazstring\Composer\Unused\Parser',
+                    'Icanhazstring\Composer\Unused\Parser\PHP',
                     'Icanhazstring\Composer\Unused\Command'
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/UseSingleLineNoGroup.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/UseSingleLineNoGroup.php',
                 'strategy'               => new UseParseStrategy()
             ],
             'UseParseStrategyShouldReturnMultiLineImportedNamespaces'  => [
@@ -81,79 +81,79 @@ public function itShouldParseUsagesDataProvider(): array
                     StaticParseStrategy::class,
                     NewParseStrategy::class
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/UseMultiLineGroup.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/UseMultiLineGroup.php',
                 'strategy'               => new UseParseStrategy()
             ],
             'ClassConstStrategyShouldReturnCorrectNamespace'           => [
                 'expectedUsedNamespaces' => [
                     UseParseStrategy::class,
                     StaticParseStrategy::class
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/ClassConst.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/ClassConst.php',
                 'strategy'               => new ClassConstStrategy()
             ],
             'NewParseStrategyShouldReturnQualifiedNamespace'           => [
                 'expectedUsedNamespaces' => [
                     'TestFile\NewInstantiateQualifiedClass'
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/NewInstantiateQualifiedClass.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/NewInstantiateQualifiedClass.php',
                 'strategy'               => new NewParseStrategy()
             ],
             'StaticParseStrategyShouldReturnQualifiedNamespace'        => [
                 'expectedUsedNamespaces' => [
                     'TestFile\StaticQualifiedCall'
                 ],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/StaticQualifiedCall.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/StaticQualifiedCall.php',
                 'strategy'               => new StaticParseStrategy()
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---1'        => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithCustomInterfaceName.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithCustomInterfaceName.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---2'        => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithCustomInterface.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithCustomInterface.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---3'        => [
                 'expectedUsedNamespaces' => ['ext-json'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithExtensionInterface.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithExtensionInterface.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---4'        => [
                 'expectedUsedNamespaces' => ['ext-json'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithExtensionInterfaceInUse.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithExtensionInterfaceInUse.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---5'        => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithCustomConstant.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithCustomConstant.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---6'        => [
                 'expectedUsedNamespaces' => ['ext-json'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithJsonConstant.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithJsonConstant.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---7'        => [
                 'expectedUsedNamespaces' => ['ext-json'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithExtensionFunction.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithExtensionFunction.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---8'        => [
                 'expectedUsedNamespaces' => [],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithCustomFunction.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithCustomFunction.php',
                 'strategy'               => new PhpExtensionStrategy(['json'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---9'        => [
                 'expectedUsedNamespaces' => ['ext-zend-opcache'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithZendOpcache.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithZendOpcache.php',
                 'strategy'               => new PhpExtensionStrategy(['Zend Opcache'], new NullLogger())
             ],
             'PhpExtensionParseStrategyShouldReturnQualifiedNamespace---10'        => [
                 'expectedUsedNamespaces' => ['php'],
-                'inputFile'              => __DIR__ . '/../../assets/TestFiles/PhpExtensionStrategy/ClassWithCore.php',
+                'inputFile'              => ASSET_DIR . '/TestFiles/PhpExtensionStrategy/ClassWithCore.php',
                 'strategy'               => new PhpExtensionStrategy(['Core'], new NullLogger())
             ],
         ];
@@ -192,7 +192,7 @@ public function itShouldRaiseExceptionHandledByErrorHandler(): void
     {
         $parser = (new ParserFactory())->create(ParserFactory::ONLY_PHP7);
         /** @var string $inputFile */
-        $inputFile = __DIR__ . '/../../assets/TestFiles/UseSingleLineNoGroup.php';
+        $inputFile = ASSET_DIR . '/TestFiles/UseSingleLineNoGroup.php';
         /** @var string $contents */
         $contents = file_get_contents($inputFile);
         /** @var Node[] $nodes */
diff --git a/tests/assets/TestFiles/ClassConst.php b/tests/assets/TestFiles/ClassConst.php
@@ -2,5 +2,5 @@
 
 declare(strict_types=1);
 
-$fullyQualified = Icanhazstring\Composer\Unused\Parser\Strategy\UseParseStrategy::class;
-$qualified = \Icanhazstring\Composer\Unused\Parser\Strategy\StaticParseStrategy::class;
+$fullyQualified = Icanhazstring\Composer\Unused\Parser\PHP\Strategy\UseParseStrategy::class;
+$qualified = \Icanhazstring\Composer\Unused\Parser\PHP\Strategy\StaticParseStrategy::class;
diff --git a/tests/assets/TestFiles/UseMultiLineGroup.php b/tests/assets/TestFiles/UseMultiLineGroup.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Icanhazstring\Composer\Unused\Parser\Strategy\{
+use Icanhazstring\Composer\Unused\Parser\PHP\Strategy\{
     UseParseStrategy,
     StaticParseStrategy,
     NewParseStrategy
diff --git a/tests/assets/TestFiles/UseSingleLineNoGroup.php b/tests/assets/TestFiles/UseSingleLineNoGroup.php
@@ -3,5 +3,5 @@
 declare(strict_types=1);
 
 use Icanhazstring\Composer;
-use Icanhazstring\Composer\Unused\Parser;
+use Icanhazstring\Composer\Unused\Parser\PHP;
 use Icanhazstring\Composer\Unused\Command;
