Merge branch '1.12.x' into 2.0.x

* 1.12.x:
  Update comment on the schema_filter key
  Add minimal compatibility with changes in DBAL 2.11 RunSqlCommand
  Fix CS
  Fix dead link to DBAL docs
  Update deprecation messages to follow the Symfony convention
  Fix render controller when explaining a query
  Update namespace
  Document UOW reset introduced since 1.12.3/2.0.3

Command/Proxy/RunSqlDoctrineCommand.php

@@ -21,14 +21,19 @@ protected function configure()
 
         $this
             ->setName('doctrine:query:sql')
-            ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command')
             ->setHelp(<<<EOT
 The <info>%command.name%</info> command executes the given SQL query and
 outputs the results:
 
 <info>php %command.full_name% "SELECT * FROM users"</info>
 EOT
         );
+
+        if ($this->getDefinition()->hasOption('connection')) {
+            return;
+        }
+
+        $this->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command');
     }
 
     /**

Resources/doc/configuration.rst

@@ -95,8 +95,9 @@ Configuration Reference
                         platform_service:     ~
                         auto_commit:          ~
 
-                        # If set to "/^sf2_/" all tables not prefixed with "sf2_" will be ignored by the schema
-                        # tool. This is for custom tables which should not be altered automatically.
+                        # If set to "/^sf2_/" all tables, and any named objects such as sequences
+                        # not prefixed with "sf2_" will be ignored by the schema tool.
+                        # This is for custom tables which should not be altered automatically.
                         schema_filter:        ~
 
                         # When true, queries are logged to a "doctrine" monolog channel