More work on #3290

sebastianbergmann · Sep 8, 2018 · 8fbbd7f · 8fbbd7f
1 parent 6688c2f
commit 8fbbd7f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/build/binary-phar-autoload.php.in b/build/binary-phar-autoload.php.in
@@ -21,10 +21,10 @@ if (__FILE__ === realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
     $execute = false;
 }
 
-$options = getopt('', array('prepend-file:', 'manifest'));
+$options = getopt('', array('prepend:', 'manifest'));
 
-if (isset($options['prepend-file'])) {
-    require $options['prepend-file'];
+if (isset($options['prepend'])) {
+    require $options['prepend'];
 }
 
 if (isset($options['manifest'])) {

diff --git a/phpunit b/phpunit
@@ -48,10 +48,10 @@ if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
     die(1);
 }
 
-$options = getopt('', array('prepend-file:'));
+$options = getopt('', array('prepend:'));
 
-if (isset($options['prepend-file'])) {
-    require $options['prepend-file'];
+if (isset($options['prepend'])) {
+    require $options['prepend'];
 }
 
 unset($options);

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -67,6 +67,7 @@ class Command
      */
     protected $longOptions = [
         'atleast-version='          => null,
+        'prepend='                  => null,
         'bootstrap='                => null,
         'cache-result'              => null,
         'cache-result-file='        => null,
@@ -142,7 +143,6 @@ class Command
         'version'                   => null,
         'whitelist='                => null,
         'dump-xdebug-filter='       => null,
-        'prepend-file='             => null,
     ];
 
     /**
@@ -1164,7 +1164,8 @@ protected function showHelp(): void
 
 Configuration Options:
 
-  --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
+  --prepend <file>            A PHP script that is included as early as possible
+  --bootstrap <file>          A PHP script that is included before the tests run
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
   --no-logging                Ignore logging configuration

diff --git a/tests/end-to-end/help.phpt b/tests/end-to-end/help.phpt
@@ -94,7 +94,8 @@ Test Execution Options:
 
 Configuration Options:
 
-  --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
+  --prepend <file>            A PHP script that is included as early as possible
+  --bootstrap <file>          A PHP script that is included before the tests run
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
   --no-logging                Ignore logging configuration

diff --git a/tests/end-to-end/help2.phpt b/tests/end-to-end/help2.phpt
@@ -95,7 +95,8 @@ Test Execution Options:
 
 Configuration Options:
 
-  --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
+  --prepend <file>            A PHP script that is included as early as possible
+  --bootstrap <file>          A PHP script that is included before the tests run
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
   --no-logging                Ignore logging configuration