Merge pull request #2 from phphd/refactor-tests

Relocate Tests

Author: rela589n

.gitattributes

@@ -1,8 +1,9 @@
+/**/.gitignore export-ignore
+/**/.gitattributes export-ignore
+/**/Tests export-ignore
+/**/*Test.php export-ignore
 /.github export-ignore
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/tests export-ignore
-/ecs.php export-ignore
 /phpstan.dist.neon export-ignore
 /phpunit.xml.dist export-ignore
+/ecs.php export-ignore
 /rector.php export-ignore

ecs.php

@@ -8,6 +8,6 @@
 return static function (ECSConfig $ecsConfig): void {
     $ecsConfig->sets([PhdSetList::ecs()->getPath()]);
 
-    $ecsConfig->paths([__DIR__.'/src', __DIR__.'/tests']);
+    $ecsConfig->paths([__DIR__.'/src']);
     $ecsConfig->skip([__DIR__.'/vendor']);
 };

phpstan.dist.neon

@@ -1,16 +1,17 @@
 includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
+    - vendor/tomasvotruba/type-coverage/config/extension.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
-    - vendor/tomasvotruba/type-coverage/config/extension.neon
 
 parameters:
-    level: 9
-    phpVersion: 80127
+    level: max
+    phpVersion:
+        min: 80100
+        max: 80599
     editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
     paths:
         - src
-        - tests
     fileExtensions:
         - 'php'
     type_coverage:

phpunit.xml.dist

@@ -10,10 +10,10 @@
          failOnWarning="true">
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix="UnitTest.php">tests</directory>
+            <directory suffix="UnitTest.php">src</directory>
         </testsuite>
         <testsuite name="Integration">
-            <directory suffix="IntegrationTest.php">tests</directory>
+            <directory suffix="ServiceTest.php">src</directory>
         </testsuite>
     </testsuites>
 
@@ -22,6 +22,7 @@
             <directory>src</directory>
         </include>
         <exclude>
+            <directory>src/*/Tests</directory>
             <directory>src/*/*/Tests</directory>
             <directory>src/*/*/*/Tests</directory>
             <directory suffix="Test.php">src</directory>

rector.php

@@ -7,7 +7,7 @@
 use Rector\ValueObject\PhpVersion;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([__DIR__.'/src', __DIR__.'/tests']);
+    $rectorConfig->paths([__DIR__.'/src']);
 
     $rectorConfig->sets([PhdSetList::rector()->getPath()]);
     $rectorConfig->phpVersion(PhpVersion::PHP_81);

tests/Bundle/BundleTestCase.php src/Bundle/Tests/BundleTestCase.phptests/Bundle/BundleTestCase.php renamed to src/Bundle/Tests/BundleTestCase.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhPhD\ExceptionToolkit\Tests\Bundle;
+namespace PhPhD\ExceptionToolkit\Bundle\Tests;
 
 use Nyholm\BundleTest\TestKernel;
 use PhPhD\ExceptionToolkit\Bundle\PhdExceptionToolkitBundle;
-use PhPhD\ExceptionToolkit\Tests\Bundle\Compiler\TestServicesCompilerPass;
+use PhPhD\ExceptionToolkit\Bundle\Tests\Compiler\TestServicesCompilerPass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpKernel\KernelInterface;
 

…le/Compiler/TestServicesCompilerPass.php …ts/Compiler/TestServicesCompilerPass.phptests/Bundle/Compiler/TestServicesCompilerPass.php renamed to src/Bundle/Tests/Compiler/TestServicesCompilerPass.php tests/Bundle/Compiler/TestServicesCompilerPass.php renamed to src/Bundle/Tests/Compiler/TestServicesCompilerPass.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhPhD\ExceptionToolkit\Tests\Bundle\Compiler;
+namespace PhPhD\ExceptionToolkit\Bundle\Tests\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

…e/DependencyInjectionIntegrationTest.php …/Tests/ExceptionUnwrapperServiceTest.phptests/Bundle/DependencyInjectionIntegrationTest.php renamed to src/Unwrapper/Tests/ExceptionUnwrapperServiceTest.php tests/Bundle/DependencyInjectionIntegrationTest.php renamed to src/Unwrapper/Tests/ExceptionUnwrapperServiceTest.php

@@ -2,9 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhPhD\ExceptionToolkit\Tests\Bundle;
+namespace PhPhD\ExceptionToolkit\Unwrapper\Tests;
 
+use PhPhD\ExceptionToolkit\Bundle\Tests\BundleTestCase;
 use PhPhD\ExceptionToolkit\Unwrapper\Amp\AmpExceptionUnwrapper;
+use PhPhD\ExceptionToolkit\Unwrapper\ExceptionUnwrapper;
 use PhPhD\ExceptionToolkit\Unwrapper\Messenger\MessengerExceptionUnwrapper;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 
@@ -14,7 +16,7 @@
  *
  * @internal
  */
-final class DependencyInjectionIntegrationTest extends BundleTestCase
+final class ExceptionUnwrapperServiceTest extends BundleTestCase
 {
     public function testServiceDefinitions(): void
     {
@@ -30,7 +32,7 @@ private function checkExceptionUnwrapper(): void
 
     private function checkTopmostUnwrapper(): void
     {
-        $exceptionUnwrapper = self::getContainer()->get('phd_exception_toolkit.exception_unwrapper');
+        $exceptionUnwrapper = self::getContainer()->get(ExceptionUnwrapper::class);
         self::assertInstanceOf(LazyObjectInterface::class, $exceptionUnwrapper);
         self::assertFalse($exceptionUnwrapper->isLazyObjectInitialized());
         $topmostUnwrapper = $exceptionUnwrapper->initializeLazyObject();

…Unwrapper/ExceptionUnwrapperUnitTest.php …per/Tests/ExceptionUnwrapperUnitTest.phptests/Unwrapper/ExceptionUnwrapperUnitTest.php renamed to src/Unwrapper/Tests/ExceptionUnwrapperUnitTest.php tests/Unwrapper/ExceptionUnwrapperUnitTest.php renamed to src/Unwrapper/Tests/ExceptionUnwrapperUnitTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhPhD\ExceptionToolkit\Tests\Unwrapper;
+namespace PhPhD\ExceptionToolkit\Unwrapper\Tests;
 
 use Amp\CompositeException;
 use Exception;