Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 4140842e3278 · 2019-07-05T08:33:37.000+02:00
* 3.4:
  [PhpUnitBridge] fix running simple-phpunit on Windows
  fixed phpdocs
diff --git a/Definition/ArrayNode.php b/Definition/ArrayNode.php
@@ -141,7 +141,7 @@ public function setPerformDeepMerging($boolean)
     }
 
     /**
-     * Whether extra keys should just be ignore without an exception.
+     * Whether extra keys should just be ignored without an exception.
      *
      * @param bool $boolean To allow extra keys
      * @param bool $remove  To remove extra keys

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function setPerformDeepMerging($boolean)`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/**`
`144`		`- * Whether extra keys should just be ignore without an exception.`
	`144`	`+ * Whether extra keys should just be ignored without an exception.`
`145`	`145`	`*`
`146`	`146`	`* @param bool $boolean To allow extra keys`
`147`	`147`	`* @param bool $remove To remove extra keys`