Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit b78816d647c0 · 2019-07-05T08:35:01.000+02:00
* 4.2:
  [PhpUnitBridge] fix running simple-phpunit on Windows
  fixed phpdocs
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -127,8 +127,9 @@
     }
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
+    $q = '\\' === DIRECTORY_SEPARATOR ? '"' : '';
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
-    $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd()));
+    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", array(), $p, getcwd()));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {
         exit($exit);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -52,6 +52,9 @@ protected function listBundles($output)
         }
     }
 
+    /**
+     * @return ExtensionInterface
+     */
     protected function findExtension($name)
     {
         $bundles = $this->initializeBundles();
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/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
`@@ -52,6 +52,9 @@ protected function listBundles($output)`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ /**`
	`56`	`+ * @return ExtensionInterface`
	`57`	`+ */`
`55`	`58`	`protected function findExtension($name)`
`56`	`59`	`{`
`57`	`60`	`$bundles = $this->initializeBundles();`
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`