Closes #2467

sebastianbergmann · Feb 3, 2017 · 574ba76 · 574ba76
1 parent bad05da
commit 574ba76
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/ChangeLog-6.0.md b/ChangeLog-6.0.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 6.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.0.3] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2467](https://github.com/sebastianbergmann/phpunit/issues/2467): Process Isolation does not work when using PHPUnit from PHAR
+
 ## [6.0.2] - 2017-02-03
 
 ### Fixed
@@ -68,6 +74,7 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 * DbUnit is no longer bundled in the PHAR distribution of PHPUnit
 * PHPUnit is no longer supported on PHP 5.6
 
+[6.0.3]: https://github.com/sebastianbergmann/phpunit/compare/6.0.2...6.0.3
 [6.0.2]: https://github.com/sebastianbergmann/phpunit/compare/6.0.1...6.0.2
 [6.0.1]: https://github.com/sebastianbergmann/phpunit/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/sebastianbergmann/phpunit/compare/5.7...6.0.0

diff --git a/build/binary-phar-autoload.php.in b/build/binary-phar-autoload.php.in
@@ -14,18 +14,26 @@ if (version_compare('7.0.0', PHP_VERSION, '>')) {
     die(1);
 }
 
+if (__FILE__ == realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
+    $execute = true;
+} else {
+    $execute = false;
+}
+
 define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', __FILE__));
 define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
 
 Phar::mapPhar('___PHAR___');
 
 ___FILELIST___
 
-if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
-    print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
-    exit;
-}
+if ($execute) {
+    if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
+        print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
+        exit;
+    }
 
-PHPUnit\TextUI\Command::main();
+    PHPUnit\TextUI\Command::main();
+}
 
 __HALT_COMPILER();