Merge branch '3.4' into 4.2
* 3.4: Fixes windows error Annotated correct return type for getInEdges()/getOutEdges().
This commit is contained in:
commit
02a25fe518
|
@ -127,7 +127,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
|
||||||
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
|
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
|
||||||
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
|
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
|
// --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 : ''));
|
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
|
||||||
if ($exit) {
|
if ($exit) {
|
||||||
exit($exit);
|
exit($exit);
|
||||||
|
|
|
@ -81,7 +81,7 @@ class ServiceReferenceGraphNode
|
||||||
/**
|
/**
|
||||||
* Returns the in edges.
|
* Returns the in edges.
|
||||||
*
|
*
|
||||||
* @return array The in ServiceReferenceGraphEdge array
|
* @return ServiceReferenceGraphEdge[]
|
||||||
*/
|
*/
|
||||||
public function getInEdges()
|
public function getInEdges()
|
||||||
{
|
{
|
||||||
|
@ -91,7 +91,7 @@ class ServiceReferenceGraphNode
|
||||||
/**
|
/**
|
||||||
* Returns the out edges.
|
* Returns the out edges.
|
||||||
*
|
*
|
||||||
* @return array The out ServiceReferenceGraphEdge array
|
* @return ServiceReferenceGraphEdge[]
|
||||||
*/
|
*/
|
||||||
public function getOutEdges()
|
public function getOutEdges()
|
||||||
{
|
{
|
||||||
|
|
Reference in New Issue