Permalink
Browse files

Merge branch '3.4' into 3.5

  • Loading branch information...
2 parents 9de08ce + 849380e commit b1a90172020ee46645e18e4dd7aa8f097a82fdbe @sebastianbergmann committed Jan 1, 2010
Showing with 9 additions and 0 deletions.
  1. +9 −0 PHPUnit/Util/File.php
View
@@ -240,6 +240,15 @@ protected static function parseFile($filename)
break;
case T_FUNCTION: {
+ if (!((is_array($tokens[$i+2]) &&
+ $tokens[$i+2][0] == T_STRING) ||
+ (is_string($tokens[$i+2]) &&
+ $tokens[$i+2] == '&' &&
+ is_array($tokens[$i+3]) &&
+ $tokens[$i+3][0] == T_STRING))) {
+ continue;
+ }
+
$currentBlock = T_FUNCTION;
$currentFunctionStartLine = $line;

0 comments on commit b1a9017

Please sign in to comment.