From bb1d32b9f6efd49eaefc6b998302fc59c4b5d4fc Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Wed, 12 Aug 2020 10:20:05 +0200
Subject: [PATCH] Move help for --no-logging option to logging section

---
 src/TextUI/Help.php                                   | 2 +-
 tests/end-to-end/cli/_files/output-cli-help-color.txt | 2 +-
 tests/end-to-end/cli/_files/output-cli-usage.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TextUI/Help.php b/src/TextUI/Help.php
index 0b1094cccff..4d3fd4121ff 100644
--- a/src/TextUI/Help.php
+++ b/src/TextUI/Help.php
@@ -44,6 +44,7 @@ final class Help
             ['arg' => '--testdox-text <file>', 'desc' => 'Write agile documentation in Text format to file'],
             ['arg' => '--testdox-xml <file>', 'desc' => 'Write agile documentation in XML format to file'],
             ['arg' => '--reverse-list', 'desc' => 'Print defects in reverse order'],
+            ['arg' => '--no-logging', 'desc' => 'Ignore logging configuration'],
         ],
 
         'Test Selection Options' => [
@@ -112,7 +113,6 @@ final class Help
             ['arg' => '--bootstrap <file>', 'desc' => 'A PHP script that is included before the tests run'],
             ['arg' => '-c|--configuration <file>', 'desc' => 'Read configuration from XML file'],
             ['arg' => '--no-configuration', 'desc' => 'Ignore default configuration file (phpunit.xml)'],
-            ['arg' => '--no-logging', 'desc' => 'Ignore logging configuration'],
             ['arg' => '--no-extensions', 'desc' => 'Do not load PHPUnit extensions'],
             ['arg' => '--include-path <path(s)>', 'desc' => 'Prepend PHP\'s include_path with given path(s)'],
             ['arg' => '-d <key[=value]>', 'desc' => 'Sets a php.ini value'],
diff --git a/tests/end-to-end/cli/_files/output-cli-help-color.txt b/tests/end-to-end/cli/_files/output-cli-help-color.txt
index 4d3b2d3629e..0721a2e8d46 100644
--- a/tests/end-to-end/cli/_files/output-cli-help-color.txt
+++ b/tests/end-to-end/cli/_files/output-cli-help-color.txt
@@ -34,6 +34,7 @@
   --testdox-xml <file>        Write agile documentation in XML format
                               to file
   --reverse-list              Print defects in reverse order
+  --no-logging                Ignore logging configuration
 
 Test Selection Options:
   --filter <pattern>          Filter which tests to run
@@ -114,7 +115,6 @@
   -c|--configuration <file>   Read configuration from XML file
   --no-configuration          Ignore default configuration file
                               (phpunit.xml)
-  --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/cli/_files/output-cli-usage.txt b/tests/end-to-end/cli/_files/output-cli-usage.txt
index da9609a8b2d..eeecfee839c 100644
--- a/tests/end-to-end/cli/_files/output-cli-usage.txt
+++ b/tests/end-to-end/cli/_files/output-cli-usage.txt
@@ -25,6 +25,7 @@ Logging Options:
   --testdox-text <file>       Write agile documentation in Text format to file
   --testdox-xml <file>        Write agile documentation in XML format to file
   --reverse-list              Print defects in reverse order
+  --no-logging                Ignore logging configuration
 
 Test Selection Options:
 
@@ -89,7 +90,6 @@ Configuration Options:
   --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
   --no-extensions             Do not load PHPUnit extensions
   --include-path <path(s)>    Prepend PHP's include_path with given path(s)
   -d <key[=value]>            Sets a php.ini value