Lower requirements to allow installing doctrine/doctrine-bundle on Symfony 3.4

Author: ste93cry

composer.json

@@ -32,7 +32,7 @@
         "symfony/security-core": "^3.4.43||^4.4.11||^5.0.11"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.2",
+        "doctrine/doctrine-bundle": "^1.12||^2.0",
         "friendsofphp/php-cs-fixer": "^2.17",
         "jangregor/phpstan-prophecy": "^0.8",
         "monolog/monolog": "^1.3||^2.0",

src/DependencyInjection/Configuration.php

@@ -154,9 +154,8 @@ private function addDistributedTracingSection(ArrayNodeDefinition $rootNode): vo
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->arrayNode('dbal')
-                            ->addDefaultsIfNotSet()
-                            ->fixXmlConfig('connection')
                             ->canBeEnabled()
+                            ->fixXmlConfig('connection')
                             ->children()
                                 ->arrayNode('connections')
                                     ->defaultValue(class_exists(DoctrineBundle::class) ? ['%doctrine.default_connection%'] : [])

src/Tracing/Doctrine/DBAL/TracingDriverConnection.php

@@ -89,8 +89,10 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $sql
      */
-    public function prepare(string $sql): Statement
+    public function prepare(/*string*/ $sql): Statement
     {
         return $this->traceFunction(self::SPAN_OP_CONN_PREPARE, $sql, function () use ($sql): Statement {
             return $this->decoratedConnection->prepare($sql);
@@ -99,8 +101,10 @@ public function prepare(string $sql): Statement
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $sql
      */
-    public function query(string $sql): Result
+    public function query(/*string*/ $sql): Result
     {
         return $this->traceFunction(self::SPAN_OP_CONN_QUERY, $sql, function () use ($sql): Result {
             return $this->decoratedConnection->query($sql);
@@ -117,8 +121,10 @@ public function quote($value, $type = ParameterType::STRING)
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $sql
      */
-    public function exec(string $sql): int
+    public function exec(/*string*/ $sql): int
     {
         return $this->traceFunction(self::SPAN_OP_CONN_EXEC, $sql, function () use ($sql): int {
             return $this->decoratedConnection->exec($sql);