Merge pull request #426 from greg0ire/modern-directory-structure

Switch to a modern directory structure
doctrine · Apr 1, 2024 · 838207b · 838207b
2 parents c27df72 + 134bd7e
commit 838207b
Show file tree

Hide file tree

Showing 31 changed files with 34 additions and 38 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,7 @@
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
-/Tests export-ignore
+/tests export-ignore
 /phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore
 /phpstan.neon.dist export-ignore

diff --git a/composer.json b/composer.json
@@ -43,7 +43,10 @@
         "doctrine/dbal": "< 3"
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "" }
+        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "src" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\Tests\\": "tests" }
     },
     "config": {
         "sort-packages": true,

diff --git a/Resources/config/services.xml → config/services.xml b/Resources/config/services.xml → config/services.xml
diff --git a/Resources/doc/index.rst → docs/index.rst b/Resources/doc/index.rst → docs/index.rst
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -11,8 +11,8 @@
      <!-- Ignore warnings and show progress of the run -->
     <arg value="nps"/>
 
-    <file>.</file>
-    <exclude-pattern>/vendor</exclude-pattern>
+    <file>src</file>
+    <file>tests</file>
 
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
@@ -21,15 +21,15 @@
 
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix">
-        <exclude-pattern>FixtureGroupInterface.php</exclude-pattern>
-        <exclude-pattern>ORMFixtureInterface.php</exclude-pattern>
+        <exclude-pattern>src/FixtureGroupInterface.php</exclude-pattern>
+        <exclude-pattern>src/ORMFixtureInterface.php</exclude-pattern>
     </rule>
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>Loader/SymfonyBridgeLoader.php</exclude-pattern>
-        <exclude-pattern>Command/CommandCompatibility.php</exclude-pattern>
-        <exclude-pattern>Tests/IntegrationTest.php</exclude-pattern>
+        <exclude-pattern>src/Loader/SymfonyBridgeLoader.php</exclude-pattern>
+        <exclude-pattern>src/Command/CommandCompatibility.php</exclude-pattern>
+        <exclude-pattern>tests/IntegrationTest.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
-        <exclude-pattern>Tests/IntegrationTest.php</exclude-pattern>
+        <exclude-pattern>tests/IntegrationTest.php</exclude-pattern>
     </rule>
 </ruleset>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,26 +1,25 @@
 parameters:
 	excludePaths:
 		# Contains an error that is impossible to ignore
-		- Tests/IntegrationTest.php
+		- tests/IntegrationTest.php
 
 	ignoreErrors:
 		-
 			message: "#^Call to an undefined static method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyBridgeLoader\\:\\:addFixture\\(\\)\\.$#"
 			count: 1
-			path: Loader/SymfonyFixturesLoader.php
+			path: src/Loader/SymfonyFixturesLoader.php
 
 		-
 			message: "#^Call to an undefined static method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyBridgeLoader\\:\\:getFixtures\\(\\)\\.$#"
 			count: 1
-			path: Loader/SymfonyFixturesLoader.php
+			path: src/Loader/SymfonyFixturesLoader.php
 
 		-
 			message: "#^Class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyFixturesLoader does not have a constructor and must be instantiated without any parameters\\.$#"
 			count: 2
-			path: Tests/Command/LoadDataFixturesDoctrineCommandTest.php
+			path: tests/Command/LoadDataFixturesDoctrineCommandTest.php
 
 		-
 			message: "#^Constructor of class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Tests\\\\Fixtures\\\\FooBundle\\\\DataFixtures\\\\RequiredConstructorArgsFixtures has an unused parameter \\$fooRequiredArg\\.$#"
 			count: 1
-			path: Tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php
-
+			path: tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,9 +2,8 @@ parameters:
     phpVersion: 80100
     level: 3
     paths:
-        - .
-    excludePaths:
-        - vendor
+        - src
+        - tests
 
 includes:
     - phpstan-baseline.neon
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,18 +3,13 @@
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="DoctrineFixturesBundle for the Symfony Framework">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>.</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
+            <directory>src</directory>
         </whitelist>
     </filter>
 

diff --git a/psalm.xml b/psalm.xml
@@ -10,15 +10,8 @@
     findUnusedCode="false"
 >
     <projectFiles>
-        <directory name="Command" />
-        <directory name="DependencyInjection" />
-        <directory name="Loader" />
-        <directory name="Purger" />
-        <directory name="Tests" />
-        <file name="DoctrineFixturesBundle.php" />
-        <file name="Fixture.php" />
-        <file name="FixtureGroupInterface.php" />
-        <file name="ORMFixtureInterface.php" />
+        <directory name="src" />
+        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
@@ -27,8 +20,8 @@
     <issueHandlers>
         <DuplicateClass>
             <errorLevel type="suppress">
-                <file name="Command/CommandCompatibility.php"/>
-                <file name="Tests/IntegrationTest.php"/>
+                <file name="src/Command/CommandCompatibility.php"/>
+                <file name="tests/IntegrationTest.php"/>
             </errorLevel>
         </DuplicateClass>
     </issueHandlers>

diff --git a/Command/CommandCompatibility.php → src/Command/CommandCompatibility.php b/Command/CommandCompatibility.php → src/Command/CommandCompatibility.php
diff --git a/Command/LoadDataFixturesDoctrineCommand.php → ...mmand/LoadDataFixturesDoctrineCommand.php b/Command/LoadDataFixturesDoctrineCommand.php → ...mmand/LoadDataFixturesDoctrineCommand.php
diff --git a/...ion/CompilerPass/FixturesCompilerPass.php → ...ion/CompilerPass/FixturesCompilerPass.php b/...ion/CompilerPass/FixturesCompilerPass.php → ...ion/CompilerPass/FixturesCompilerPass.php
diff --git a/...ompilerPass/PurgerFactoryCompilerPass.php → ...ompilerPass/PurgerFactoryCompilerPass.php b/...ompilerPass/PurgerFactoryCompilerPass.php → ...ompilerPass/PurgerFactoryCompilerPass.php
diff --git a/...cyInjection/DoctrineFixturesExtension.php → ...cyInjection/DoctrineFixturesExtension.php b/...cyInjection/DoctrineFixturesExtension.php → ...cyInjection/DoctrineFixturesExtension.php
@@ -22,7 +22,7 @@ class DoctrineFixturesExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . '/../config'));
 
         $loader->load('services.xml');
 

