Use a modern directory structure

The recommended directory structure is more similar to what we do in non-bundle repositories. Also, this means smaller configuration for tools such as PHPCSStandards, PHPUnit or Psalm.
doctrine · Mar 15, 2024 · fa3e8e3 · fa3e8e3
1 parent 5afffe0
commit fa3e8e3
Show file tree

Hide file tree

Showing 270 changed files with 31 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -21,4 +21,4 @@ schema management and PDO abstraction.
 ## Documentation
 
 The documentation is rendered on [the symfony.com website](https://symfony.com/doc/current/reference/configuration/doctrine.html).
-The source of the documentation is available in the Resources/docs folder.
+The source of the documentation is available in the docs folder.
diff --git a/composer.json b/composer.json
@@ -81,12 +81,13 @@
     "minimum-stability": "dev",
     "autoload": {
         "psr-4": {
-            "Doctrine\\Bundle\\DoctrineBundle\\": ""
+            "Doctrine\\Bundle\\DoctrineBundle\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "": "Tests/DependencyInjection"
+            "": "tests/DependencyInjection",
+            "Doctrine\\Bundle\\DoctrineBundle\\Tests\\": "tests"
         }
     },
     "config": {

diff --git a/Resources/config/dbal.xml → config/dbal.xml b/Resources/config/dbal.xml → config/dbal.xml
diff --git a/Resources/config/messenger.xml → config/messenger.xml b/Resources/config/messenger.xml → config/messenger.xml
diff --git a/Resources/config/middlewares.xml → config/middlewares.xml b/Resources/config/middlewares.xml → config/middlewares.xml
diff --git a/Resources/config/orm.xml → config/orm.xml b/Resources/config/orm.xml → config/orm.xml
diff --git a/Resources/config/schema/doctrine-1.0.xsd → config/schema/doctrine-1.0.xsd b/Resources/config/schema/doctrine-1.0.xsd → config/schema/doctrine-1.0.xsd
diff --git a/Resources/doc/configuration.rst → docs/configuration.rst b/Resources/doc/configuration.rst → docs/configuration.rst
diff --git a/Resources/doc/custom-id-generators.rst → docs/custom-id-generators.rst b/Resources/doc/custom-id-generators.rst → docs/custom-id-generators.rst
diff --git a/Resources/doc/entity-listeners.rst → docs/entity-listeners.rst b/Resources/doc/entity-listeners.rst → docs/entity-listeners.rst
diff --git a/Resources/doc/event-listeners.rst → docs/event-listeners.rst b/Resources/doc/event-listeners.rst → docs/event-listeners.rst
diff --git a/Resources/doc/index.rst → docs/index.rst b/Resources/doc/index.rst → docs/index.rst
diff --git a/Resources/doc/installation.rst → docs/installation.rst b/Resources/doc/installation.rst → docs/installation.rst
diff --git a/Resources/doc/middlewares.rst → docs/middlewares.rst b/Resources/doc/middlewares.rst → docs/middlewares.rst
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -11,8 +11,7 @@
 
     <config name="php_version" value="70400"/>
 
-    <file>.</file>
-    <exclude-pattern>vendor/*</exclude-pattern>
+    <file>src</file>
 
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="true" bootstrap="Tests/bootstrap.php">
+<phpunit colors="true" bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="DoctrineBundle 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.dist b/psalm.xml.dist
@@ -13,35 +13,20 @@
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
     <projectFiles>
+        <directory name="src"/>
         <ignoreFiles>
             <directory name="vendor"/>
             <!-- Deprecated classes, not worth fixing -->
-            <file name="Command/ImportMappingDoctrineCommand.php"/>
-            <file name="Command/Proxy/OrmProxyCommand.php"/>
-            <file name="DependencyInjection/Compiler/WellKnownSchemaFilterPass.php"/>
+            <file name="src/Command/ImportMappingDoctrineCommand.php"/>
+            <file name="src/Command/Proxy/OrmProxyCommand.php"/>
+            <file name="src/DependencyInjection/Compiler/WellKnownSchemaFilterPass.php"/>
         </ignoreFiles>
-        <directory name="CacheWarmer"/>
-        <directory name="Command"/>
-        <directory name="Controller"/>
-        <directory name="DataCollector"/>
-        <directory name="Dbal"/>
-        <directory name="DependencyInjection"/>
-        <directory name="EventSubscriber"/>
-        <directory name="Mapping"/>
-        <directory name="Middleware"/>
-        <directory name="Repository"/>
-        <directory name="Tests"/>
-        <directory name="Twig"/>
-        <file name="ConnectionFactory.php"/>
-        <file name="DoctrineBundle.php"/>
-        <file name="ManagerConfigurator.php"/>
-        <file name="Registry.php"/>
     </projectFiles>
     <issueHandlers>
         <RedundantPropertyInitializationCheck>
             <errorLevel type="suppress">
                 <!-- Properties can be uninitialized in tests if setUp() fails. -->
-                <directory name="Tests"/>
+                <directory name="tests"/>
             </errorLevel>
         </RedundantPropertyInitializationCheck>
         <UndefinedClass>
@@ -63,14 +48,14 @@
         <DuplicateClass>
             <errorLevel type="suppress">
                 <!-- Conditional class definition-->
-                <file name="Repository/RepositoryFactoryCompatibility.php"/>
-                <file name="Repository/ServiceEntityRepository.php"/>
+                <file name="src/Repository/RepositoryFactoryCompatibility.php"/>
+                <file name="src/Repository/ServiceEntityRepository.php"/>
             </errorLevel>
         </DuplicateClass>
         <UndefinedMethod>
             <errorLevel type="suppress">
                 <!-- Too tricky to configure very nested configuration in a way Psalm understands -->
-                <file name="DependencyInjection/Configuration.php" />
+                <file name="src/DependencyInjection/Configuration.php" />
             </errorLevel>
         </UndefinedMethod>
     </issueHandlers>

diff --git a/Attribute/AsDoctrineListener.php → src/Attribute/AsDoctrineListener.php b/Attribute/AsDoctrineListener.php → src/Attribute/AsDoctrineListener.php
diff --git a/Attribute/AsEntityListener.php → src/Attribute/AsEntityListener.php b/Attribute/AsEntityListener.php → src/Attribute/AsEntityListener.php
diff --git a/Attribute/AsMiddleware.php → src/Attribute/AsMiddleware.php b/Attribute/AsMiddleware.php → src/Attribute/AsMiddleware.php
diff --git a/CacheWarmer/DoctrineMetadataCacheWarmer.php → ...cheWarmer/DoctrineMetadataCacheWarmer.php b/CacheWarmer/DoctrineMetadataCacheWarmer.php → ...cheWarmer/DoctrineMetadataCacheWarmer.php
diff --git a/Command/CreateDatabaseDoctrineCommand.php → ...Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php → ...Command/CreateDatabaseDoctrineCommand.php
diff --git a/Command/DoctrineCommand.php → src/Command/DoctrineCommand.php b/Command/DoctrineCommand.php → src/Command/DoctrineCommand.php
diff --git a/Command/DropDatabaseDoctrineCommand.php → src/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php → src/Command/DropDatabaseDoctrineCommand.php
diff --git a/Command/ImportMappingDoctrineCommand.php → src/Command/ImportMappingDoctrineCommand.php b/Command/ImportMappingDoctrineCommand.php → src/Command/ImportMappingDoctrineCommand.php
diff --git a/...oxy/ClearMetadataCacheDoctrineCommand.php → ...oxy/ClearMetadataCacheDoctrineCommand.php b/...oxy/ClearMetadataCacheDoctrineCommand.php → ...oxy/ClearMetadataCacheDoctrineCommand.php
diff --git a/.../Proxy/ClearQueryCacheDoctrineCommand.php → .../Proxy/ClearQueryCacheDoctrineCommand.php b/.../Proxy/ClearQueryCacheDoctrineCommand.php → .../Proxy/ClearQueryCacheDoctrineCommand.php
diff --git a/...Proxy/ClearResultCacheDoctrineCommand.php → ...Proxy/ClearResultCacheDoctrineCommand.php b/...Proxy/ClearResultCacheDoctrineCommand.php → ...Proxy/ClearResultCacheDoctrineCommand.php
diff --git a/...Proxy/CollectionRegionDoctrineCommand.php → ...Proxy/CollectionRegionDoctrineCommand.php b/...Proxy/CollectionRegionDoctrineCommand.php → ...Proxy/CollectionRegionDoctrineCommand.php
diff --git a/...d/Proxy/ConvertMappingDoctrineCommand.php → ...d/Proxy/ConvertMappingDoctrineCommand.php b/...d/Proxy/ConvertMappingDoctrineCommand.php → ...d/Proxy/ConvertMappingDoctrineCommand.php
diff --git a/...and/Proxy/CreateSchemaDoctrineCommand.php → ...and/Proxy/CreateSchemaDoctrineCommand.php b/...and/Proxy/CreateSchemaDoctrineCommand.php → ...and/Proxy/CreateSchemaDoctrineCommand.php
diff --git a/Command/Proxy/DoctrineCommandHelper.php → src/Command/Proxy/DoctrineCommandHelper.php b/Command/Proxy/DoctrineCommandHelper.php → src/Command/Proxy/DoctrineCommandHelper.php
diff --git a/Command/Proxy/DropSchemaDoctrineCommand.php → ...mmand/Proxy/DropSchemaDoctrineCommand.php b/Command/Proxy/DropSchemaDoctrineCommand.php → ...mmand/Proxy/DropSchemaDoctrineCommand.php
diff --git a/...sureProductionSettingsDoctrineCommand.php → ...sureProductionSettingsDoctrineCommand.php b/...sureProductionSettingsDoctrineCommand.php → ...sureProductionSettingsDoctrineCommand.php
diff --git a/...roxy/EntityRegionCacheDoctrineCommand.php → ...roxy/EntityRegionCacheDoctrineCommand.php b/...roxy/EntityRegionCacheDoctrineCommand.php → ...roxy/EntityRegionCacheDoctrineCommand.php
diff --git a/Command/Proxy/InfoDoctrineCommand.php → src/Command/Proxy/InfoDoctrineCommand.php b/Command/Proxy/InfoDoctrineCommand.php → src/Command/Proxy/InfoDoctrineCommand.php
diff --git a/Command/Proxy/OrmProxyCommand.php → src/Command/Proxy/OrmProxyCommand.php b/Command/Proxy/OrmProxyCommand.php → src/Command/Proxy/OrmProxyCommand.php
diff --git a/...Proxy/QueryRegionCacheDoctrineCommand.php → ...Proxy/QueryRegionCacheDoctrineCommand.php b/...Proxy/QueryRegionCacheDoctrineCommand.php → ...Proxy/QueryRegionCacheDoctrineCommand.php
diff --git a/Command/Proxy/RunDqlDoctrineCommand.php → src/Command/Proxy/RunDqlDoctrineCommand.php b/Command/Proxy/RunDqlDoctrineCommand.php → src/Command/Proxy/RunDqlDoctrineCommand.php
diff --git a/Command/Proxy/RunSqlDoctrineCommand.php → src/Command/Proxy/RunSqlDoctrineCommand.php b/Command/Proxy/RunSqlDoctrineCommand.php → src/Command/Proxy/RunSqlDoctrineCommand.php
diff --git a/...and/Proxy/UpdateSchemaDoctrineCommand.php → ...and/Proxy/UpdateSchemaDoctrineCommand.php b/...and/Proxy/UpdateSchemaDoctrineCommand.php → ...and/Proxy/UpdateSchemaDoctrineCommand.php
diff --git a/Command/Proxy/ValidateSchemaCommand.php → src/Command/Proxy/ValidateSchemaCommand.php b/Command/Proxy/ValidateSchemaCommand.php → src/Command/Proxy/ValidateSchemaCommand.php
diff --git a/ConnectionFactory.php → src/ConnectionFactory.php b/ConnectionFactory.php → src/ConnectionFactory.php
diff --git a/Controller/ProfilerController.php → src/Controller/ProfilerController.php b/Controller/ProfilerController.php → src/Controller/ProfilerController.php
diff --git a/DataCollector/DoctrineDataCollector.php → src/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php → src/DataCollector/DoctrineDataCollector.php
diff --git a/Dbal/BlacklistSchemaAssetFilter.php → src/Dbal/BlacklistSchemaAssetFilter.php b/Dbal/BlacklistSchemaAssetFilter.php → src/Dbal/BlacklistSchemaAssetFilter.php
diff --git a/...anagerRegistryAwareConnectionProvider.php → ...anagerRegistryAwareConnectionProvider.php b/...anagerRegistryAwareConnectionProvider.php → ...anagerRegistryAwareConnectionProvider.php
diff --git a/Dbal/RegexSchemaAssetFilter.php → src/Dbal/RegexSchemaAssetFilter.php b/Dbal/RegexSchemaAssetFilter.php → src/Dbal/RegexSchemaAssetFilter.php
diff --git a/Dbal/SchemaAssetsFilterManager.php → src/Dbal/SchemaAssetsFilterManager.php b/Dbal/SchemaAssetsFilterManager.php → src/Dbal/SchemaAssetsFilterManager.php
diff --git a/...ction/Compiler/CacheCompatibilityPass.php → ...ction/Compiler/CacheCompatibilityPass.php b/...ction/Compiler/CacheCompatibilityPass.php → ...ction/Compiler/CacheCompatibilityPass.php
diff --git a/...on/Compiler/CacheSchemaSubscriberPass.php → ...on/Compiler/CacheSchemaSubscriberPass.php b/...on/Compiler/CacheSchemaSubscriberPass.php → ...on/Compiler/CacheSchemaSubscriberPass.php
diff --git a/...jection/Compiler/DbalSchemaFilterPass.php → ...jection/Compiler/DbalSchemaFilterPass.php b/...jection/Compiler/DbalSchemaFilterPass.php → ...jection/Compiler/DbalSchemaFilterPass.php
diff --git a/...tion/Compiler/DoctrineOrmMappingsPass.php → ...tion/Compiler/DoctrineOrmMappingsPass.php b/...tion/Compiler/DoctrineOrmMappingsPass.php → ...tion/Compiler/DoctrineOrmMappingsPass.php
diff --git a/...Injection/Compiler/EntityListenerPass.php → ...Injection/Compiler/EntityListenerPass.php b/...Injection/Compiler/EntityListenerPass.php → ...Injection/Compiler/EntityListenerPass.php
diff --git a/...ncyInjection/Compiler/IdGeneratorPass.php → ...ncyInjection/Compiler/IdGeneratorPass.php b/...ncyInjection/Compiler/IdGeneratorPass.php → ...ncyInjection/Compiler/IdGeneratorPass.php
diff --git a/...ncyInjection/Compiler/MiddlewaresPass.php → ...ncyInjection/Compiler/MiddlewaresPass.php b/...ncyInjection/Compiler/MiddlewaresPass.php → ...ncyInjection/Compiler/MiddlewaresPass.php
diff --git a/.../Compiler/RemoveLoggingMiddlewarePass.php → .../Compiler/RemoveLoggingMiddlewarePass.php b/.../Compiler/RemoveLoggingMiddlewarePass.php → .../Compiler/RemoveLoggingMiddlewarePass.php
diff --git a/...Compiler/RemoveProfilerControllerPass.php → ...Compiler/RemoveProfilerControllerPass.php b/...Compiler/RemoveProfilerControllerPass.php → ...Compiler/RemoveProfilerControllerPass.php
diff --git a/...ompiler/ServiceRepositoryCompilerPass.php → ...ompiler/ServiceRepositoryCompilerPass.php b/...ompiler/ServiceRepositoryCompilerPass.php → ...ompiler/ServiceRepositoryCompilerPass.php
diff --git a/...on/Compiler/WellKnownSchemaFilterPass.php → ...on/Compiler/WellKnownSchemaFilterPass.php b/...on/Compiler/WellKnownSchemaFilterPass.php → ...on/Compiler/WellKnownSchemaFilterPass.php
diff --git a/DependencyInjection/Configuration.php → src/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php → src/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/DoctrineExtension.php → ...DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php → ...DependencyInjection/DoctrineExtension.php
@@ -166,7 +166,7 @@ private function processConfigurationPrependingDefaults(ConfigurationInterface $
      */
     protected function dbalLoad(array $config, ContainerBuilder $container)
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('dbal.xml');
 
         if (empty($config['default_connection'])) {
@@ -447,7 +447,7 @@ protected function ormLoad(array $config, ContainerBuilder $container)
             throw new LogicException('To configure the ORM layer, you must first install the doctrine/orm package.');
         }
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('orm.xml');
 
         if (class_exists(AbstractType::class)) {
@@ -1116,7 +1116,7 @@ private function loadValidatorLoader(string $entityManagerName, ContainerBuilder
 
     public function getXsdValidationBasePath(): string
     {
-        return __DIR__ . '/../Resources/config/schema';
+        return __DIR__ . '/../../config/schema';
     }
 
     public function getNamespace(): string
@@ -1145,7 +1145,7 @@ private function loadMessengerServices(ContainerBuilder $container): void
             return;
         }
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('messenger.xml');
 
         // available in Symfony 6.3
@@ -1186,7 +1186,7 @@ private function registerDbalMiddlewares(
         array $connWithProfiling,
         array $connWithBacktrace
     ): void {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('middlewares.xml');
 
         $loggingMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.logging_middleware');

diff --git a/DoctrineBundle.php → src/DoctrineBundle.php b/DoctrineBundle.php → src/DoctrineBundle.php
diff --git a/EventSubscriber/EventSubscriberInterface.php → ...ntSubscriber/EventSubscriberInterface.php b/EventSubscriber/EventSubscriberInterface.php → ...ntSubscriber/EventSubscriberInterface.php
diff --git a/ManagerConfigurator.php → src/ManagerConfigurator.php b/ManagerConfigurator.php → src/ManagerConfigurator.php
diff --git a/Mapping/ClassMetadataCollection.php → src/Mapping/ClassMetadataCollection.php b/Mapping/ClassMetadataCollection.php → src/Mapping/ClassMetadataCollection.php
diff --git a/Mapping/ClassMetadataFactory.php → src/Mapping/ClassMetadataFactory.php b/Mapping/ClassMetadataFactory.php → src/Mapping/ClassMetadataFactory.php
diff --git a/Mapping/ContainerEntityListenerResolver.php → ...pping/ContainerEntityListenerResolver.php b/Mapping/ContainerEntityListenerResolver.php → ...pping/ContainerEntityListenerResolver.php
diff --git a/Mapping/DisconnectedMetadataFactory.php → src/Mapping/DisconnectedMetadataFactory.php b/Mapping/DisconnectedMetadataFactory.php → src/Mapping/DisconnectedMetadataFactory.php
diff --git a/Mapping/EntityListenerServiceResolver.php → ...Mapping/EntityListenerServiceResolver.php b/Mapping/EntityListenerServiceResolver.php → ...Mapping/EntityListenerServiceResolver.php
diff --git a/Mapping/MappingDriver.php → src/Mapping/MappingDriver.php b/Mapping/MappingDriver.php → src/Mapping/MappingDriver.php
diff --git a/Middleware/BacktraceDebugDataHolder.php → src/Middleware/BacktraceDebugDataHolder.php b/Middleware/BacktraceDebugDataHolder.php → src/Middleware/BacktraceDebugDataHolder.php
diff --git a/Middleware/ConnectionNameAwareInterface.php → ...ddleware/ConnectionNameAwareInterface.php b/Middleware/ConnectionNameAwareInterface.php → ...ddleware/ConnectionNameAwareInterface.php
diff --git a/Middleware/DebugMiddleware.php → src/Middleware/DebugMiddleware.php b/Middleware/DebugMiddleware.php → src/Middleware/DebugMiddleware.php
diff --git a/...gerRegistryAwareEntityManagerProvider.php → ...gerRegistryAwareEntityManagerProvider.php b/...gerRegistryAwareEntityManagerProvider.php → ...gerRegistryAwareEntityManagerProvider.php
diff --git a/Registry.php → src/Registry.php b/Registry.php → src/Registry.php
diff --git a/Repository/ContainerRepositoryFactory.php → ...Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php → ...Repository/ContainerRepositoryFactory.php
diff --git a/Repository/LazyServiceEntityRepository.php → ...epository/LazyServiceEntityRepository.php b/Repository/LazyServiceEntityRepository.php → ...epository/LazyServiceEntityRepository.php
diff --git a/...sitory/RepositoryFactoryCompatibility.php → ...sitory/RepositoryFactoryCompatibility.php b/...sitory/RepositoryFactoryCompatibility.php → ...sitory/RepositoryFactoryCompatibility.php
diff --git a/Repository/ServiceEntityRepository.php → src/Repository/ServiceEntityRepository.php b/Repository/ServiceEntityRepository.php → src/Repository/ServiceEntityRepository.php
diff --git a/...tory/ServiceEntityRepositoryInterface.php → ...tory/ServiceEntityRepositoryInterface.php b/...tory/ServiceEntityRepositoryInterface.php → ...tory/ServiceEntityRepositoryInterface.php
diff --git a/Repository/ServiceEntityRepositoryProxy.php → ...pository/ServiceEntityRepositoryProxy.php b/Repository/ServiceEntityRepositoryProxy.php → ...pository/ServiceEntityRepositoryProxy.php
diff --git a/Twig/DoctrineExtension.php → src/Twig/DoctrineExtension.php b/Twig/DoctrineExtension.php → src/Twig/DoctrineExtension.php
diff --git a/Resources/views/Collector/database.svg → templates/Collector/database.svg b/Resources/views/Collector/database.svg → templates/Collector/database.svg
diff --git a/Resources/views/Collector/db.html.twig → templates/Collector/db.html.twig b/Resources/views/Collector/db.html.twig → templates/Collector/db.html.twig
diff --git a/Resources/views/Collector/explain.html.twig → templates/Collector/explain.html.twig b/Resources/views/Collector/explain.html.twig → templates/Collector/explain.html.twig
diff --git a/Resources/views/Collector/icon.svg → templates/Collector/icon.svg b/Resources/views/Collector/icon.svg → templates/Collector/icon.svg
diff --git a/Tests/Builder/BundleConfigurationBuilder.php → tests/Builder/BundleConfigurationBuilder.php b/Tests/Builder/BundleConfigurationBuilder.php → tests/Builder/BundleConfigurationBuilder.php
diff --git a/Tests/BundleTest.php → tests/BundleTest.php b/Tests/BundleTest.php → tests/BundleTest.php
diff --git a/Tests/CacheSchemaSubscriberTest.php → tests/CacheSchemaSubscriberTest.php b/Tests/CacheSchemaSubscriberTest.php → tests/CacheSchemaSubscriberTest.php
diff --git a/Tests/Command/CreateDatabaseDoctrineTest.php → tests/Command/CreateDatabaseDoctrineTest.php b/Tests/Command/CreateDatabaseDoctrineTest.php → tests/Command/CreateDatabaseDoctrineTest.php
diff --git a/Tests/Command/DropDatabaseDoctrineTest.php → tests/Command/DropDatabaseDoctrineTest.php b/Tests/Command/DropDatabaseDoctrineTest.php → tests/Command/DropDatabaseDoctrineTest.php
diff --git a/...mand/ImportMappingDoctrineCommandTest.php → ...mand/ImportMappingDoctrineCommandTest.php b/...mand/ImportMappingDoctrineCommandTest.php → ...mand/ImportMappingDoctrineCommandTest.php
diff --git a/...Command/Proxy/InfoDoctrineCommandTest.php → ...Command/Proxy/InfoDoctrineCommandTest.php b/...Command/Proxy/InfoDoctrineCommandTest.php → ...Command/Proxy/InfoDoctrineCommandTest.php
diff --git a/Tests/ConnectionFactoryTest.php → tests/ConnectionFactoryTest.php b/Tests/ConnectionFactoryTest.php → tests/ConnectionFactoryTest.php
diff --git a/Tests/ContainerTest.php → tests/ContainerTest.php b/Tests/ContainerTest.php → tests/ContainerTest.php
diff --git a/...taCollector/DoctrineDataCollectorTest.php → ...taCollector/DoctrineDataCollectorTest.php b/...taCollector/DoctrineDataCollectorTest.php → ...taCollector/DoctrineDataCollectorTest.php
diff --git a/Tests/Dbal/RegexSchemaAssetFilterTest.php → tests/Dbal/RegexSchemaAssetFilterTest.php b/Tests/Dbal/RegexSchemaAssetFilterTest.php → tests/Dbal/RegexSchemaAssetFilterTest.php
diff --git a/Tests/Dbal/SchemaAssetsFilterManagerTest.php → tests/Dbal/SchemaAssetsFilterManagerTest.php b/Tests/Dbal/SchemaAssetsFilterManagerTest.php → tests/Dbal/SchemaAssetsFilterManagerTest.php
diff --git a/...jection/AbstractDoctrineExtensionTest.php → ...jection/AbstractDoctrineExtensionTest.php b/...jection/AbstractDoctrineExtensionTest.php → ...jection/AbstractDoctrineExtensionTest.php
diff --git a/...n/Compiler/CacheCompatibilityPassTest.php → ...n/Compiler/CacheCompatibilityPassTest.php b/...n/Compiler/CacheCompatibilityPassTest.php → ...n/Compiler/CacheCompatibilityPassTest.php
diff --git a/...ction/Compiler/EntityListenerPassTest.php → ...ction/Compiler/EntityListenerPassTest.php b/...ction/Compiler/EntityListenerPassTest.php → ...ction/Compiler/EntityListenerPassTest.php
diff --git a/...njection/Compiler/IdGeneratorPassTest.php → ...njection/Compiler/IdGeneratorPassTest.php b/...njection/Compiler/IdGeneratorPassTest.php → ...njection/Compiler/IdGeneratorPassTest.php
diff --git a/...Injection/Compiler/MiddlewarePassTest.php → ...Injection/Compiler/MiddlewarePassTest.php b/...Injection/Compiler/MiddlewarePassTest.php → ...Injection/Compiler/MiddlewarePassTest.php
diff --git a/...piler/RemoveLoggingMiddlewarePassTest.php → ...piler/RemoveLoggingMiddlewarePassTest.php b/...piler/RemoveLoggingMiddlewarePassTest.php → ...piler/RemoveLoggingMiddlewarePassTest.php
@@ -39,7 +39,7 @@ private function createContainer(): ContainerBuilder
     {
         $container = new ContainerBuilder();
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../config'));
         $loader->load('middlewares.xml');
 
         $container->addCompilerPass(new RemoveLoggingMiddlewarePass());

diff --git a/...ndencyInjection/DoctrineExtensionTest.php → ...ndencyInjection/DoctrineExtensionTest.php b/...ndencyInjection/DoctrineExtensionTest.php → ...ndencyInjection/DoctrineExtensionTest.php
diff --git a/...s/AnnotationsBundle/AnnotationsBundle.php → ...s/AnnotationsBundle/AnnotationsBundle.php b/...s/AnnotationsBundle/AnnotationsBundle.php → ...s/AnnotationsBundle/AnnotationsBundle.php
diff --git a/...Bundles/AnnotationsBundle/Entity/Test.php → ...Bundles/AnnotationsBundle/Entity/Test.php b/...Bundles/AnnotationsBundle/Entity/Test.php → ...Bundles/AnnotationsBundle/Entity/Test.php
diff --git a/...le/Entity/TestCustomIdGeneratorEntity.php → ...le/Entity/TestCustomIdGeneratorEntity.php b/...le/Entity/TestCustomIdGeneratorEntity.php → ...le/Entity/TestCustomIdGeneratorEntity.php
diff --git a/...les/AttributesBundle/AttributesBundle.php → ...les/AttributesBundle/AttributesBundle.php b/...les/AttributesBundle/AttributesBundle.php → ...les/AttributesBundle/AttributesBundle.php
diff --git a/.../Bundles/AttributesBundle/Entity/Test.php → .../Bundles/AttributesBundle/Entity/Test.php b/.../Bundles/AttributesBundle/Entity/Test.php → .../Bundles/AttributesBundle/Entity/Test.php
diff --git a/...le/Entity/TestCustomIdGeneratorEntity.php → ...le/Entity/TestCustomIdGeneratorEntity.php b/...le/Entity/TestCustomIdGeneratorEntity.php → ...le/Entity/TestCustomIdGeneratorEntity.php
diff --git a/...NewXmlBundle/config/doctrine/Test.orm.xml → ...NewXmlBundle/config/doctrine/Test.orm.xml b/...NewXmlBundle/config/doctrine/Test.orm.xml → ...NewXmlBundle/config/doctrine/Test.orm.xml
diff --git a/.../Bundles/NewXmlBundle/src/Entity/Test.php → .../Bundles/NewXmlBundle/src/Entity/Test.php b/.../Bundles/NewXmlBundle/src/Entity/Test.php → .../Bundles/NewXmlBundle/src/Entity/Test.php
diff --git a/...Bundles/NewXmlBundle/src/NewXmlBundle.php → ...Bundles/NewXmlBundle/src/NewXmlBundle.php b/...Bundles/NewXmlBundle/src/NewXmlBundle.php → ...Bundles/NewXmlBundle/src/NewXmlBundle.php
diff --git a/...ndle/Entity/TestCustomClassRepoEntity.php → ...ndle/Entity/TestCustomClassRepoEntity.php b/...ndle/Entity/TestCustomClassRepoEntity.php → ...ndle/Entity/TestCustomClassRepoEntity.php
diff --git a/...le/Entity/TestCustomServiceRepoEntity.php → ...le/Entity/TestCustomServiceRepoEntity.php b/...le/Entity/TestCustomServiceRepoEntity.php → ...le/Entity/TestCustomServiceRepoEntity.php
diff --git a/...ceBundle/Entity/TestDefaultRepoEntity.php → ...ceBundle/Entity/TestDefaultRepoEntity.php b/...ceBundle/Entity/TestDefaultRepoEntity.php → ...ceBundle/Entity/TestDefaultRepoEntity.php
diff --git a/...ository/TestCustomClassRepoRepository.php → ...ository/TestCustomClassRepoRepository.php b/...ository/TestCustomClassRepoRepository.php → ...ository/TestCustomClassRepoRepository.php
diff --git a/...itory/TestCustomServiceRepoRepository.php → ...itory/TestCustomServiceRepoRepository.php b/...itory/TestCustomServiceRepoRepository.php → ...itory/TestCustomServiceRepoRepository.php
diff --git a/...ServiceBundle/RepositoryServiceBundle.php → ...ServiceBundle/RepositoryServiceBundle.php b/...ServiceBundle/RepositoryServiceBundle.php → ...ServiceBundle/RepositoryServiceBundle.php
diff --git a/...r/AnnotationsBundle/AnnotationsBundle.php → ...r/AnnotationsBundle/AnnotationsBundle.php b/...r/AnnotationsBundle/AnnotationsBundle.php → ...r/AnnotationsBundle/AnnotationsBundle.php
diff --git a/.../Vendor/AnnotationsBundle/Entity/Test.php → .../Vendor/AnnotationsBundle/Entity/Test.php b/.../Vendor/AnnotationsBundle/Entity/Test.php → .../Vendor/AnnotationsBundle/Entity/Test.php
diff --git a/...ixtures/Bundles/XmlBundle/Entity/Test.php → ...ixtures/Bundles/XmlBundle/Entity/Test.php b/...ixtures/Bundles/XmlBundle/Entity/Test.php → ...ixtures/Bundles/XmlBundle/Entity/Test.php
diff --git a/...le/Resources/config/doctrine/Test.orm.xml → ...le/Resources/config/doctrine/Test.orm.xml b/...le/Resources/config/doctrine/Test.orm.xml → ...le/Resources/config/doctrine/Test.orm.xml
diff --git a/.../Fixtures/Bundles/XmlBundle/XmlBundle.php → .../Fixtures/Bundles/XmlBundle/XmlBundle.php b/.../Fixtures/Bundles/XmlBundle/XmlBundle.php → .../Fixtures/Bundles/XmlBundle/XmlBundle.php
diff --git a/...xtures/Bundles/YamlBundle/Entity/Test.php → ...xtures/Bundles/YamlBundle/Entity/Test.php b/...xtures/Bundles/YamlBundle/Entity/Test.php → ...xtures/Bundles/YamlBundle/Entity/Test.php
diff --git a/...le/Resources/config/doctrine/Test.orm.yml → ...le/Resources/config/doctrine/Test.orm.yml b/...le/Resources/config/doctrine/Test.orm.yml → ...le/Resources/config/doctrine/Test.orm.yml
diff --git a/...ixtures/Bundles/YamlBundle/YamlBundle.php → ...ixtures/Bundles/YamlBundle/YamlBundle.php b/...ixtures/Bundles/YamlBundle/YamlBundle.php → ...ixtures/Bundles/YamlBundle/YamlBundle.php
diff --git a/...s/CustomEntityListenerServiceResolver.php → ...s/CustomEntityListenerServiceResolver.php b/...s/CustomEntityListenerServiceResolver.php → ...s/CustomEntityListenerServiceResolver.php
diff --git a/...yInjection/Fixtures/CustomIdGenerator.php → ...yInjection/Fixtures/CustomIdGenerator.php b/...yInjection/Fixtures/CustomIdGenerator.php → ...yInjection/Fixtures/CustomIdGenerator.php
diff --git a/...encyInjection/Fixtures/DbalTestKernel.php → ...encyInjection/Fixtures/DbalTestKernel.php b/...encyInjection/Fixtures/DbalTestKernel.php → ...encyInjection/Fixtures/DbalTestKernel.php
diff --git a/...tion/Fixtures/InvokableEntityListener.php → ...tion/Fixtures/InvokableEntityListener.php b/...tion/Fixtures/InvokableEntityListener.php → ...tion/Fixtures/InvokableEntityListener.php
diff --git a/...Injection/Fixtures/Php8EntityListener.php → ...Injection/Fixtures/Php8EntityListener.php b/...Injection/Fixtures/Php8EntityListener.php → ...Injection/Fixtures/Php8EntityListener.php
diff --git a/...yInjection/Fixtures/Php8EventListener.php → ...yInjection/Fixtures/Php8EventListener.php b/...yInjection/Fixtures/Php8EventListener.php → ...yInjection/Fixtures/Php8EventListener.php
diff --git a/...pendencyInjection/Fixtures/TestKernel.php → ...pendencyInjection/Fixtures/TestKernel.php b/...pendencyInjection/Fixtures/TestKernel.php → ...pendencyInjection/Fixtures/TestKernel.php
diff --git a/...g/xml/dbal_allow_partial_url_override.xml → ...g/xml/dbal_allow_partial_url_override.xml b/...g/xml/dbal_allow_partial_url_override.xml → ...g/xml/dbal_allow_partial_url_override.xml
diff --git a/...es/config/xml/dbal_allow_url_override.xml → ...es/config/xml/dbal_allow_url_override.xml b/...es/config/xml/dbal_allow_url_override.xml → ...es/config/xml/dbal_allow_url_override.xml
diff --git a/.../Fixtures/config/xml/dbal_auto_commit.xml → .../Fixtures/config/xml/dbal_auto_commit.xml b/.../Fixtures/config/xml/dbal_auto_commit.xml → .../Fixtures/config/xml/dbal_auto_commit.xml
diff --git a/...ml/dbal_collect_schema_errors_disable.xml → ...ml/dbal_collect_schema_errors_disable.xml b/...ml/dbal_collect_schema_errors_disable.xml → ...ml/dbal_collect_schema_errors_disable.xml
diff --git a/...ct_schema_errors_disable_no_profiling.xml → ...ct_schema_errors_disable_no_profiling.xml b/...ct_schema_errors_disable_no_profiling.xml → ...ct_schema_errors_disable_no_profiling.xml
diff --git a/...xml/dbal_collect_schema_errors_enable.xml → ...xml/dbal_collect_schema_errors_enable.xml b/...xml/dbal_collect_schema_errors_enable.xml → ...xml/dbal_collect_schema_errors_enable.xml
diff --git a/...ixtures/config/xml/dbal_dbname_suffix.xml → ...ixtures/config/xml/dbal_dbname_suffix.xml b/...ixtures/config/xml/dbal_dbname_suffix.xml → ...ixtures/config/xml/dbal_dbname_suffix.xml
diff --git a/...config/xml/dbal_disable_type_comments.xml → ...config/xml/dbal_disable_type_comments.xml b/...config/xml/dbal_disable_type_comments.xml → ...config/xml/dbal_disable_type_comments.xml
diff --git a/...xtures/config/xml/dbal_driver_schemes.xml → ...xtures/config/xml/dbal_driver_schemes.xml b/...xtures/config/xml/dbal_driver_schemes.xml → ...xtures/config/xml/dbal_driver_schemes.xml
diff --git a/...tion/Fixtures/config/xml/dbal_logging.xml → ...tion/Fixtures/config/xml/dbal_logging.xml b/...tion/Fixtures/config/xml/dbal_logging.xml → ...tion/Fixtures/config/xml/dbal_logging.xml
diff --git a/.../config/xml/dbal_oracle_connectstring.xml → .../config/xml/dbal_oracle_connectstring.xml b/.../config/xml/dbal_oracle_connectstring.xml → .../config/xml/dbal_oracle_connectstring.xml
diff --git a/...s/config/xml/dbal_oracle_instancename.xml → ...s/config/xml/dbal_oracle_instancename.xml b/...s/config/xml/dbal_oracle_instancename.xml → ...s/config/xml/dbal_oracle_instancename.xml
diff --git a/...Fixtures/config/xml/dbal_result_cache.xml → ...Fixtures/config/xml/dbal_result_cache.xml b/...Fixtures/config/xml/dbal_result_cache.xml → ...Fixtures/config/xml/dbal_result_cache.xml
diff --git a/...n/Fixtures/config/xml/dbal_savepoints.xml → ...n/Fixtures/config/xml/dbal_savepoints.xml b/...n/Fixtures/config/xml/dbal_savepoints.xml → ...n/Fixtures/config/xml/dbal_savepoints.xml
diff --git a/...ixtures/config/xml/dbal_schema_filter.xml → ...ixtures/config/xml/dbal_schema_filter.xml b/...ixtures/config/xml/dbal_schema_filter.xml → ...ixtures/config/xml/dbal_schema_filter.xml
diff --git a/...onfig/xml/dbal_schema_manager_factory.xml → ...onfig/xml/dbal_schema_manager_factory.xml b/...onfig/xml/dbal_schema_manager_factory.xml → ...onfig/xml/dbal_schema_manager_factory.xml
diff --git a/...xml/dbal_service_multiple_connections.xml → ...xml/dbal_service_multiple_connections.xml b/...xml/dbal_service_multiple_connections.xml → ...xml/dbal_service_multiple_connections.xml
diff --git a/...ig/xml/dbal_service_single_connection.xml → ...ig/xml/dbal_service_single_connection.xml b/...ig/xml/dbal_service_single_connection.xml → ...ig/xml/dbal_service_single_connection.xml
diff --git a/...ice_single_primary_replica_connection.xml → ...ice_single_primary_replica_connection.xml b/...ice_single_primary_replica_connection.xml → ...ice_single_primary_replica_connection.xml
diff --git a/...ection/Fixtures/config/xml/dbal_types.xml → ...ection/Fixtures/config/xml/dbal_types.xml b/...ection/Fixtures/config/xml/dbal_types.xml → ...ection/Fixtures/config/xml/dbal_types.xml
diff --git a/...config/xml/orm_attach_entity_listener.xml → ...config/xml/orm_attach_entity_listener.xml b/...config/xml/orm_attach_entity_listener.xml → ...config/xml/orm_attach_entity_listener.xml
diff --git a/...ig/xml/orm_attach_entity_listener_tag.xml → ...ig/xml/orm_attach_entity_listener_tag.xml b/...ig/xml/orm_attach_entity_listener_tag.xml → ...ig/xml/orm_attach_entity_listener_tag.xml
diff --git a/...tach_entity_listeners_two_connections.xml → ...tach_entity_listeners_two_connections.xml b/...tach_entity_listeners_two_connections.xml → ...tach_entity_listeners_two_connections.xml
diff --git a/...g/xml/orm_attach_lazy_entity_listener.xml → ...g/xml/orm_attach_lazy_entity_listener.xml b/...g/xml/orm_attach_lazy_entity_listener.xml → ...g/xml/orm_attach_lazy_entity_listener.xml
diff --git a/...ection/Fixtures/config/xml/orm_caches.xml → ...ection/Fixtures/config/xml/orm_caches.xml b/...ection/Fixtures/config/xml/orm_caches.xml → ...ection/Fixtures/config/xml/orm_caches.xml
diff --git a/...nfig/xml/orm_entity_listener_abstract.xml → ...nfig/xml/orm_entity_listener_abstract.xml b/...nfig/xml/orm_entity_listener_abstract.xml → ...nfig/xml/orm_entity_listener_abstract.xml
diff --git a/...l/orm_entity_listener_custom_resolver.xml → ...l/orm_entity_listener_custom_resolver.xml b/...l/orm_entity_listener_custom_resolver.xml → ...l/orm_entity_listener_custom_resolver.xml
diff --git a/.../xml/orm_entity_listener_lazy_private.xml → .../xml/orm_entity_listener_lazy_private.xml b/.../xml/orm_entity_listener_lazy_private.xml → .../xml/orm_entity_listener_lazy_private.xml
diff --git a/...tener_lazy_resolver_without_interface.xml → ...tener_lazy_resolver_without_interface.xml b/...tener_lazy_resolver_without_interface.xml → ...tener_lazy_resolver_without_interface.xml
diff --git a/...nfig/xml/orm_entity_listener_resolver.xml → ...nfig/xml/orm_entity_listener_resolver.xml b/...nfig/xml/orm_entity_listener_resolver.xml → ...nfig/xml/orm_entity_listener_resolver.xml
diff --git a/...ction/Fixtures/config/xml/orm_filters.xml → ...ction/Fixtures/config/xml/orm_filters.xml b/...ction/Fixtures/config/xml/orm_filters.xml → ...ction/Fixtures/config/xml/orm_filters.xml
diff --git a/...ion/Fixtures/config/xml/orm_functions.xml → ...ion/Fixtures/config/xml/orm_functions.xml b/...ion/Fixtures/config/xml/orm_functions.xml → ...ion/Fixtures/config/xml/orm_functions.xml
diff --git a/...ixtures/config/xml/orm_hydration_mode.xml → ...ixtures/config/xml/orm_hydration_mode.xml b/...ixtures/config/xml/orm_hydration_mode.xml → ...ixtures/config/xml/orm_hydration_mode.xml
diff --git a/...ction/Fixtures/config/xml/orm_imports.xml → ...ction/Fixtures/config/xml/orm_imports.xml b/...ction/Fixtures/config/xml/orm_imports.xml → ...ction/Fixtures/config/xml/orm_imports.xml
diff --git a/...ixtures/config/xml/orm_imports_import.xml → ...ixtures/config/xml/orm_imports_import.xml b/...ixtures/config/xml/orm_imports_import.xml → ...ixtures/config/xml/orm_imports_import.xml
diff --git a/...g/xml/orm_multiple_em_bundle_mappings.xml → ...g/xml/orm_multiple_em_bundle_mappings.xml b/...g/xml/orm_multiple_em_bundle_mappings.xml → ...g/xml/orm_multiple_em_bundle_mappings.xml
@@ -19,7 +19,7 @@
             <entity-manager name="em2" validate-xml-mapping="true">
                 <mapping name="YamlBundle" dir="Resources/config/doctrine" alias="yml" />
                 <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                    dir="%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                    dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                     alias="TestAlias"
                 />
             </entity-manager>

diff --git a/...ixtures/config/xml/orm_namingstrategy.xml → ...ixtures/config/xml/orm_namingstrategy.xml b/...ixtures/config/xml/orm_namingstrategy.xml → ...ixtures/config/xml/orm_namingstrategy.xml
diff --git a/...Fixtures/config/xml/orm_no_lazy_ghost.xml → ...Fixtures/config/xml/orm_no_lazy_ghost.xml b/...Fixtures/config/xml/orm_no_lazy_ghost.xml → ...Fixtures/config/xml/orm_no_lazy_ghost.xml
diff --git a/...tures/config/xml/orm_no_report_fields.xml → ...tures/config/xml/orm_no_report_fields.xml b/...tures/config/xml/orm_no_report_fields.xml → ...tures/config/xml/orm_no_report_fields.xml
diff --git a/...jection/Fixtures/config/xml/orm_proxy.xml → ...jection/Fixtures/config/xml/orm_proxy.xml b/...jection/Fixtures/config/xml/orm_proxy.xml → ...jection/Fixtures/config/xml/orm_proxy.xml
diff --git a/...Fixtures/config/xml/orm_quotestrategy.xml → ...Fixtures/config/xml/orm_quotestrategy.xml b/...Fixtures/config/xml/orm_quotestrategy.xml → ...Fixtures/config/xml/orm_quotestrategy.xml
diff --git a/...res/config/xml/orm_repository_factory.xml → ...res/config/xml/orm_repository_factory.xml b/...res/config/xml/orm_repository_factory.xml → ...res/config/xml/orm_repository_factory.xml
diff --git a/.../config/xml/orm_resolve_target_entity.xml → .../config/xml/orm_resolve_target_entity.xml b/.../config/xml/orm_resolve_target_entity.xml → .../config/xml/orm_resolve_target_entity.xml
diff --git a/.../config/xml/orm_schema_ignore_classes.xml → .../config/xml/orm_schema_ignore_classes.xml b/.../config/xml/orm_schema_ignore_classes.xml → .../config/xml/orm_schema_ignore_classes.xml
diff --git a/...res/config/xml/orm_second_level_cache.xml → ...res/config/xml/orm_second_level_cache.xml b/...res/config/xml/orm_second_level_cache.xml → ...res/config/xml/orm_second_level_cache.xml
diff --git a/.../orm_service_multiple_entity_managers.xml → .../orm_service_multiple_entity_managers.xml b/.../orm_service_multiple_entity_managers.xml → .../orm_service_multiple_entity_managers.xml
diff --git a/..._service_simple_single_entity_manager.xml → ..._service_simple_single_entity_manager.xml b/..._service_simple_single_entity_manager.xml → ..._service_simple_single_entity_manager.xml
diff --git a/..._single_entity_manager_without_dbname.xml → ..._single_entity_manager_without_dbname.xml b/..._single_entity_manager_without_dbname.xml → ..._single_entity_manager_without_dbname.xml
diff --git a/...xml/orm_service_single_entity_manager.xml → ...xml/orm_service_single_entity_manager.xml b/...xml/orm_service_single_entity_manager.xml → ...xml/orm_service_single_entity_manager.xml
diff --git a/...fig/xml/orm_single_em_bundle_mappings.xml → ...fig/xml/orm_single_em_bundle_mappings.xml b/...fig/xml/orm_single_em_bundle_mappings.xml → ...fig/xml/orm_single_em_bundle_mappings.xml
@@ -16,7 +16,7 @@
             <mapping name="AttributesBundle" type="attribute" />
             <mapping name="YamlBundle" dir="Resources/config/doctrine" alias="yml" />
             <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                dir="%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                 alias="TestAlias"
             />
         </orm>

diff --git a/...l/orm_single_em_default_table_options.xml → ...l/orm_single_em_default_table_options.xml b/...l/orm_single_em_default_table_options.xml → ...l/orm_single_em_default_table_options.xml
@@ -20,7 +20,7 @@
             <mapping name="AttributesBundle" type="attribute" />
             <mapping name="YamlBundle" dir="Resources/config/doctrine" alias="yml" />
             <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                dir="%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                 alias="TestAlias"
             />
         </orm>

diff --git a/...onfig/xml/orm_single_em_dql_functions.xml → ...onfig/xml/orm_single_em_dql_functions.xml b/...onfig/xml/orm_single_em_dql_functions.xml → ...onfig/xml/orm_single_em_dql_functions.xml
diff --git a/..._schema_filter_default_tables_session.xml → ..._schema_filter_default_tables_session.xml b/..._schema_filter_default_tables_session.xml → ..._schema_filter_default_tables_session.xml
diff --git a/...hema_filter_overridden_tables_session.xml → ...hema_filter_overridden_tables_session.xml b/...hema_filter_overridden_tables_session.xml → ...hema_filter_overridden_tables_session.xml
diff --git a/...g/yml/dbal_allow_partial_url_override.yml → ...g/yml/dbal_allow_partial_url_override.yml b/...g/yml/dbal_allow_partial_url_override.yml → ...g/yml/dbal_allow_partial_url_override.yml
diff --git a/...es/config/yml/dbal_allow_url_override.yml → ...es/config/yml/dbal_allow_url_override.yml b/...es/config/yml/dbal_allow_url_override.yml → ...es/config/yml/dbal_allow_url_override.yml
diff --git a/.../Fixtures/config/yml/dbal_auto_commit.yml → .../Fixtures/config/yml/dbal_auto_commit.yml b/.../Fixtures/config/yml/dbal_auto_commit.yml → .../Fixtures/config/yml/dbal_auto_commit.yml
diff --git a/...ml/dbal_collect_schema_errors_disable.yml → ...ml/dbal_collect_schema_errors_disable.yml b/...ml/dbal_collect_schema_errors_disable.yml → ...ml/dbal_collect_schema_errors_disable.yml
diff --git a/...ct_schema_errors_disable_no_profiling.yml → ...ct_schema_errors_disable_no_profiling.yml b/...ct_schema_errors_disable_no_profiling.yml → ...ct_schema_errors_disable_no_profiling.yml
diff --git a/...yml/dbal_collect_schema_errors_enable.yml → ...yml/dbal_collect_schema_errors_enable.yml b/...yml/dbal_collect_schema_errors_enable.yml → ...yml/dbal_collect_schema_errors_enable.yml
diff --git a/...ixtures/config/yml/dbal_dbname_suffix.yml → ...ixtures/config/yml/dbal_dbname_suffix.yml b/...ixtures/config/yml/dbal_dbname_suffix.yml → ...ixtures/config/yml/dbal_dbname_suffix.yml
diff --git a/...config/yml/dbal_disable_type_comments.yml → ...config/yml/dbal_disable_type_comments.yml b/...config/yml/dbal_disable_type_comments.yml → ...config/yml/dbal_disable_type_comments.yml
diff --git a/...xtures/config/yml/dbal_driver_schemes.yml → ...xtures/config/yml/dbal_driver_schemes.yml b/...xtures/config/yml/dbal_driver_schemes.yml → ...xtures/config/yml/dbal_driver_schemes.yml
diff --git a/...tion/Fixtures/config/yml/dbal_logging.yml → ...tion/Fixtures/config/yml/dbal_logging.yml b/...tion/Fixtures/config/yml/dbal_logging.yml → ...tion/Fixtures/config/yml/dbal_logging.yml
diff --git a/.../config/yml/dbal_oracle_connectstring.yml → .../config/yml/dbal_oracle_connectstring.yml b/.../config/yml/dbal_oracle_connectstring.yml → .../config/yml/dbal_oracle_connectstring.yml
diff --git a/...s/config/yml/dbal_oracle_instancename.yml → ...s/config/yml/dbal_oracle_instancename.yml b/...s/config/yml/dbal_oracle_instancename.yml → ...s/config/yml/dbal_oracle_instancename.yml
diff --git a/...Fixtures/config/yml/dbal_result_cache.yml → ...Fixtures/config/yml/dbal_result_cache.yml b/...Fixtures/config/yml/dbal_result_cache.yml → ...Fixtures/config/yml/dbal_result_cache.yml
diff --git a/...n/Fixtures/config/yml/dbal_savepoints.yml → ...n/Fixtures/config/yml/dbal_savepoints.yml b/...n/Fixtures/config/yml/dbal_savepoints.yml → ...n/Fixtures/config/yml/dbal_savepoints.yml
diff --git a/...ixtures/config/yml/dbal_schema_filter.yml → ...ixtures/config/yml/dbal_schema_filter.yml b/...ixtures/config/yml/dbal_schema_filter.yml → ...ixtures/config/yml/dbal_schema_filter.yml
diff --git a/...onfig/yml/dbal_schema_manager_factory.yml → ...onfig/yml/dbal_schema_manager_factory.yml b/...onfig/yml/dbal_schema_manager_factory.yml → ...onfig/yml/dbal_schema_manager_factory.yml
diff --git a/...yml/dbal_service_multiple_connections.yml → ...yml/dbal_service_multiple_connections.yml b/...yml/dbal_service_multiple_connections.yml → ...yml/dbal_service_multiple_connections.yml
diff --git a/...ig/yml/dbal_service_single_connection.yml → ...ig/yml/dbal_service_single_connection.yml b/...ig/yml/dbal_service_single_connection.yml → ...ig/yml/dbal_service_single_connection.yml
diff --git a/...ice_single_primary_replica_connection.yml → ...ice_single_primary_replica_connection.yml b/...ice_single_primary_replica_connection.yml → ...ice_single_primary_replica_connection.yml
diff --git a/...ection/Fixtures/config/yml/dbal_types.yml → ...ection/Fixtures/config/yml/dbal_types.yml b/...ection/Fixtures/config/yml/dbal_types.yml → ...ection/Fixtures/config/yml/dbal_types.yml
diff --git a/...config/yml/orm_attach_entity_listener.yml → ...config/yml/orm_attach_entity_listener.yml b/...config/yml/orm_attach_entity_listener.yml → ...config/yml/orm_attach_entity_listener.yml
diff --git a/...ig/yml/orm_attach_entity_listener_tag.yml → ...ig/yml/orm_attach_entity_listener_tag.yml b/...ig/yml/orm_attach_entity_listener_tag.yml → ...ig/yml/orm_attach_entity_listener_tag.yml
diff --git a/...tach_entity_listeners_two_connections.yml → ...tach_entity_listeners_two_connections.yml b/...tach_entity_listeners_two_connections.yml → ...tach_entity_listeners_two_connections.yml
diff --git a/...g/yml/orm_attach_lazy_entity_listener.yml → ...g/yml/orm_attach_lazy_entity_listener.yml b/...g/yml/orm_attach_lazy_entity_listener.yml → ...g/yml/orm_attach_lazy_entity_listener.yml
diff --git a/...ection/Fixtures/config/yml/orm_caches.yml → ...ection/Fixtures/config/yml/orm_caches.yml b/...ection/Fixtures/config/yml/orm_caches.yml → ...ection/Fixtures/config/yml/orm_caches.yml
diff --git a/...nfig/yml/orm_entity_listener_abstract.yml → ...nfig/yml/orm_entity_listener_abstract.yml b/...nfig/yml/orm_entity_listener_abstract.yml → ...nfig/yml/orm_entity_listener_abstract.yml
diff --git a/...l/orm_entity_listener_custom_resolver.yml → ...l/orm_entity_listener_custom_resolver.yml b/...l/orm_entity_listener_custom_resolver.yml → ...l/orm_entity_listener_custom_resolver.yml
diff --git a/.../yml/orm_entity_listener_lazy_private.yml → .../yml/orm_entity_listener_lazy_private.yml b/.../yml/orm_entity_listener_lazy_private.yml → .../yml/orm_entity_listener_lazy_private.yml
diff --git a/...tener_lazy_resolver_without_interface.yml → ...tener_lazy_resolver_without_interface.yml b/...tener_lazy_resolver_without_interface.yml → ...tener_lazy_resolver_without_interface.yml
diff --git a/...nfig/yml/orm_entity_listener_resolver.yml → ...nfig/yml/orm_entity_listener_resolver.yml b/...nfig/yml/orm_entity_listener_resolver.yml → ...nfig/yml/orm_entity_listener_resolver.yml
diff --git a/...ction/Fixtures/config/yml/orm_filters.yml → ...ction/Fixtures/config/yml/orm_filters.yml b/...ction/Fixtures/config/yml/orm_filters.yml → ...ction/Fixtures/config/yml/orm_filters.yml
diff --git a/...ion/Fixtures/config/yml/orm_functions.yml → ...ion/Fixtures/config/yml/orm_functions.yml b/...ion/Fixtures/config/yml/orm_functions.yml → ...ion/Fixtures/config/yml/orm_functions.yml
diff --git a/...ixtures/config/yml/orm_hydration_mode.yml → ...ixtures/config/yml/orm_hydration_mode.yml b/...ixtures/config/yml/orm_hydration_mode.yml → ...ixtures/config/yml/orm_hydration_mode.yml
diff --git a/...ction/Fixtures/config/yml/orm_imports.yml → ...ction/Fixtures/config/yml/orm_imports.yml b/...ction/Fixtures/config/yml/orm_imports.yml → ...ction/Fixtures/config/yml/orm_imports.yml
diff --git a/...ixtures/config/yml/orm_imports_import.yml → ...ixtures/config/yml/orm_imports_import.yml b/...ixtures/config/yml/orm_imports_import.yml → ...ixtures/config/yml/orm_imports_import.yml
diff --git a/...g/yml/orm_multiple_em_bundle_mappings.yml → ...g/yml/orm_multiple_em_bundle_mappings.yml b/...g/yml/orm_multiple_em_bundle_mappings.yml → ...g/yml/orm_multiple_em_bundle_mappings.yml
@@ -22,5 +22,5 @@ doctrine:
                     manual:
                         type: xml
                         prefix: Fixtures\Bundles\XmlBundle
-                        dir: "%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                        dir: "%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                         alias: TestAlias
diff --git a/...ixtures/config/yml/orm_namingstrategy.yml → ...ixtures/config/yml/orm_namingstrategy.yml b/...ixtures/config/yml/orm_namingstrategy.yml → ...ixtures/config/yml/orm_namingstrategy.yml
diff --git a/...Fixtures/config/yml/orm_no_lazy_ghost.yml → ...Fixtures/config/yml/orm_no_lazy_ghost.yml b/...Fixtures/config/yml/orm_no_lazy_ghost.yml → ...Fixtures/config/yml/orm_no_lazy_ghost.yml
diff --git a/...tures/config/yml/orm_no_report_fields.yml → ...tures/config/yml/orm_no_report_fields.yml b/...tures/config/yml/orm_no_report_fields.yml → ...tures/config/yml/orm_no_report_fields.yml
diff --git a/...Fixtures/config/yml/orm_quotestrategy.yml → ...Fixtures/config/yml/orm_quotestrategy.yml b/...Fixtures/config/yml/orm_quotestrategy.yml → ...Fixtures/config/yml/orm_quotestrategy.yml
diff --git a/...res/config/yml/orm_repository_factory.yml → ...res/config/yml/orm_repository_factory.yml b/...res/config/yml/orm_repository_factory.yml → ...res/config/yml/orm_repository_factory.yml
diff --git a/.../config/yml/orm_resolve_target_entity.yml → .../config/yml/orm_resolve_target_entity.yml b/.../config/yml/orm_resolve_target_entity.yml → .../config/yml/orm_resolve_target_entity.yml
diff --git a/.../config/yml/orm_schema_ignore_classes.yml → .../config/yml/orm_schema_ignore_classes.yml b/.../config/yml/orm_schema_ignore_classes.yml → .../config/yml/orm_schema_ignore_classes.yml
diff --git a/...res/config/yml/orm_second_level_cache.yml → ...res/config/yml/orm_second_level_cache.yml b/...res/config/yml/orm_second_level_cache.yml → ...res/config/yml/orm_second_level_cache.yml
diff --git a/.../orm_service_multiple_entity_managers.yml → .../orm_service_multiple_entity_managers.yml b/.../orm_service_multiple_entity_managers.yml → .../orm_service_multiple_entity_managers.yml
diff --git a/..._service_simple_single_entity_manager.yml → ..._service_simple_single_entity_manager.yml b/..._service_simple_single_entity_manager.yml → ..._service_simple_single_entity_manager.yml
diff --git a/..._single_entity_manager_without_dbname.yml → ..._single_entity_manager_without_dbname.yml b/..._single_entity_manager_without_dbname.yml → ..._single_entity_manager_without_dbname.yml
diff --git a/...yml/orm_service_single_entity_manager.yml → ...yml/orm_service_single_entity_manager.yml b/...yml/orm_service_single_entity_manager.yml → ...yml/orm_service_single_entity_manager.yml
diff --git a/...fig/yml/orm_single_em_bundle_mappings.yml → ...fig/yml/orm_single_em_bundle_mappings.yml b/...fig/yml/orm_single_em_bundle_mappings.yml → ...fig/yml/orm_single_em_bundle_mappings.yml
@@ -17,5 +17,5 @@ doctrine:
             manual:
                 type: xml
                 prefix: Fixtures\Bundles\XmlBundle
-                dir: "%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                dir: "%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                 alias: TestAlias
diff --git a/...l/orm_single_em_default_table_options.yml → ...l/orm_single_em_default_table_options.yml b/...l/orm_single_em_default_table_options.yml → ...l/orm_single_em_default_table_options.yml
@@ -19,5 +19,5 @@ doctrine:
             manual:
                 type: xml
                 prefix: Fixtures\Bundles\XmlBundle
-                dir: "%kernel.root_dir%/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
+                dir: "%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
                 alias: TestAlias
diff --git a/...onfig/yml/orm_single_em_dql_functions.yml → ...onfig/yml/orm_single_em_dql_functions.yml b/...onfig/yml/orm_single_em_dql_functions.yml → ...onfig/yml/orm_single_em_dql_functions.yml
diff --git a/..._schema_filter_default_tables_session.yml → ..._schema_filter_default_tables_session.yml b/..._schema_filter_default_tables_session.yml → ..._schema_filter_default_tables_session.yml
diff --git a/...hema_filter_overridden_tables_session.yml → ...hema_filter_overridden_tables_session.yml b/...hema_filter_overridden_tables_session.yml → ...hema_filter_overridden_tables_session.yml
diff --git a/...endencyInjection/TestDatetimeFunction.php → ...endencyInjection/TestDatetimeFunction.php b/...endencyInjection/TestDatetimeFunction.php → ...endencyInjection/TestDatetimeFunction.php
diff --git a/Tests/DependencyInjection/TestFilter.php → tests/DependencyInjection/TestFilter.php b/Tests/DependencyInjection/TestFilter.php → tests/DependencyInjection/TestFilter.php
diff --git a/...pendencyInjection/TestNumericFunction.php → ...pendencyInjection/TestNumericFunction.php b/...pendencyInjection/TestNumericFunction.php → ...pendencyInjection/TestNumericFunction.php
diff --git a/...ependencyInjection/TestStringFunction.php → ...ependencyInjection/TestStringFunction.php b/...ependencyInjection/TestStringFunction.php → ...ependencyInjection/TestStringFunction.php
diff --git a/Tests/DependencyInjection/TestType.php → tests/DependencyInjection/TestType.php b/Tests/DependencyInjection/TestType.php → tests/DependencyInjection/TestType.php
diff --git a/Tests/DependencyInjection/XMLSchemaTest.php → tests/DependencyInjection/XMLSchemaTest.php b/Tests/DependencyInjection/XMLSchemaTest.php → tests/DependencyInjection/XMLSchemaTest.php
@@ -43,7 +43,7 @@ public function testValidateSchema(string $file): void
             $configNode->appendChild($dbalNode);
             $dbalDom->appendChild($configNode);
 
-            $ret = $dbalDom->schemaValidate(__DIR__ . '/../../Resources/config/schema/doctrine-1.0.xsd');
+            $ret = $dbalDom->schemaValidate(__DIR__ . '/../../config/schema/doctrine-1.0.xsd');
             $this->assertTrue($ret, 'DoctrineBundle Dependency Injection XMLSchema did not validate this XML instance.');
             $found = true;
         }
@@ -56,7 +56,7 @@ public function testValidateSchema(string $file): void
             $configNode->appendChild($ormNode);
             $ormDom->appendChild($configNode);
 
-            $ret = $ormDom->schemaValidate(__DIR__ . '/../../Resources/config/schema/doctrine-1.0.xsd');
+            $ret = $ormDom->schemaValidate(__DIR__ . '/../../config/schema/doctrine-1.0.xsd');
             $this->assertTrue($ret, 'DoctrineBundle Dependency Injection XMLSchema did not validate this XML instance.');
             $found = true;
         }

diff --git a/...ncyInjection/XmlDoctrineExtensionTest.php → ...ncyInjection/XmlDoctrineExtensionTest.php b/...ncyInjection/XmlDoctrineExtensionTest.php → ...ncyInjection/XmlDoctrineExtensionTest.php
diff --git a/...cyInjection/YamlDoctrineExtensionTest.php → ...cyInjection/YamlDoctrineExtensionTest.php b/...cyInjection/YamlDoctrineExtensionTest.php → ...cyInjection/YamlDoctrineExtensionTest.php
diff --git a/Tests/LazyLoadingEntityManagerInterface.php → tests/LazyLoadingEntityManagerInterface.php b/Tests/LazyLoadingEntityManagerInterface.php → tests/LazyLoadingEntityManagerInterface.php
diff --git a/Tests/LazyObjectEntityManagerInterface.php → tests/LazyObjectEntityManagerInterface.php b/Tests/LazyObjectEntityManagerInterface.php → tests/LazyObjectEntityManagerInterface.php
diff --git a/Tests/LockStoreSchemaListenerTest.php → tests/LockStoreSchemaListenerTest.php b/Tests/LockStoreSchemaListenerTest.php → tests/LockStoreSchemaListenerTest.php
diff --git a/...g/ContainerEntityListenerResolverTest.php → ...g/ContainerEntityListenerResolverTest.php b/...g/ContainerEntityListenerResolverTest.php → ...g/ContainerEntityListenerResolverTest.php
diff --git a/...pping/DisconnectedMetadataFactoryTest.php → ...pping/DisconnectedMetadataFactoryTest.php b/...pping/DisconnectedMetadataFactoryTest.php → ...pping/DisconnectedMetadataFactoryTest.php
diff --git a/...ddleware/BacktraceDebugDataHolderTest.php → ...ddleware/BacktraceDebugDataHolderTest.php b/...ddleware/BacktraceDebugDataHolderTest.php → ...ddleware/BacktraceDebugDataHolderTest.php
diff --git a/Tests/Middleware/DebugMiddlewareTest.php → tests/Middleware/DebugMiddlewareTest.php b/Tests/Middleware/DebugMiddlewareTest.php → tests/Middleware/DebugMiddlewareTest.php
diff --git a/Tests/ProfilerTest.php → tests/ProfilerTest.php b/Tests/ProfilerTest.php → tests/ProfilerTest.php
@@ -50,7 +50,7 @@ public function setUp(): void
         $registry->method('getManagers')->willReturn([]);
         $this->collector = new DoctrineDataCollector($registry, true, $this->debugDataHolder);
 
-        $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../Resources/views/Collector');
+        $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../templates/Collector');
         $twigLoaderFilesystem->addPath(__DIR__ . '/../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler');
         $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
 

diff --git a/Tests/RegistryTest.php → tests/RegistryTest.php b/Tests/RegistryTest.php → tests/RegistryTest.php
diff --git a/...sitory/ContainerRepositoryFactoryTest.php → ...sitory/ContainerRepositoryFactoryTest.php b/...sitory/ContainerRepositoryFactoryTest.php → ...sitory/ContainerRepositoryFactoryTest.php
diff --git a/Tests/Repository/Fixtures/StubRepository.php → tests/Repository/Fixtures/StubRepository.php b/Tests/Repository/Fixtures/StubRepository.php → tests/Repository/Fixtures/StubRepository.php
diff --git a/...sitory/Fixtures/StubServiceRepository.php → ...sitory/Fixtures/StubServiceRepository.php b/...sitory/Fixtures/StubServiceRepository.php → ...sitory/Fixtures/StubServiceRepository.php
diff --git a/...epository/ServiceEntityRepositoryTest.php → ...epository/ServiceEntityRepositoryTest.php b/...epository/ServiceEntityRepositoryTest.php → ...epository/ServiceEntityRepositoryTest.php
diff --git a/Tests/ServiceRepositoryTest.php → tests/ServiceRepositoryTest.php b/Tests/ServiceRepositoryTest.php → tests/ServiceRepositoryTest.php
diff --git a/Tests/TestCase.php → tests/TestCase.php b/Tests/TestCase.php → tests/TestCase.php
diff --git a/Tests/TestCaseAllPublicCompilerPass.php → tests/TestCaseAllPublicCompilerPass.php b/Tests/TestCaseAllPublicCompilerPass.php → tests/TestCaseAllPublicCompilerPass.php
diff --git a/Tests/Twig/DoctrineExtensionTest.php → tests/Twig/DoctrineExtensionTest.php b/Tests/Twig/DoctrineExtensionTest.php → tests/Twig/DoctrineExtensionTest.php
diff --git a/Tests/UrlOverrideTest.php → tests/UrlOverrideTest.php b/Tests/UrlOverrideTest.php → tests/UrlOverrideTest.php
diff --git a/Tests/bootstrap.php → tests/bootstrap.php b/Tests/bootstrap.php → tests/bootstrap.php