Closes #1926

sebastianbergmann · Aug 19, 2016 · 5e6595f · 5e6595f
1 parent 7e48a0b
commit 5e6595f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/ChangeLog-6.0.md b/ChangeLog-6.0.md
@@ -9,6 +9,7 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 * `setUpBeforeClass()` is now invoked after all methods annotated with `@beforeClass`
 * `setUp()` is now invoked after all methods annotated with `@before`
 * Added `addWarning()` method to `PHPUnit\Framework\TestListener` interface
+* The binary PHAR is now binary-only and cannot be used as a library anymore
 
 ### Removed
 

diff --git a/build/binary-phar-autoload.php.in b/build/binary-phar-autoload.php.in
@@ -9,26 +9,18 @@ if (PHP_MAJOR_VERSION < 7) {
     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 ($execute) {
-    if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
-        print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
-        exit;
-    }
-
-    PHPUnit_TextUI_Command::main();
+if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
+    print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
+    exit;
 }
 
+PHPUnit_TextUI_Command::main();
+
 __HALT_COMPILER();