Merge pull request #496 from doctrine/3.2.x-merge-up-into-3.3.x_0oMNZ8bR

Author: greg0ire

Collector/MigrationsCollector.php

@@ -82,6 +82,9 @@ public function getData()
         return $this->data;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->data = [];

DependencyInjection/Configuration.php

@@ -148,7 +148,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
                 ->booleanNode('enable_profiler')
-                    ->info('Use profiler to calculate and visualize migration status.')
+                    ->info('Whether or not to enable the profiler collector to calculate and visualize migration status. This adds some queries overhead.')
                     ->defaultFalse()
                 ->end()
                 ->booleanNode('transactional')

DoctrineMigrationsBundle.php

@@ -14,6 +14,7 @@
  */
 class DoctrineMigrationsBundle extends Bundle
 {
+    /** @return void */
     public function build(ContainerBuilder $container)
     {
       $container->addCompilerPass(new ConfigureDependencyFactoryPass());

README.markdown

@@ -1,7 +1,7 @@
 DoctrineMigrationsBundle
 ========================
 
-This bundle integrates the [Doctrine2 Migrations library](http://www.doctrine-project.org/projects/migrations.html)
+This bundle integrates the [Doctrine Migrations library](http://www.doctrine-project.org/projects/migrations.html)
 into Symfony applications. Database migrations help you version the changes in
 your database schema and apply them in a predictable way on every server running
 the application.

Resources/doc/index.rst

@@ -83,6 +83,9 @@ application:
         # Whether or not to wrap migrations in a single transaction.
         transactional: true
 
+        # Whether or not to enable the profiler collector to calculate and visualize migration status. This adds some queries overhead.
+        # enable_profiler: false
+
         services:
             # Custom migration sorting service id
             'Doctrine\Migrations\Version\Comparator': ~