diff --git a/.doctrine-project.json b/.doctrine-project.json
index 73ba9db54..3dacd1753 100644
--- a/.doctrine-project.json
+++ b/.doctrine-project.json
@@ -5,22 +5,40 @@
   "slug": "doctrine-bundle",
   "versions": [
     {
-      "name": "3.0",
-      "branchName": "3.0.x",
+      "name": "4.0",
+      "branchName": "4.0.x",
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "3.1",
+      "branchName": "3.1.x",
+      "slug": "3.1",
+      "upcoming": true
+    },
+    {
+      "name": "3.0",
+      "branchName": "3.0.x",
+      "slug": "3.0",
+      "current": true
+    },
+    {
+      "name": "2.19",
+      "branchName": "2.19.x",
+      "slug": "2.19",
+      "maintained": true
+    },
     {
       "name": "2.18",
       "branchName": "2.18.x",
       "slug": "2.18",
-      "upcoming": true
+      "maintained": true
     },
     {
       "name": "2.17",
       "branchName": "2.17.x",
       "slug": "2.17",
-      "current": true
+      "maintained": false
     },
     {
       "name": "2.16",
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 15bd17299..b789cbb46 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,3 +6,4 @@ updates:
       interval: "weekly"
     labels:
       - "CI"
+    target-branch: "2.18.x"
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 52b7ea770..8e159f1d5 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -26,6 +26,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
     with:
       composer-options: "--prefer-dist --prefer-stable"
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
index d679fb032..a9876185a 100644
--- a/.github/workflows/composer-lint.yml
+++ b/.github/workflows/composer-lint.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 6b74226f5..73d515f62 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -1,5 +1,5 @@
 
-name: "Continuous Integration"
+name: "CI"
 
 on:
   pull_request:
@@ -27,7 +27,7 @@ on:
 
 jobs:
   phpunit:
-    name: "PHPUnit"
+    name: PHPUnit, PHP ${{ matrix.php-version || 'Ø' }} - Symfony ${{ matrix.symfony-require || 'Ø' }} - deps ${{ matrix.dependencies || 'Ø' }} - stability ${{ matrix.stability || 'Ø' }}
     runs-on: "ubuntu-latest"
     env:
       SYMFONY_REQUIRE: ${{matrix.symfony-require}}
@@ -55,7 +55,12 @@ jobs:
             php-version: "8.4"
 
           # Test LTS
-          - symfony-require: "6.4.*"
+          - symfony-require: "7.4.*"
+            dependencies: "highest"
+            php-version: "8.4"
+
+          # Test non-LTS
+          - symfony-require: "8.0.*"
             dependencies: "highest"
             php-version: "8.4"
 
@@ -113,7 +118,7 @@ jobs:
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v4"
+        uses: "actions/upload-artifact@v5"
         with:
           name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
           path: "coverage.xml"
@@ -133,7 +138,7 @@ jobs:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v5"
+        uses: "actions/download-artifact@v6"
         with:
           path: "reports"
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 1a6b13918..7722f764f 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@8.0.0"
\ No newline at end of file
+    uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"
\ No newline at end of file
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
index 29770e22e..634210120 100644
--- a/.github/workflows/release-on-milestone-closed.yml
+++ b/.github/workflows/release-on-milestone-closed.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index a951d95be..19cd93448 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -26,4 +26,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"
diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml
index e7c8e15bb..80312010a 100644
--- a/.github/workflows/website-schema.yml
+++ b/.github/workflows/website-schema.yml
@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@v12.2.0"
diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml
index f06cf8cb6..ee9e166a6 100644
--- a/.symfony.bundle.yaml
+++ b/.symfony.bundle.yaml
@@ -13,9 +13,16 @@ branches:
     - "2.16.x"
     - "2.17.x"
     - "2.18.x"
+    - "2.19.x"
+    - "3.0.x"
+    - "3.1.x"
+    - "4.0.x"
 maintained_branches:
-    - "2.17.x"
     - "2.18.x"
+    - "2.19.x"
+    - "3.0.x"
+    - "3.1.x"
+    - "4.0.x"
 doc_dir: "docs/en/"
-current_branch: "2.17.x"
-dev_branch: "2.18.x"
+current_branch: "3.0.x"
+dev_branch: "3.1.x"
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 6289a936e..733262d46 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -57,6 +57,13 @@ have been removed:
 - `doctrine.orm.entity_managers.some_em.report_fields_where_declared`
 - `doctrine.orm.enable_lazy_ghost_objects`
 
+Also, the 3 following options were no-ops when enabling native lazy objects
+and have been removed as well:
+
+- `doctrine.orm.auto_generate_proxy_classes`
+- `doctrine.orm.proxy_dir`
+- `doctrine.orm.proxy_namespace`
+
 ### The `doctrine.dbal.default_table_options.collate` default table option is removed
 
 Use `doctrine.dbal.default_table_options.collation` instead.
diff --git a/composer.json b/composer.json
index a72733308..2c5b3d1e9 100644
--- a/composer.json
+++ b/composer.json
@@ -34,12 +34,12 @@
         "doctrine/deprecations": "^1.0",
         "doctrine/persistence": "^4",
         "doctrine/sql-formatter": "^1.0.1",
-        "symfony/cache": "^6.4 || ^7.0",
-        "symfony/config": "^6.4 || ^7.0",
-        "symfony/console": "^6.4 || ^7.0",
-        "symfony/dependency-injection": "^6.4 || ^7.0",
-        "symfony/doctrine-bridge": "^6.4.3 || ^7.0.3",
-        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/cache": "^6.4 || ^7.0 || ^8.0",
+        "symfony/config": "^6.4 || ^7.0 || ^8.0",
+        "symfony/console": "^6.4 || ^7.0 || ^8.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0",
+        "symfony/doctrine-bridge": "^6.4.3 || ^7.0.3 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0",
         "symfony/service-contracts": "^3"
     },
     "require-dev": {
@@ -50,18 +50,18 @@
         "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "^12.3.10",
         "psr/log": "^3.0",
-        "symfony/doctrine-messenger": "^6.4 || ^7.0",
-        "symfony/expression-language": "^6.4 || ^7.0",
-        "symfony/messenger": "^6.4 || ^7.0",
-        "symfony/property-info": "^6.4 || ^7.0",
-        "symfony/security-bundle": "^6.4 || ^7.0",
-        "symfony/stopwatch": "^6.4 || ^7.0",
-        "symfony/string": "^6.4 || ^7.0",
-        "symfony/twig-bridge": "^6.4 || ^7.0",
-        "symfony/validator": "^6.4 || ^7.0",
-        "symfony/var-exporter": "^6.4.1 || ^7.0.1",
-        "symfony/web-profiler-bundle": "^6.4 || ^7.0",
-        "symfony/yaml": "^6.4 || ^7.0",
+        "symfony/doctrine-messenger": "^6.4 || ^7.0 || ^8.0",
+        "symfony/expression-language": "^6.4 || ^7.0 || ^8.0",
+        "symfony/messenger": "^6.4 || ^7.0 || ^8.0",
+        "symfony/property-info": "^6.4 || ^7.0 || ^8.0",
+        "symfony/security-bundle": "^6.4 || ^7.0 || ^8.0",
+        "symfony/stopwatch": "^6.4 || ^7.0 || ^8.0",
+        "symfony/string": "^6.4 || ^7.0 || ^8.0",
+        "symfony/twig-bridge": "^6.4 || ^7.0 || ^8.0",
+        "symfony/validator": "^6.4 || ^7.0 || ^8.0",
+        "symfony/var-exporter": "^6.4.1 || ^7.0.1 || ^8.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.0 || ^8.0",
+        "symfony/yaml": "^6.4 || ^7.0 || ^8.0",
         "twig/twig": "^3.21.1"
     },
     "conflict": {
diff --git a/docs/composer.json b/docs/composer.json
new file mode 100644
index 000000000..5072d501c
--- /dev/null
+++ b/docs/composer.json
@@ -0,0 +1,8 @@
+{
+    "require-dev": {
+        "doctrine/docs-builder": "^1.0"
+    },
+    "config": {
+        "sort-packages": true
+    }
+}
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 29a8c8a53..b75095f71 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -4,8 +4,6 @@ parameters:
       - config
       - src
       - tests
-   scanFiles:
-      - vendor/symfony/dependency-injection/Loader/Configurator/functions.php
    ignoreErrors:
     # phpstan has no array shape intersection support https://github.com/phpstan/phpstan/issues/12414
     - message: '#unresolvable type.#'
diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php
index 4dd3380a6..3eceb8c1f 100644
--- a/src/DependencyInjection/DoctrineExtension.php
+++ b/src/DependencyInjection/DoctrineExtension.php
@@ -417,7 +417,7 @@ private function validateAutoMapping(array $managerConfigs): string|null
      *
      * @return void
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = $this->getConfiguration($configs, $container);
         $config        = $this->processConfigurationPrependingDefaults($configuration, $configs);
diff --git a/src/Twig/DoctrineExtension.php b/src/Twig/DoctrineExtension.php
index 822e446ff..db8057cc0 100644
--- a/src/Twig/DoctrineExtension.php
+++ b/src/Twig/DoctrineExtension.php
@@ -57,7 +57,7 @@ public function getFilters(): array
      *
      * @internal
      */
-    public static function escapeFunction(mixed $parameter): string|int
+    public static function escapeFunction(mixed $parameter): string|int|float
     {
         $result = $parameter;
 
diff --git a/tests/CacheSchemaSubscriberTest.php b/tests/CacheSchemaSubscriberTest.php
index f74eccc1b..7dfe2967f 100644
--- a/tests/CacheSchemaSubscriberTest.php
+++ b/tests/CacheSchemaSubscriberTest.php
@@ -32,8 +32,10 @@ public function testSchemaSubscriberWiring(): void
             'kernel.build_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.bundles_metadata' => [],
             'kernel.charset' => 'UTF-8',
             'kernel.container_class' => ContainerBuilder::class,
diff --git a/tests/Command/CreateDatabaseDoctrineTest.php b/tests/Command/CreateDatabaseDoctrineTest.php
index 849c4e061..113ee347e 100644
--- a/tests/Command/CreateDatabaseDoctrineTest.php
+++ b/tests/Command/CreateDatabaseDoctrineTest.php
@@ -11,7 +11,7 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\SchemaManagerFactory;
 use Doctrine\Persistence\ManagerRegistry;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Container;
@@ -59,25 +59,23 @@ public function testExecute(): void
      * @param mixed[]|null $params Connection parameters
      * @psalm-param Params $params
      *
-     * @return MockObject&Container
+     * @return Stub&Container
      */
-    private function getMockContainer(string $connectionName, array|null $params = null): MockObject
+    private function getMockContainer(string $connectionName, array|null $params = null): Stub
     {
         // Mock the container and everything you'll need here
         $mockDoctrine = $this->createStub(ManagerRegistry::class);
 
         $mockDoctrine->method('getDefaultConnectionName')->willReturn($connectionName);
 
-        $config = (new Configuration())->setSchemaManagerFactory($this->createMock(SchemaManagerFactory::class));
+        $config = (new Configuration())->setSchemaManagerFactory($this->createStub(SchemaManagerFactory::class));
 
         $mockConnection = $this->createStub(Connection::class);
         $mockConnection->method('getConfiguration')->willReturn($config);
         $mockConnection->method('getParams')->willReturn($params);
         $mockDoctrine->method('getConnection')->willReturn($mockConnection);
 
-        $mockContainer = $this->getMockBuilder(Container::class)
-            ->onlyMethods(['get'])
-            ->getMock();
+        $mockContainer = $this->createStub(Container::class);
 
         $mockContainer->method('get')->with('doctrine')->willReturn($mockDoctrine);
 
diff --git a/tests/Command/DropDatabaseDoctrineTest.php b/tests/Command/DropDatabaseDoctrineTest.php
index f7176499d..c691867ef 100644
--- a/tests/Command/DropDatabaseDoctrineTest.php
+++ b/tests/Command/DropDatabaseDoctrineTest.php
@@ -14,7 +14,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Container;
@@ -137,9 +137,9 @@ public static function provideIncompatibleDriverOptions(): Generator
      * @param list<mixed> $params Connection parameters
      * @psalm-param Params $params
      *
-     * @return MockObject&Container
+     * @return Stub&Container
      */
-    private function getMockContainer(string $connectionName, array $params): MockObject
+    private function getMockContainer(string $connectionName, array $params): Stub
     {
         // Mock the container and everything you'll need here
         $mockDoctrine = $this->createStub(ManagerRegistry::class);
@@ -148,18 +148,16 @@ private function getMockContainer(string $connectionName, array $params): MockOb
 
         $config = (new Configuration())->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
 
-        $mockConnection = $this->createMock(Connection::class);
+        $mockConnection = $this->createStub(Connection::class);
         $mockConnection->method('getConfiguration')->willReturn($config);
         $mockConnection->method('getParams')->willReturn($params);
         $mockDoctrine->method('getConnection')->willReturn($mockConnection);
 
-        $mockContainer = $this->getMockBuilder(Container::class)
-            ->onlyMethods(['get'])
-            ->getMock();
+        $mockContainer = $this->createStub(Container::class);
 
         $mockContainer->method('get')
-            ->with('doctrine')
-            ->willReturn($mockDoctrine);
+           ->with('doctrine')
+           ->willReturn($mockDoctrine);
 
         return $mockContainer;
     }
diff --git a/tests/DataCollector/DoctrineDataCollectorTest.php b/tests/DataCollector/DoctrineDataCollectorTest.php
index de4a0be1e..4bb573642 100644
--- a/tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/tests/DataCollector/DoctrineDataCollectorTest.php
@@ -35,8 +35,8 @@ public function testCollectEntities(): void
         $manager    = $this->createStub(EntityManagerInterface::class);
         $config     = $this->createMock(Configuration::class);
         $factory    = $this->createMock(ClassMetadataFactory::class);
-        $collector  = $this->createCollector(['default' => $manager], true, $this->createMock(DebugDataHolder::class));
-        $unitOfWork = $this->createMock(UnitOfWork::class);
+        $collector  = $this->createCollector(['default' => $manager], true, $this->createStub(DebugDataHolder::class));
+        $unitOfWork = $this->createStub(UnitOfWork::class);
 
         $manager->method('getMetadataFactory')->willReturn($factory);
         $manager->method('getConfiguration')->willReturn($config);
@@ -74,8 +74,8 @@ public function testDoesNotCollectEntities(): void
         }
 
         $manager    = $this->createMock(EntityManager::class);
-        $config     = $this->createMock(Configuration::class);
-        $collector  = $this->createCollector(['default' => $manager], false, $this->createMock(DebugDataHolder::class));
+        $config     = $this->createStub(Configuration::class);
+        $collector  = $this->createCollector(['default' => $manager], false, $this->createStub(DebugDataHolder::class));
         $unitOfWork = $this->createStub(UnitOfWork::class);
 
         $manager->expects($this->never())->method('getMetadataFactory');
@@ -91,7 +91,7 @@ public function testDoesNotCollectEntities(): void
 
     public function testGetGroupedQueries(): void
     {
-        $debugDataHolder = $this->createMock(DebugDataHolder::class);
+        $debugDataHolder = $this->createStub(DebugDataHolder::class);
 
         $queries = [
             'default' => [
diff --git a/tests/DependencyInjection/Compiler/IdGeneratorPassTest.php b/tests/DependencyInjection/Compiler/IdGeneratorPassTest.php
index ad1576fd6..8b450e765 100644
--- a/tests/DependencyInjection/Compiler/IdGeneratorPassTest.php
+++ b/tests/DependencyInjection/Compiler/IdGeneratorPassTest.php
@@ -48,8 +48,10 @@ public function testRepositoryServiceWiring(): void
             'kernel.bundles' => $bundles,
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.build_dir' => sys_get_temp_dir(),
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_auto_commit.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_auto_commit.xml
deleted file mode 100644
index a725abd51..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_auto_commit.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal auto-commit="false" />
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable.xml
deleted file mode 100644
index bacc6bf2d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="mysql">
-            <connection
-                name="profile_without_schema_validator"
-                logging="false"
-                profiling="true"
-                profiling-collect-schema-errors="false" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable_no_profiling.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable_no_profiling.xml
deleted file mode 100644
index 32301a63d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_disable_no_profiling.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="mysql">
-            <connection
-                name="profile_without_schema_validator_no_profiling"
-                logging="false"
-                profiling="false"
-                profiling-collect-schema-errors="false" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_enable.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_enable.xml
deleted file mode 100644
index 61b285f2b..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_collect_schema_errors_enable.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="mysql">
-            <connection
-                name="profile_with_schema_validator"
-                logging="false"
-                profiling="true"
-                profiling-collect-schema-errors="true" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_dbname_suffix.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_dbname_suffix.xml
deleted file mode 100644
index 20d3083e7..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_dbname_suffix.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal url="mysql://root:password@database:3306/main?serverVersion=mariadb-12.1.1" dbname-suffix="_test" />
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_driver_schemes.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_driver_schemes.xml
deleted file mode 100644
index 1ba085612..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_driver_schemes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal url="mysql://root:password@database:3306/main?serverVersion=mariadb-12.1.1">
-            <driver-scheme scheme="postgresql">pgsql</driver-scheme>
-            <driver-scheme scheme="my-scheme">my_driver</driver-scheme>
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_logging.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_logging.xml
deleted file mode 100644
index abc7437c4..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_logging.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="mysql">
-            <connection
-                name="log"
-                logging="true"
-                profiling="false" />
-            <connection
-                name="profile"
-                logging="false"
-                profiling="true" />
-            <connection
-                name="profile_with_backtrace"
-                logging="false"
-                profiling="true"
-                profiling-collect-backtrace="true" />
-            <connection
-                name="backtrace_without_profile"
-                logging="false"
-                profiling="false"
-                profiling-collect-backtrace="true" />
-            <connection
-                name="both"
-                logging="true"
-                profiling="true" />
-            <connection
-                name="none"
-                logging="false"
-                profiling="false" />
-            <connection
-                name="profile_without_schema_validator"
-                logging="false"
-                profiling="true"
-                profiling-collect-schema-errors="true" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_connectstring.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_connectstring.xml
deleted file mode 100644
index 5a0d4ad23..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_connectstring.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal connectstring="scott@sales-server:1521/sales.us.example.com">
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_instancename.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_instancename.xml
deleted file mode 100644
index 272c2c4ca..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_instancename.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal instancename="mySuperInstance">
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_result_cache.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_result_cache.xml
deleted file mode 100644
index f2c9450ac..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_result_cache.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="connection_with_cache">
-            <connection
-                name="connection_with_cache"
-                result-cache="example.cache" />
-            <connection
-                name="connection_without_cache" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_filter.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_filter.xml
deleted file mode 100644
index ab5cf18f3..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_filter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="connection1">
-            <connection name="connection1" schema-filter="~^(?!t_)~" server-version="9.4.0" />
-            <connection name="connection2" server-version="9.4.0" />
-            <connection name="connection3" server-version="9.4.0" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_manager_factory.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_manager_factory.xml
deleted file mode 100644
index c8a1701c3..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_schema_manager_factory.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="custom_schema_manager_factory">
-            <connection name="default_schema_manager_factory" />
-            <connection name="custom_schema_manager_factory" schema-manager-factory="custom_factory" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml
deleted file mode 100644
index 480aa14bb..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="mysql">
-            <connection
-                name="mysql"
-                dbname="mysql_db"
-                user="mysql_user"
-                password="mysql_s3cr3t"
-                unix-socket="/path/to/mysqld.sock" />
-            <connection
-                name="sqlite"
-                driver="pdo_sqlite"
-                dbname="sqlite_db"
-                user="sqlite_user"
-                password="sqlite_s3cr3t"
-                path="/tmp/db.sqlite"
-                memory="true">
-                <option key="userDefinedFunctions">
-                    <asin>
-                        <callback>asin</callback>
-                        <numArgs>1</numArgs>
-                    </asin>
-                </option>
-                <option key="arbitraryValue">foo</option>
-            </connection>
-            <connection
-                name="oci"
-                driver="oci8"
-                dbname="oracle_db"
-                user="oracle_user"
-                password="oracle_s3cr3t"
-                servicename="oracle_service"
-                service="true"
-                pooled="true"
-                charset="utf8" />
-            <connection
-                name="ibmdb2"
-                driver="ibm_db2"
-                dbname="ibmdb2_db"
-                user="ibmdb2_user"
-                password="ibmdb2_s3cr3t"
-                protocol="TCPIP" />
-            <connection
-                name="pgsql"
-                driver="pdo_pgsql"
-                dbname="pgsql_schema"
-                user="pgsql_user"
-                password="pgsql_s3cr3t"
-                default_dbname="pgsql_db"
-                sslmode="require"
-                sslrootcert="postgresql-ca.pem"
-                sslcert="postgresql-cert.pem"
-                sslkey="postgresql-key.pem"
-                sslcrl="postgresql.crl"
-                charset="utf8" />
-            <connection
-                name="sqlanywhere"
-                driver="sqlanywhere"
-                host="localhost"
-                port="2683"
-                server="sqlanywhere_server"
-                dbname="sqlanywhere_db"
-                user="sqlanywhere_user"
-                password="sqlanywhere_s3cr3t"
-                persistent="true"
-                charset="utf8" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
deleted file mode 100644
index 6447c4408..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal dbname="mysql_db" user="mysql_user" password="mysql_s3cr3t" unix-socket="/path/to/mysqld.sock" server-version="9.4.0" />
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_primary_replica_connection.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_primary_replica_connection.xml
deleted file mode 100644
index 0e1f44943..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_primary_replica_connection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal dbname="mysql_db" user="mysql_user" password="mysql_s3cr3t" unix-socket="/path/to/mysqld.sock" keep-replica="true">
-            <replica name="replica1" dbname="replica_db" user="replica_user" password="replica_s3cr3t" unix-socket="/path/to/mysqld_replica.sock" />
-            <default-table-option name="engine">InnoDB</default-table-option>
-            <option key="17" value="1" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/dbal_types.xml b/tests/DependencyInjection/Fixtures/config/xml/dbal_types.xml
deleted file mode 100644
index 63f852d01..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/dbal_types.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <type name="test">Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestType</type>
-            <connection name="default" />
-        </dbal>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener.xml
deleted file mode 100644
index e04e596fd..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<srv:container xmlns:srv="http://symfony.com/schema/dic/services" xmlns="http://symfony.com/schema/dic/doctrine" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd                         http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-        <orm default-entity-manager="default">
-            <entity-listeners>
-                <entity class="ExternalBundles\Entities\FooEntity">
-                    <listener class="MyBundles\Listeners\FooEntityListener">
-                        <event type="prePersist"/>
-                        <event type="postPersist" method="postPersist"/>
-                        <event type="postLoad" method="postLoadHandler"/>
-                    </listener>
-                </entity>
-                <entity class="ExternalBundles\Entities\BarEntity">
-                    <listener class="MyBundles\Listeners\BarEntityListener">
-                        <event type="prePersist" method="prePersist"/>
-                        <event type="prePersist" method="prePersistHandler"/>
-                    </listener>
-                    <listener class="MyBundles\Listeners\LogDeleteEntityListener">
-                        <event type="postDelete" method="postDelete"/>
-                    </listener>
-                </entity>
-            </entity-listeners>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener_tag.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener_tag.xml
deleted file mode 100644
index 0c38446a1..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener_tag.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="entity_listener1" class="EntityListener1">
-            <tag name="doctrine.orm.entity_listener" entity="My/Entity1" event="postLoad" />
-        </service>
-
-        <service id="entity_listener2" class="EntityListener2">
-            <tag name="doctrine.orm.entity_listener" entity_manager="em2" entity="My/Entity2" event="preFlush" method="preFlushHandler" />
-        </service>
-
-        <service id="invokable_entity_listener" class="Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\InvokableEntityListener">
-            <tag name="doctrine.orm.entity_listener" entity="My/Entity1" event="loadClassMetadata" />
-            <tag name="doctrine.orm.entity_listener" entity="My/Entity1" event="postPersist" />
-        </service>
-
-        <service id="grand_parent_entity_listener" class="GrandParentEntityListener" />
-
-        <service id="parent_entity_listener" class="ParentEntityListener" />
-
-        <service id="children_entity_listener" parent="parent_entity_listener">
-            <tag name="doctrine.orm.entity_listener" entity="My/Entity3" event="postLoad" priority="1" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" />
-            <doctrine:entity-manager name="em2" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listeners_two_connections.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listeners_two_connections.xml
deleted file mode 100644
index 35a705c99..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listeners_two_connections.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-            <doctrine:connection name="foobar" dbname="foobar" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" connection="default" />
-            <doctrine:entity-manager name="em2" connection="foobar" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_lazy_entity_listener.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_attach_lazy_entity_listener.xml
deleted file mode 100644
index 1da2f822d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_attach_lazy_entity_listener.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="custom_entity_listener_resolver" class="Doctrine\Bundle\DoctrineBundle\Mapping\ContainerEntityListenerResolver" >
-            <argument type="service" id="service_container"/>
-        </service>
-
-        <service id="entity_listener1" class="EntityListener1">
-            <tag name="doctrine.orm.entity_listener" lazy="true" />
-        </service>
-        <service id="entity_listener2" class="EntityListener2">
-            <tag name="doctrine.orm.entity_listener" entity_manager="em2" lazy="true" />
-        </service>
-        <service id="entity_listener3" class="EntityListener3">
-            <tag name="doctrine.orm.entity_listener" lazy="false" />
-        </service>
-        <service id="entity_listener4" class="EntityListener4">
-            <tag name="doctrine.orm.entity_listener" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" />
-            <doctrine:entity-manager name="em2" entity-listener-resolver="custom_entity_listener_resolver" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_caches.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_caches.xml
deleted file mode 100644
index 1db9fe3bc..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_caches.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <srv:services>
-        <srv:service id="cache.psr6" class="Symfony\Component\Cache\Adapter\ArrayAdapter"/>
-    </srv:services>
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" server-version="9.4.0" />
-        </dbal>
-
-        <orm default-entity-manager="metadata_cache_none">
-            <entity-manager name="metadata_cache_none"/>
-            <entity-manager name="metadata_cache_pool">
-                <metadata-cache-driver type="pool" pool="cache.psr6"/>
-            </entity-manager>
-            <entity-manager name="metadata_cache_service_psr6">
-                <metadata-cache-driver type="service" id="cache.psr6"/>
-            </entity-manager>
-
-            <entity-manager name="query_cache_pool">
-                <query-cache-driver type="pool" pool="cache.psr6"/>
-            </entity-manager>
-            <entity-manager name="query_cache_service_psr6">
-                <query-cache-driver type="service" id="cache.psr6"/>
-            </entity-manager>
-
-            <entity-manager name="result_cache_pool">
-                <result-cache-driver type="pool" pool="cache.psr6"/>
-            </entity-manager>
-            <entity-manager name="result_cache_service_psr6">
-                <result-cache-driver type="service" id="cache.psr6"/>
-            </entity-manager>
-
-            <entity-manager name="second_level_cache_pool">
-                <second-level-cache enabled="true">
-                    <region-cache-driver type="pool" pool="cache.psr6"/>
-                </second-level-cache>
-            </entity-manager>
-            <entity-manager name="second_level_cache_service_psr6">
-                <second-level-cache enabled="true">
-                    <region-cache-driver type="service" id="cache.psr6"/>
-                </second-level-cache>
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_abstract.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_abstract.xml
deleted file mode 100644
index 823296081..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_abstract.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="entity_listener1" class="EntityListener" abstract="true">
-            <tag name="doctrine.orm.entity_listener" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_custom_resolver.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_custom_resolver.xml
deleted file mode 100644
index 69734f4e4..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_custom_resolver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="custom_entity_listener_resolver" class="Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\Fixtures\CustomEntityListenerServiceResolver" public="false"></service>
-
-        <service id="entity_listener" class="EntityListener" public="false">
-            <tag name="doctrine.orm.entity_listener" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" entity-listener-resolver="custom_entity_listener_resolver" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_private.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_private.xml
deleted file mode 100644
index f52efde5f..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_private.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="entity_listener1" class="EntityListener" public="false">
-            <tag name="doctrine.orm.entity_listener" lazy="true" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_resolver_without_interface.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_resolver_without_interface.xml
deleted file mode 100644
index f9a1c9146..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_resolver_without_interface.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="custom_resolver" class="Doctrine\ORM\Mapping\DefaultEntityListenerResolver" />
-
-        <service id="entity_listener" class="EntityListener">
-            <tag name="doctrine.orm.entity_listener" lazy="true" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" entity-listener-resolver="custom_resolver" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_resolver.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_resolver.xml
deleted file mode 100644
index 9ecf7cf23..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_resolver.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <services>
-        <service id="entity_listener_resolver" class="Doctrine\ORM\Mapping\DefaultEntityListenerResolver" />
-
-        <service id="entity_listener1" class="EntityListener">
-            <tag name="doctrine.orm.entity_listener" />
-        </service>
-
-        <service id="entity_listener2" class="EntityListener">
-            <tag name="doctrine.orm.entity_listener" entity_manager="em2" />
-        </service>
-    </services>
-
-    <doctrine:config>
-        <doctrine:dbal default-connection="default">
-            <doctrine:connection name="default" dbname="db" />
-        </doctrine:dbal>
-
-        <doctrine:orm default-entity-manager="em1">
-            <doctrine:entity-manager name="em1" />
-            <doctrine:entity-manager name="em2" entity-listener-resolver="entity_listener_resolver" />
-        </doctrine:orm>
-    </doctrine:config>
-</container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_fetch_mode_subselect_batch_size.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_fetch_mode_subselect_batch_size.xml
deleted file mode 100644
index 0cb1ed8a6..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_fetch_mode_subselect_batch_size.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-        </dbal>
-
-        <orm fetch-mode-subselect-batch-size="10000">
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml
deleted file mode 100644
index b8b793eba..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" server-version="9.4.0" />
-        </dbal>
-
-        <orm>
-            <filter name="soft_delete" enabled="true" >Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestFilter</filter>
-            <filter name="myFilter" enabled="true" class="Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestFilter">
-                <parameter name="myParameter">myValue</parameter>
-                <parameter name="mySecondParameter">mySecondValue</parameter>
-            </filter>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml
deleted file mode 100644
index 34d0a6be9..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <entity-manager name="default">
-                <mapping name="XmlBundle" />
-                <dql>
-                    <string-function name="test_string">Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction</string-function>
-                    <numeric-function name="test_numeric">Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestNumericFunction</numeric-function>
-                    <datetime-function name="test_datetime">Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestDatetimeFunction</datetime-function>
-                </dql>
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_hydration_mode.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_hydration_mode.xml
deleted file mode 100644
index 86772c3a1..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_hydration_mode.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <entity-manager name="default">
-                <hydrator name="test_hydrator">Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator</hydrator>
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_identity_generation_preferences.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_identity_generation_preferences.xml
deleted file mode 100644
index e79471271..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_identity_generation_preferences.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="em1">
-            <entity-manager name="em1">
-                <mapping name="XmlBundle" />
-                <identity-generation-preference platform="Doctrine\DBAL\Platforms\PostgreSQLPlatform">identity</identity-generation-preference>
-            </entity-manager>
-            <entity-manager name="em2">
-                <identity-generation-preference platform="Doctrine\DBAL\Platforms\PostgreSQLPlatform">sequence</identity-generation-preference>
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml
deleted file mode 100644
index a642d697f..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="em2">
-            <entity-manager name="em1">
-                <mapping name="AttributesBundle" type="attribute" />
-            </entity-manager>
-            <entity-manager name="em2" validate-xml-mapping="true">
-                <mapping name="XmlBundle" dir="Resources/config/doctrine" alias="xml" />
-                <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                    dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
-                    alias="TestAlias"
-                />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_namingstrategy.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_namingstrategy.xml
deleted file mode 100644
index 05b515f5f..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_namingstrategy.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="em1">
-            <entity-manager name="em1" naming-strategy="doctrine.orm.naming_strategy.default">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-            <entity-manager name="em2" naming-strategy="doctrine.orm.naming_strategy.underscore">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_default.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_default.xml
deleted file mode 100644
index c38e081cb..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_default.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" server-version="8.0.31" />
-        </dbal>
-
-        <orm />
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_disable.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_disable.xml
deleted file mode 100644
index 8227c8ac8..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_disable.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" server-version="9.4.0" />
-        </dbal>
-
-        <orm enable-native-lazy-objects="false">
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_enable.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_enable.xml
deleted file mode 100644
index 8a9a1ec4f..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_native_lazy_objects_enable.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" server-version="9.4.0" />
-        </dbal>
-
-        <orm enable-native-lazy-objects="true">
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_quotestrategy.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_quotestrategy.xml
deleted file mode 100644
index c9549af0a..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_quotestrategy.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="em1">
-            <entity-manager name="em1" quote-strategy="doctrine.orm.quote_strategy.default">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-            <entity-manager name="em2" quote-strategy="doctrine.orm.quote_strategy.ansi">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_repository_factory.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_repository_factory.xml
deleted file mode 100644
index ab0cb90fc..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_repository_factory.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <srv:services>
-        <srv:service id="repository_factory" class="Doctrine\Bundle\DoctrineBundle\Repository\RepositoryFactory" />
-    </srv:services>
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default" repository-factory="repository_factory" />
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_resolve_target_entity.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_resolve_target_entity.xml
deleted file mode 100644
index 6890cd0ce..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_resolve_target_entity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <resolve-target-entity interface="Symfony\Component\Security\Core\User\UserInterface">MyUserClass</resolve-target-entity>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_schema_ignore_classes.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_schema_ignore_classes.xml
deleted file mode 100644
index d2921b8fd..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_schema_ignore_classes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-        </dbal>
-
-        <orm default-entity-manager="em1">
-            <entity-manager name="em1">
-                <schema-ignore-class>Class\A</schema-ignore-class>
-                <schema-ignore-class>Class\B</schema-ignore-class>
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_second_level_cache.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_second_level_cache.xml
deleted file mode 100644
index 616f87244..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_second_level_cache.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <srv:services>
-        <srv:service id="my_service_logger1" class="Doctrine\ORM\Cache\Logging\StatisticsCacheLogger"/>
-        <srv:service id="my_service_logger2" class="Doctrine\ORM\Cache\Logging\StatisticsCacheLogger"/>
-
-        <srv:service id="my_service_region" class="Doctrine\ORM\Cache\Region\DefaultRegion">
-            <srv:argument type="service" id="my_service_region_driver"/>
-            <srv:argument>3600</srv:argument>
-        </srv:service>
-
-        <srv:service id="my_service_region_driver" class="Symfony\Component\Cache\Adapter\ArrayAdapter" />
-
-        <srv:service id="my_factory_config" class="Doctrine\ORM\Cache\CacheConfiguration"/>
-        <srv:service id="my_factory_driver" class="Symfony\Component\Cache\Adapter\ArrayAdapter"/>
-        <srv:service id="my_factory" class="Doctrine\ORM\Cache\DefaultCacheFactory">
-            <srv:argument type="service" id="my_factory_config"/>
-            <srv:argument type="service" id="my_factory_driver"/>
-        </srv:service>
-
-    </srv:services>
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-
-            <entity-manager name="custom_slc_factory">
-                <second-level-cache factory="my_factory"/>
-            </entity-manager>
-
-            <entity-manager name="default">
-                <second-level-cache region-lifetime="3600" region-lock-lifetime="60" log-enabled="true" enabled="true">
-                    <region name="my_service_region" type="service" service="my_service_region"/>
-                    <region name="my_query_region" lifetime="300" type="filelock"/>
-                    <region name="my_entity_region" lifetime="600" />
-
-                    <logger name="my_service_logger1" service="my_service_logger1"/>
-                    <logger name="my_service_logger2" service="my_service_logger2"/>
-                </second-level-cache>
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml
deleted file mode 100644
index 4d7e0e33d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-    <config>
-        <dbal default-connection="conn1">
-            <connection
-                name="conn1"
-                driver="pdo_sqlite"
-                dbname="sqlite_db"
-                user="sqlite_user"
-                password="sqlite_s3cr3t"
-                memory="true" />
-            <connection
-                name="conn2"
-                driver="pdo_sqlite"
-                dbname="sqlite_db"
-                user="sqlite_user"
-                password="sqlite_s3cr3t"
-                memory="true" />
-        </dbal>
-
-        <orm default-entity-manager="em2">
-            <entity-manager name="em1" connection="conn1">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-            <entity-manager name="em2" connection="conn2">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml
deleted file mode 100644
index b8f3796cd..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <mapping name="XmlBundle" />
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager_without_dbname.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager_without_dbname.xml
deleted file mode 100644
index 78b159a05..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager_without_dbname.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default"/>
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <mapping name="XmlBundle" />
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml
deleted file mode 100644
index 2a0f0e39d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-    <config>
-        <dbal default-connection="default">
-            <connection
-                name="default"
-                driver="pdo_sqlite"
-                dbname="sqlite_db"
-                user="sqlite_user"
-                password="sqlite_s3cr3t"
-                memory="true" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <entity-manager name="default" connection="default" default-repository-class="Acme\Doctrine\Repository">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml
deleted file mode 100644
index bc4e30a9d..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm validate-xml-mapping="true">
-            <mapping name="AttributesBundle" type="attribute" />
-            <mapping name="XmlBundle" dir="Resources/config/doctrine" alias="xml" />
-            <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
-                alias="TestAlias"
-            />
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_default_table_options.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_default_table_options.xml
deleted file mode 100644
index a3bd78ba0..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_default_table_options.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db">
-                <default-table-option name="charset">utf8mb4</default-table-option>
-                <default-table-option name="collation">utf8mb4_unicode_ci</default-table-option>
-                <default-table-option name="engine">InnoDB</default-table-option>
-            </connection>
-        </dbal>
-
-        <orm>
-            <mapping name="AttributesBundle" type="attribute" />
-            <mapping name="XmlBundle" dir="Resources/config/doctrine" alias="xml" />
-            <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
-                dir="%kernel.root_dir%/tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine"
-                alias="TestAlias"
-            />
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_dql_functions.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_dql_functions.xml
deleted file mode 100644
index 638bfc943..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_single_em_dql_functions.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm>
-            <dql>
-                <string-function name="test_string">Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction</string-function>
-            </dql>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/orm_typedfieldmapper.xml b/tests/DependencyInjection/Fixtures/config/xml/orm_typedfieldmapper.xml
deleted file mode 100644
index ffaef72b4..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/orm_typedfieldmapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="default">
-            <connection name="default" dbname="db" />
-        </dbal>
-
-        <orm default-entity-manager="default">
-            <entity-manager name="default" typed-field-mapper="doctrine.orm.typed_field_mapper.default">
-                <mapping name="XmlBundle" />
-            </entity-manager>
-        </orm>
-    </config>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_default_tables_session.xml b/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_default_tables_session.xml
deleted file mode 100644
index 6ab8f22d6..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_default_tables_session.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="connection1">
-            <connection name="connection1" schema-filter="~^(?!t_)~" />
-            <connection name="connection2" />
-            <connection name="connection3" />
-        </dbal>
-    </config>
-
-    <srv:services>
-        <srv:service id="well_known_filter" alias="doctrine.dbal.well_known_schema_asset_filter" public="true" />
-        <srv:service id="symfony.session" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" />
-    </srv:services>
-</srv:container>
diff --git a/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_overridden_tables_session.xml b/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_overridden_tables_session.xml
deleted file mode 100644
index 1ca50b228..000000000
--- a/tests/DependencyInjection/Fixtures/config/xml/well_known_schema_filter_overridden_tables_session.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" ?>
-
-<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-    <config>
-        <dbal default-connection="connection1">
-            <connection name="connection1" schema-filter="~^(?!t_)~" />
-            <connection name="connection2" />
-            <connection name="connection3" />
-        </dbal>
-    </config>
-
-    <srv:services>
-        <srv:service id="well_known_filter" alias="doctrine.dbal.well_known_schema_asset_filter" public="true" />
-        <srv:service id="symfony.session" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler">
-            <srv:argument />
-            <srv:argument type="collection">
-                <srv:argument key="db_table">app_session</srv:argument>
-            </srv:argument>
-        </srv:service>
-    </srv:services>
-</srv:container>
diff --git a/tests/DependencyInjection/XMLSchemaTest.php b/tests/DependencyInjection/XMLSchemaTest.php
deleted file mode 100644
index c2b9aea9e..000000000
--- a/tests/DependencyInjection/XMLSchemaTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection;
-
-use DirectoryIterator;
-use DOMDocument;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\TestCase;
-
-use function basename;
-use function substr;
-
-class XMLSchemaTest extends TestCase
-{
-    /** @return array<string, array{0: string}> */
-    public static function dataValidateSchemaFiles(): array
-    {
-        $schemaFiles = [];
-        $di          = new DirectoryIterator(__DIR__ . '/Fixtures/config/xml');
-        foreach ($di as $element) {
-            if (! $element->isFile() || substr($element->getFilename(), -4) !== '.xml') {
-                continue;
-            }
-
-            $schemaFiles[basename($element->getPathname())] = [$element->getPathname()];
-        }
-
-        return $schemaFiles;
-    }
-
-    #[DataProvider('dataValidateSchemaFiles')]
-    public function testValidateSchema(string $file): void
-    {
-        $found = false;
-        $dom   = new DOMDocument('1.0', 'UTF-8');
-        $dom->load($file);
-
-        $xmlns = 'http://symfony.com/schema/dic/doctrine';
-
-        $dbalElements = $dom->getElementsByTagNameNS($xmlns, 'dbal');
-        if ($dbalElements->length) {
-            $dbalDom    = new DOMDocument('1.0', 'UTF-8');
-            $dbalNode   = $dbalDom->importNode($dbalElements->item(0));
-            $configNode = $dbalDom->createElementNS($xmlns, 'config');
-            $configNode->appendChild($dbalNode);
-            $dbalDom->appendChild($configNode);
-
-            $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;
-        }
-
-        $ormElements = $dom->getElementsByTagNameNS($xmlns, 'orm');
-        if ($ormElements->length) {
-            $ormDom     = new DOMDocument('1.0', 'UTF-8');
-            $ormNode    = $ormDom->importNode($ormElements->item(0));
-            $configNode = $ormDom->createElementNS($xmlns, 'config');
-            $configNode->appendChild($ormNode);
-            $ormDom->appendChild($configNode);
-
-            $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;
-        }
-
-        $this->assertTrue($found, 'Neither <doctrine:orm> nor <doctrine:dbal> elements found in given XML. Are namespaces configured correctly?');
-    }
-}
diff --git a/tests/DependencyInjection/XmlDoctrineExtensionTest.php b/tests/DependencyInjection/XmlDoctrineExtensionTest.php
deleted file mode 100644
index 4b57bf368..000000000
--- a/tests/DependencyInjection/XmlDoctrineExtensionTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection;
-
-use PHPUnit\Framework\Attributes\IgnoreDeprecations;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-
-#[IgnoreDeprecations]
-class XmlDoctrineExtensionTest extends AbstractDoctrineExtensionTestCase
-{
-    protected function loadFromFile(
-        ContainerBuilder $container,
-        string $file,
-    ): void {
-        $loadXml = new XmlFileLoader($container, new FileLocator(__DIR__ . '/Fixtures/config/xml'));
-        $loadXml->import($file . '.{xml}');
-    }
-}
diff --git a/tests/LockStoreSchemaListenerTest.php b/tests/LockStoreSchemaListenerTest.php
index dd0989c28..d9e9bc730 100644
--- a/tests/LockStoreSchemaListenerTest.php
+++ b/tests/LockStoreSchemaListenerTest.php
@@ -31,8 +31,10 @@ public function testLockStoreSchemaSubscriberWiring(array $config, int $expected
             'kernel.bundles' => [],
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.build_dir' => sys_get_temp_dir(),
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],
diff --git a/tests/Middleware/IdleConnectionMiddlewareTest.php b/tests/Middleware/IdleConnectionMiddlewareTest.php
index 947103e2a..eab572ff2 100644
--- a/tests/Middleware/IdleConnectionMiddlewareTest.php
+++ b/tests/Middleware/IdleConnectionMiddlewareTest.php
@@ -25,7 +25,7 @@ public function testWrap(): void
         $middleware = new IdleConnectionMiddleware($connectionExpiries, $ttlByConnection);
         $middleware->setConnectionName('connectionone');
 
-        $driverMock    = $this->createMock(Driver::class);
+        $driverMock    = $this->createStub(Driver::class);
         $wrappedDriver = $middleware->wrap($driverMock);
 
         $this->assertInstanceOf(IdleConnectionDriver::class, $wrappedDriver);
diff --git a/tests/ProfilerTest.php b/tests/ProfilerTest.php
index 3e9e30318..ae2cbcad1 100644
--- a/tests/ProfilerTest.php
+++ b/tests/ProfilerTest.php
@@ -43,7 +43,7 @@ class ProfilerTest extends BaseTestCase
     public function setUp(): void
     {
         $this->debugDataHolder = new DebugDataHolder();
-        $registry              = $this->getMockBuilder(ManagerRegistry::class)->getMock();
+        $registry              = $this->createStub(ManagerRegistry::class);
         $registry->method('getConnectionNames')->willReturn([]);
         $registry->method('getManagerNames')->willReturn([]);
         $registry->method('getManagers')->willReturn([]);
@@ -53,14 +53,12 @@ public function setUp(): void
         $twigLoaderFilesystem->addPath(__DIR__ . '/../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler');
         $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
 
-        $fragmentHandler = $this->getMockBuilder(FragmentHandler::class);
-        $fragmentHandler->disableOriginalConstructor();
-        $fragmentHandler = $fragmentHandler->getMock();
+        $fragmentHandler = $this->createStub(FragmentHandler::class);
         $fragmentHandler->method('render')->willReturn('');
 
         $kernelRuntime = new HttpKernelRuntime($fragmentHandler);
 
-        $urlGenerator = $this->getMockBuilder(UrlGeneratorInterface::class)->getMock();
+        $urlGenerator = $this->createStub(UrlGeneratorInterface::class);
         $urlGenerator->method('generate')->willReturn('');
 
         if (class_exists(CodeExtension::class)) {
diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index 8384693dd..a643a2c16 100644
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -36,7 +36,7 @@ public function testGetDefaultEntityManagerName(): void
 
     public function testGetDefaultConnection(): void
     {
-        $conn      = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $conn      = $this->createStub(Connection::class);
         $container = new Container();
         $container->set('doctrine.dbal.default_connection', $conn);
 
@@ -47,7 +47,7 @@ public function testGetDefaultConnection(): void
 
     public function testGetConnection(): void
     {
-        $conn      = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $conn      = $this->createStub(Connection::class);
         $container = new Container();
         $container->set('doctrine.dbal.default_connection', $conn);
 
@@ -74,7 +74,7 @@ public function testGetConnectionNames(): void
 
     public function testGetDefaultEntityManager(): void
     {
-        $em        = $this->createMock(ObjectManager::class);
+        $em        = $this->createStub(ObjectManager::class);
         $container = new Container();
         $container->set('doctrine.orm.default_entity_manager', $em);
 
@@ -85,7 +85,7 @@ public function testGetDefaultEntityManager(): void
 
     public function testGetEntityManager(): void
     {
-        $em        = $this->createMock(ObjectManager::class);
+        $em        = $this->createStub(ObjectManager::class);
         $container = new Container();
         $container->set('doctrine.orm.default_entity_manager', $em);
 
diff --git a/tests/Repository/ServiceEntityRepositoryTest.php b/tests/Repository/ServiceEntityRepositoryTest.php
index eab026a84..db1f91c14 100644
--- a/tests/Repository/ServiceEntityRepositoryTest.php
+++ b/tests/Repository/ServiceEntityRepositoryTest.php
@@ -25,7 +25,7 @@ public static function setUpBeforeClass(): void
 
     public function testConstructorThrowsExceptionWhenNoManagerFound(): void
     {
-        $registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();
+        $registry = $this->createStub(ManagerRegistry::class);
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(<<<'EXCEPTION'
 Could not find the entity manager for class "Doctrine\Bundle\DoctrineBundle\Tests\Repository\TestEntity". Check your Doctrine configuration to make sure it is configured to load this entity’s metadata.
diff --git a/tests/ServiceRepositoryTest.php b/tests/ServiceRepositoryTest.php
index 6cde5b384..1e99c19f4 100644
--- a/tests/ServiceRepositoryTest.php
+++ b/tests/ServiceRepositoryTest.php
@@ -44,8 +44,10 @@ public function testRepositoryServiceWiring(): void
             'kernel.build_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.bundles_metadata' => [],
             'kernel.charset' => 'UTF-8',
             'kernel.container_class' => ContainerBuilder::class,
diff --git a/tests/Twig/DoctrineExtensionTest.php b/tests/Twig/DoctrineExtensionTest.php
index 02e613034..78bb14512 100644
--- a/tests/Twig/DoctrineExtensionTest.php
+++ b/tests/Twig/DoctrineExtensionTest.php
@@ -113,6 +113,11 @@ public function testEscapeBooleanParameter(): void
     {
         $this->assertEquals('1', DoctrineExtension::escapeFunction(true));
     }
+
+    public function testNoEscapeFloatParameter(): void
+    {
+        $this->assertEquals(1.1, DoctrineExtension::escapeFunction(1.1));
+    }
 }
 
 class DummyClass