diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.2 

* 3.4:
  Fixes windows error
  Annotated correct return type for getInEdges()/getOutEdges().
This commit is contained in:
Fabien Potencier 2019-07-03 19:14:02 +02:00
parent c33c396a63 1dc3b4aaad
commit 02a25fe518
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
View File

@ -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);

4
src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
View File

@ -81,7 +81,7 @@ class ServiceReferenceGraphNode
/**
* Returns the in edges.
*
* @return array The in ServiceReferenceGraphEdge array
* @return ServiceReferenceGraphEdge[]
*/
public function getInEdges()
{
@ -91,7 +91,7 @@ class ServiceReferenceGraphNode
/**
* Returns the out edges.
*
* @return array The out ServiceReferenceGraphEdge array
* @return ServiceReferenceGraphEdge[]
*/
public function getOutEdges()
{