Flatten directory tree

.github/workflows/bc-check.yml

@@ -7,13 +7,13 @@ on:
       - "*.x"
     paths:
       - .github/workflows/bc-check.yml
-      - lib/**
+      - src/**
   push:
     branches:
       - "*.x"
     paths:
       - .github/workflows/bc-check.yml
-      - lib/**
+      - src/**
 
 jobs:
   roave_bc_check:

.github/workflows/continuous-integration.yml

@@ -8,7 +8,7 @@ on:
       - .github/workflows/continuous-integration.yml
       - composer.*
       - download-box.sh
-      - lib/**
+      - src/**
       - phpunit.xml.dist
       - tests/**
   push:
@@ -18,7 +18,7 @@ on:
       - .github/workflows/continuous-integration.yml
       - composer.*
       - download-box.sh
-      - lib/**
+      - src/**
       - phpunit.xml.dist
       - tests/**
 

.github/workflows/static-analysis.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - .github/workflows/static-analysis.yml
       - composer.*
-      - lib/**
+      - src/**
       - phpstan*
       - tests/**
   push:
@@ -17,7 +17,7 @@ on:
     paths:
       - .github/workflows/static-analysis.yml
       - composer.*
-      - lib/**
+      - src/**
       - phpstan*
       - tests/**
 

composer.json

@@ -59,12 +59,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Migrations\\": "lib/Doctrine/Migrations"
+            "Doctrine\\Migrations\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Migrations\\Tests\\": "tests/Doctrine/Migrations/Tests"
+            "Doctrine\\Migrations\\Tests\\": "tests"
         }
     },
     "bin": [

phpcs.xml.dist

@@ -12,13 +12,13 @@
     <arg value="nps"/>
 
     <file>bin</file>
-    <file>lib</file>
+    <file>src</file>
     <file>tests</file>
 
     <rule ref="Doctrine"/>
 
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/src/*</exclude-pattern>
     </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
@@ -30,25 +30,25 @@
     </rule>
 
     <rule ref="Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase">
-        <exclude-pattern>lib/Doctrine/Migrations/Events.php</exclude-pattern>
+        <exclude-pattern>src/Events.php</exclude-pattern>
     </rule>
 
     <rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
-        <exclude-pattern>lib/Doctrine/Migrations/MigrationsVersion.php</exclude-pattern>
+        <exclude-pattern>src/MigrationsVersion.php</exclude-pattern>
     </rule>
 
     <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
-        <exclude-pattern>tests/Doctrine/Migrations/Tests/TestLogger.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php</exclude-pattern>
+        <exclude-pattern>tests/TestLogger.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Console/ConsoleLogger.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming">
-        <exclude-pattern>lib/Doctrine/Migrations/AbstractMigration.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/Migrations/Configuration/Loader/AbstractFileLoader.php</exclude-pattern>
+        <exclude-pattern>src/AbstractMigration.php</exclude-pattern>
+        <exclude-pattern>src/Configuration/Loader/AbstractFileLoader.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php</exclude-pattern>
+        <exclude-pattern>tests/Stub/DoctrineRegistry.php</exclude-pattern>
     </rule>
 
 </ruleset>

phpstan.neon.dist

@@ -1,38 +1,38 @@
 parameters:
     level: 7
     paths:
-        - lib
+        - src
         - tests
     excludePaths:
-        - tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
+        - tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
     ignoreErrors:
         - '~Variable method call on Doctrine\\Migrations\\AbstractMigration~'
         -
             message: '~^Call to function in_array\(\) requires parameter #3 to be true\.$~'
-            path: lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php
+            path: src/Version/SortedMigrationPlanCalculator.php
         -
             message: '~^Variable property access on SimpleXMLElement\.$~'
-            path: lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php
+            path: src/Configuration/Migration/XmlFile.php
         -
             message: '~^Call to function is_bool\(\) with bool will always evaluate to true\.$~'
-            path: lib/Doctrine/Migrations/InlineParameterFormatter.php
+            path: src/InlineParameterFormatter.php
         -
             message: '~^Call to an undefined method Symfony\\Component\\Console\\Output\\OutputInterface\:\:getErrorOutput\(\)\.$~'
-            path: lib/Doctrine/Migrations/Tools/Console/ConsoleLogger.php
+            path: src/Tools/Console/ConsoleLogger.php
         -
             message: '~^Method Doctrine\\Migrations\\Tests\\Stub\\DoctrineRegistry::getService\(\) should return Doctrine\\Persistence\\ObjectManager but returns Doctrine\\DBAL\\Connection\|Doctrine\\ORM\\EntityManager~'
-            path: tests/Doctrine/Migrations/Tests/Stub/DoctrineRegistry.php
+            path: tests/Stub/DoctrineRegistry.php
 
         # https://github.com/phpstan/phpstan/issues/5982
         -
             message: '~^Cannot call method getWrappedConnection\(\) on class-string\|object\.~'
-            path: lib/Doctrine/Migrations/Tools/TransactionHelper.php
+            path: src/Tools/TransactionHelper.php
 
         # TODO: Be more precise about class-strings
         -
             message: '~^Method Doctrine\\Migrations\\Version\\DbalMigrationFactory::createVersion\(\) should return Doctrine\\Migrations\\AbstractMigration but returns object\.$~'
             paths:
-                - lib/Doctrine/Migrations/Version/DbalMigrationFactory.php
+                - src/Version/DbalMigrationFactory.php
 
         # We're testing legacy functionality here.
         -
@@ -41,20 +41,20 @@ parameters:
 				This class will be removed in ORM 3\\.0 without replacement\\.$#
 			"""
             count: 1
-            path: tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php
+            path: tests/Tools/Console/legacy-config-orm/cli-config.php
         -
             message: """
 				#^Fetching class constant class of deprecated class Doctrine\\\\ORM\\\\Tools\\\\Console\\\\Helper\\\\EntityManagerHelper\\:
 				This class will be removed in ORM 3\\.0 without replacement\\.$#
 			"""
             count: 1
-            path: tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
+            path: tests/Tools/Console/ConsoleRunnerTest.php
 
         # TODO: deprecate using the connection event manager and expose
         # our own event manager instead.
         -
             message: '~^Call to deprecated method getEventManager\(\) of class Doctrine\\DBAL\\Connection\.$~'
-            path: lib/Doctrine/Migrations/DependencyFactory.php
+            path: src/DependencyFactory.php
 
         # DBAL 4 forward compatibility
         - '~^Call to function method_exists\(\) with ''Doctrine\\\\DBAL\\\\Connection'' and ''getEventManager'' will always evaluate to true\.$~'
@@ -63,7 +63,7 @@ parameters:
         - '~^Access to constant class on an unknown class Doctrine\\DBAL\\Platforms\\SQLitePlatform\.$~'
         - '~expects Doctrine\\DBAL\\Platforms\\AbstractPlatform, Doctrine\\DBAL\\Platforms\\SQLitePlatform given\.$~'
     symfony:
-            console_application_loader: tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
+            console_application_loader: tests/doctrine-migrations-phpstan-app.php
 includes:
     - vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon

phpunit.xml.dist

@@ -11,13 +11,13 @@
 
     <testsuites>
         <testsuite name="Doctrine2 Database Migrations Test Suite">
-            <directory>./tests/Doctrine/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
     <source>
         <include>
-            <directory>./lib/</directory>
+            <directory>src</directory>
         </include>
     </source>
 </phpunit>