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

Switch to a modern directory structure

composer.json

@@ -44,13 +44,10 @@
         "vimeo/psalm": "^4.30 || ^5.15"
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
+        "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "src" }
     },
     "autoload-dev": {
-        "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "Tests" }
+        "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "tests" }
     },
     "config": {
         "allow-plugins": {

phpcs.xml.dist

@@ -11,13 +11,10 @@
 
     <config name="php_version" value="70200"/>
 
-    <file>Collector</file>
-    <file>MigrationsFactory</file>
-    <file>DoctrineMigrationsBundle.php</file>
-    <file>DependencyInjection</file>
-    <file>Tests</file>
+    <file>src</file>
+    <file>tests</file>
 
-    <exclude-pattern>Tests/Fixtures/CustomEntityManager.php</exclude-pattern>
+    <exclude-pattern>tests/Fixtures/CustomEntityManager.php</exclude-pattern>
 
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint" />

phpstan-baseline.neon

@@ -3,24 +3,24 @@ parameters:
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
-			path: Collector/MigrationsCollector.php
+			path: src/Collector/MigrationsCollector.php
 
 		-
 			message: "#^Only booleans are allowed in a negated boolean, Doctrine\\\\Migrations\\\\AbstractMigration\\|null given\\.$#"
 			count: 1
-			path: Collector/MigrationsFlattener.php
+			path: src/Collector/MigrationsFlattener.php
 
 		-
 			message: "#^Only booleans are allowed in a ternary operator condition, Doctrine\\\\Migrations\\\\AbstractMigration\\|null given\\.$#"
 			count: 2
-			path: Collector/MigrationsFlattener.php
+			path: src/Collector/MigrationsFlattener.php
 
 		-
 			message: "#^Call to method setContainer\\(\\) on an unknown class Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareInterface\\.$#"
 			count: 1
-			path: MigrationsFactory/ContainerAwareMigrationFactory.php
+			path: src/MigrationsFactory/ContainerAwareMigrationFactory.php
 
 		-
 			message: "#^Class Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareInterface not found\\.$#"
 			count: 2
-			path: MigrationsFactory/ContainerAwareMigrationFactory.php
+			path: src/MigrationsFactory/ContainerAwareMigrationFactory.php

phpstan.neon.dist

@@ -2,15 +2,12 @@ parameters:
     level: 7
     phpVersion: 80200
     paths:
-        - Collector
-        - DependencyInjection
-        - DoctrineMigrationsBundle.php
-        - MigrationsFactory
-        - Tests
+        - src
+        - tests
 
     excludePaths:
         # That file contains an error that cannot be ignored
-        - Tests/Fixtures/Migrations/ContainerAwareMigration.php
+        - tests/Fixtures/Migrations/ContainerAwareMigration.php
 
     ignoreErrors:
         - '~Parameter \#1 \$configs.*DoctrineMigrationsExtension::load.*~'

phpunit.xml.dist

@@ -3,18 +3,13 @@
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="DoctrineMigrationsBundle 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>
 

psalm-baseline.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
-  <file src="DependencyInjection/Configuration.php">
+  <file src="src/DependencyInjection/Configuration.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[end]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="DependencyInjection/DoctrineMigrationsExtension.php">
+  <file src="src/DependencyInjection/DoctrineMigrationsExtension.php">
     <MoreSpecificImplementedParamType>
       <code><![CDATA[$configs]]></code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="MigrationsFactory/ContainerAwareMigrationFactory.php">
+  <file src="src/MigrationsFactory/ContainerAwareMigrationFactory.php">
     <ContainerDependency>
       <code><![CDATA[ContainerInterface $container]]></code>
     </ContainerDependency>
     <UndefinedClass>
       <code><![CDATA[ContainerAwareInterface]]></code>
     </UndefinedClass>
   </file>
-  <file src="Tests/Fixtures/Migrations/ContainerAwareMigration.php">
+  <file src="tests/Fixtures/Migrations/ContainerAwareMigration.php">
     <UndefinedClass>
       <code><![CDATA[ContainerAwareInterface]]></code>
     </UndefinedClass>

psalm.xml

@@ -10,11 +10,8 @@
     errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
-        <directory name="Collector" />
-        <directory name="DependencyInjection" />
-        <directory name="MigrationsFactory" />
-        <directory name="Tests" />
-        <file name="DoctrineMigrationsBundle.php" />
+        <directory name="src" />
+        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

DependencyInjection/DoctrineMigrationsExtension.php → src/DependencyInjection/DoctrineMigrationsExtension.php

@@ -47,7 +47,7 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $config = $this->processConfiguration($configuration, $configs);
 
-        $locator = new FileLocator(__DIR__ . '/../Resources/config/');
+        $locator = new FileLocator(__DIR__ . '/../../config/');
         $loader  = new XmlFileLoader($container, $locator);
 
         $loader->load('services.xml');
@@ -195,7 +195,7 @@ private function registerCollector(ContainerBuilder $container): void
      */
     public function getXsdValidationBasePath(): string
     {
-        return __DIR__ . '/../Resources/config/schema';
+        return __DIR__ . '/../../config/schema';
     }
 
     public function getNamespace(): string

DoctrineMigrationsBundle.php → src/DoctrineMigrationsBundle.php

@@ -8,6 +8,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+use function dirname;
+
 /**
  * Bundle.
  */
@@ -18,4 +20,9 @@ public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new ConfigureDependencyFactoryPass());
     }
+
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }