Merge branch '3.7'

brobie · Dec 2, 2012 · b2652e9 · b2652e9
2 parents 8b4ca87 + 839326a
commit b2652e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/PHPUnit/Util/Filter.php b/PHPUnit/Util/Filter.php
@@ -68,8 +68,8 @@ public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
         $prefix = FALSE;
         $script = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
 
-        if (substr($script, -5) == '.phar') {
-            $prefix = 'phar://' . $script . '/';
+        if (defined('__PHPUNIT_PHAR__')) {
+            $prefix = 'phar://' . __PHPUNIT_PHAR__ . '/';
         }
 
         if (!defined('PHPUNIT_TESTSUITE')) {

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

diff --git a/build/phar-autoload.php.in b/build/phar-autoload.php.in
@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+define('__PHPUNIT_PHAR__', realpath($GLOBALS['_SERVER']['SCRIPT_NAME']));
+
 spl_autoload_register(
   function ($class)
   {
@@ -19,6 +21,7 @@ spl_autoload_register(
   }
 );
 
+Phar::mapPhar('___PHAR___');
 PHPUnit_TextUI_Command::main();
 
 __HALT_COMPILER();