Merge remote-tracking branch 'origin/2.2.x' into 3.0.x

greg0ire · greg0ire · commit bbd722f1d54a · 2020-06-25T21:59:43.000+02:00
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -9,6 +9,12 @@
       "slug": "3.0",
       "upcoming": true
     },
+    {
+      "name": "2.2",
+      "branchName": "2.2x",
+      "slug": "2.2",
+      "upcoming": true
+    },
     {
       "name": "2.1",
       "branchName": "2.1.x",
diff --git a/DependencyInjection/DoctrineMigrationsExtension.php b/DependencyInjection/DoctrineMigrationsExtension.php
@@ -30,7 +30,7 @@ class DoctrineMigrationsExtension extends Extension
     /**
      * Responds to the migrations configuration parameter.
      *
-     * @param string[][] $configs
+     * @param string[][]|array<string, array<string, array<string, string>|string>> $configs
      */
     public function load(array $configs, ContainerBuilder $container) : void
     {
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -358,7 +358,7 @@ just have to add the following configuration option to your doctrine configurati
 
     .. code-block:: xml
 
-        <doctrine:dbal schema-filter="~^(?!t_)~" ... />
+        <doctrine:dbal schema-filter="~^(?!t_)~" />
 
 
     .. code-block:: php
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class DoctrineMigrationsExtension extends Extension`
`30`	`30`	`/**`
`31`	`31`	`* Responds to the migrations configuration parameter.`
`32`	`32`	`*`
`33`		`- * @param string[][] $configs`
	`33`	`+ * @param string[][]\|array<string, array<string, array<string, string>\|string>> $configs`
`34`	`34`	`*/`
`35`	`35`	`public function load(array $configs, ContainerBuilder $container) : void`
`36`	`36`	`{`