[ticket/16741] General fixes

PHPBB3-16741

phpBB/config/default/container/services.yml

@@ -7,7 +7,6 @@ imports:
     - { resource: services_content.yml }
     - { resource: services_cron.yml }
     - { resource: services_db.yml }
-    - { resource: services_doctrine.yml }
     - { resource: services_event.yml }
     - { resource: services_extensions.yml }
     - { resource: services_feed.yml }

phpBB/config/default/container/services_db.yml

@@ -7,7 +7,10 @@ services:
     dbal.conn.driver:
         synthetic: true
 
-# ----- DB Tools -----
+    dbal.conn.doctrine:
+        synthetic: true
+
+    # ----- DB Tools -----
     dbal.tools.factory:
         class: phpbb\db\tools\factory
 
@@ -15,7 +18,7 @@ services:
         class: phpbb\db\tools\tools_interface
         factory: ['@dbal.tools.factory', get]
         arguments:
-            - '@dbal.conn.driver'
+            - '@dbal.conn.doctrine'
 
 # ----- DB Extractor -----
     dbal.extractor.factory:

phpBB/config/default/container/services_doctrine.yml

@@ -1,5 +0,0 @@
-services:
-    doctrine.connection:
-        class: Doctrine\DBAL\Connection
-        factory: ['phpbb\db\doctrine\connection_factory', 'get_connection']
-        arguments: ['@config.php']