Use realpath() on SCRIPT_NAME as Composer invokes PHPUnit through a s…

…ymlinked script.
brobie · Oct 6, 2012 · 4c5545c · 4c5545c
1 parent 39461cf
commit 4c5545c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/PHPUnit/Util/Filter.php b/PHPUnit/Util/Filter.php
@@ -66,9 +66,10 @@ class PHPUnit_Util_Filter
     public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
     {
         $prefix = FALSE;
+        $script = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
 
-        if (substr($GLOBALS['_SERVER']['SCRIPT_NAME'], -5) == '.phar') {
-            $prefix = 'phar://' . $GLOBALS['_SERVER']['SCRIPT_NAME'] . '/';
+        if (substr($script, -5) == '.phar') {
+            $prefix = 'phar://' . $script . '/';
         }
 
         if (!defined('PHPUNIT_TESTSUITE')) {
@@ -107,7 +108,7 @@ public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
             if (isset($frame['file']) && is_file($frame['file']) &&
                 !isset($blacklist[$frame['file']]) &&
                 strpos($frame['file'], $prefix) !== 0 &&
-                $frame['file'] !== $GLOBALS['_SERVER']['SCRIPT_NAME']) {
+                $frame['file'] !== $script) {
                 if ($asString === TRUE) {
                     $filteredStacktrace .= sprintf(
                       "%s:%s\n",

diff --git a/PHPUnit/Util/GlobalState.php b/PHPUnit/Util/GlobalState.php
@@ -193,9 +193,10 @@ public static function getIncludedFilesAsString()
         $files     = get_included_files();
         $prefix    = FALSE;
         $result    = '';
+        $script    = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
 
-        if (substr($GLOBALS['_SERVER']['SCRIPT_NAME'], -5) == '.phar') {
-            $prefix = 'phar://' . $GLOBALS['_SERVER']['SCRIPT_NAME'] . '/';
+        if (substr($script, -5) == '.phar') {
+            $prefix = 'phar://' . $script . '/';
         }
 
         for ($i = count($files) - 1; $i > 0; $i--) {