diff --git a/DoctrineFixturesBundle.php → src/DoctrineFixturesBundle.php b/DoctrineFixturesBundle.php → src/DoctrineFixturesBundle.php
@@ -9,6 +9,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+use function dirname;
+
 class DoctrineFixturesBundle extends Bundle
 {
     /** @return void */
@@ -17,4 +19,9 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new FixturesCompilerPass());
         $container->addCompilerPass(new PurgerFactoryCompilerPass());
     }
+
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }
diff --git a/Fixture.php → src/Fixture.php b/Fixture.php → src/Fixture.php
diff --git a/FixtureGroupInterface.php → src/FixtureGroupInterface.php b/FixtureGroupInterface.php → src/FixtureGroupInterface.php
diff --git a/Loader/SymfonyBridgeLoader.php → src/Loader/SymfonyBridgeLoader.php b/Loader/SymfonyBridgeLoader.php → src/Loader/SymfonyBridgeLoader.php
diff --git a/Loader/SymfonyFixturesLoader.php → src/Loader/SymfonyFixturesLoader.php b/Loader/SymfonyFixturesLoader.php → src/Loader/SymfonyFixturesLoader.php
diff --git a/ORMFixtureInterface.php → src/ORMFixtureInterface.php b/ORMFixtureInterface.php → src/ORMFixtureInterface.php
diff --git a/Purger/ORMPurgerFactory.php → src/Purger/ORMPurgerFactory.php b/Purger/ORMPurgerFactory.php → src/Purger/ORMPurgerFactory.php
diff --git a/Purger/PurgerFactory.php → src/Purger/PurgerFactory.php b/Purger/PurgerFactory.php → src/Purger/PurgerFactory.php
diff --git a/...d/LoadDataFixturesDoctrineCommandTest.php → ...d/LoadDataFixturesDoctrineCommandTest.php b/...d/LoadDataFixturesDoctrineCommandTest.php → ...d/LoadDataFixturesDoctrineCommandTest.php
diff --git a/...dentOnRequiredConstructorArgsFixtures.php → ...dentOnRequiredConstructorArgsFixtures.php b/...dentOnRequiredConstructorArgsFixtures.php → ...dentOnRequiredConstructorArgsFixtures.php
diff --git a/.../FooBundle/DataFixtures/OtherFixtures.php → .../FooBundle/DataFixtures/OtherFixtures.php b/.../FooBundle/DataFixtures/OtherFixtures.php → .../FooBundle/DataFixtures/OtherFixtures.php
diff --git a/...tures/RequiredConstructorArgsFixtures.php → ...tures/RequiredConstructorArgsFixtures.php b/...tures/RequiredConstructorArgsFixtures.php → ...tures/RequiredConstructorArgsFixtures.php
diff --git a/...DataFixtures/WithDependenciesFixtures.php → ...DataFixtures/WithDependenciesFixtures.php b/...DataFixtures/WithDependenciesFixtures.php → ...DataFixtures/WithDependenciesFixtures.php
diff --git a/Tests/Fixtures/FooBundle/FooBundle.php → tests/Fixtures/FooBundle/FooBundle.php b/Tests/Fixtures/FooBundle/FooBundle.php → tests/Fixtures/FooBundle/FooBundle.php
diff --git a/Tests/IntegrationTest.php → tests/IntegrationTest.php b/Tests/IntegrationTest.php → tests/IntegrationTest.php
diff --git a/Tests/IntegrationTestKernel.php → tests/IntegrationTestKernel.php b/Tests/IntegrationTestKernel.php → tests/IntegrationTestKernel.php
diff --git a/Tests/Purger/ORMPurgerFactoryTest.php → tests/Purger/ORMPurgerFactoryTest.php b/Tests/Purger/ORMPurgerFactoryTest.php → tests/Purger/ORMPurgerFactoryTest.php