Merge branch '6.5' into 7.3

sebastianbergmann · Sep 7, 2018 · c224852 · c224852
2 parents 768a864 + 5edce73
commit c224852
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -1080,6 +1080,7 @@ protected function showHelp(): void
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format
   --whitelist <dir>           Whitelist <dir> for code coverage analysis
   --disable-coverage-ignore   Disable annotations for ignoring code coverage
+  --no-coverage               Ignore code coverage configuration
 
 Logging Options:
 
@@ -1151,7 +1152,6 @@ protected function showHelp(): void
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
-  --no-coverage               Ignore code coverage configuration
   --no-logging                Ignore logging configuration
   --no-extensions             Do not load PHPUnit extensions
   --include-path <path(s)>    Prepend PHP's include_path with given path(s)

diff --git a/tests/end-to-end/help.phpt b/tests/end-to-end/help.phpt
@@ -23,6 +23,7 @@ Code Coverage Options:
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format
   --whitelist <dir>           Whitelist <dir> for code coverage analysis
   --disable-coverage-ignore   Disable annotations for ignoring code coverage
+  --no-coverage               Ignore code coverage configuration
 
 Logging Options:
 
@@ -94,7 +95,6 @@ Configuration Options:
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
-  --no-coverage               Ignore code coverage configuration
   --no-logging                Ignore logging configuration
   --no-extensions             Do not load PHPUnit extensions
   --include-path <path(s)>    Prepend PHP's include_path with given path(s)

diff --git a/tests/end-to-end/help2.phpt b/tests/end-to-end/help2.phpt
@@ -24,6 +24,7 @@ Code Coverage Options:
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format
   --whitelist <dir>           Whitelist <dir> for code coverage analysis
   --disable-coverage-ignore   Disable annotations for ignoring code coverage
+  --no-coverage               Ignore code coverage configuration
 
 Logging Options:
 
@@ -95,7 +96,6 @@ Configuration Options:
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file (phpunit.xml)
-  --no-coverage               Ignore code coverage configuration
   --no-logging                Ignore logging configuration
   --no-extensions             Do not load PHPUnit extensions
   --include-path <path(s)>    Prepend PHP's include_path with given path(s)