Merge branch '3.4' into 4.2

fabpot · fabpot · commit 02a25fe51803 · 2019-07-03T19:14:02.000+02:00
* 3.4:
  Fixes windows error
  Annotated correct return type for getInEdges()/getOutEdges().
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -127,7 +127,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     // --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(), null, array('bypass_shell' => true)));
+    $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {
         exit($exit);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -81,7 +81,7 @@ public function getId()
     /**
      * Returns the in edges.
      *
-     * @return array The in ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getInEdges()
     {
@@ -91,7 +91,7 @@ public function getInEdges()
     /**
      * Returns the out edges.
      *
-     * @return array The out ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getOutEdges()
     {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getId()`
`81`	`81`	`/**`
`82`	`82`	`* Returns the in edges.`
`83`	`83`	`*`
`84`		`- * @return array The in ServiceReferenceGraphEdge array`
	`84`	`+ * @return ServiceReferenceGraphEdge[]`
`85`	`85`	`*/`
`86`	`86`	`public function getInEdges()`
`87`	`87`	`{`
`@@ -91,7 +91,7 @@ public function getInEdges()`
`91`	`91`	`/**`
`92`	`92`	`* Returns the out edges.`
`93`	`93`	`*`
`94`		`- * @return array The out ServiceReferenceGraphEdge array`
	`94`	`+ * @return ServiceReferenceGraphEdge[]`
`95`	`95`	`*/`
`96`	`96`	`public function getOutEdges()`
`97`	`97`	`{`