Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 02a25fe

Browse filesBrowse files
committed
Merge branch '3.4' into 4.2
* 3.4: Fixes windows error Annotated correct return type for getInEdges()/getOutEdges().
2 parents c33c396 + 1dc3b4a commit 02a25fe
Copy full SHA for 02a25fe

File tree

Expand file treeCollapse file tree

2 files changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+3
-3
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
127127
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
128128
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
129129
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
130-
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
130+
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p));
131131
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
132132
if ($exit) {
133133
exit($exit);

‎src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function getId()
8181
/**
8282
* Returns the in edges.
8383
*
84-
* @return array The in ServiceReferenceGraphEdge array
84+
* @return ServiceReferenceGraphEdge[]
8585
*/
8686
public function getInEdges()
8787
{
@@ -91,7 +91,7 @@ public function getInEdges()
9191
/**
9292
* Returns the out edges.
9393
*
94-
* @return array The out ServiceReferenceGraphEdge array
94+
* @return ServiceReferenceGraphEdge[]
9595
*/
9696
public function getOutEdges()
9797
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.