Merge branch '8.5' into 9.6

sebastianbergmann · Mar 19, 2023 · b92dfee · b92dfee
2 parents f1060f8 + c61908f
commit b92dfee
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 48 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -67,7 +67,7 @@
         'cast_spaces' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'const' => 'one',
+                'const' => 'none',
                 'method' => 'one',
                 'property' => 'one'
             ]

diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -72,7 +72,6 @@ public function __clone(): void
     }
 }
 EOT;
-
     private const MOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT = <<<'EOT'
 namespace PHPUnit\Framework\MockObject;
 
@@ -84,7 +83,6 @@ public function __clone()
     }
 }
 EOT;
-
     private const UNMOCKED_CLONE_METHOD_WITH_VOID_RETURN_TYPE_TRAIT = <<<'EOT'
 namespace PHPUnit\Framework\MockObject;
 
@@ -98,7 +96,6 @@ public function __clone(): void
     }
 }
 EOT;
-
     private const UNMOCKED_CLONE_METHOD_WITHOUT_RETURN_TYPE_TRAIT = <<<'EOT'
 namespace PHPUnit\Framework\MockObject;
 

diff --git a/src/TextUI/CliArguments/Builder.php b/src/TextUI/CliArguments/Builder.php
@@ -121,7 +121,6 @@ final class Builder
         'whitelist=',
         'dump-xdebug-filter=',
     ];
-
     private const SHORT_OPTIONS = 'd:c:hv';
 
     public function fromParameters(array $parameters, array $additionalLongOptions): Configuration

diff --git a/src/TextUI/DefaultResultPrinter.php b/src/TextUI/DefaultResultPrinter.php
@@ -47,23 +47,15 @@
  */
 class DefaultResultPrinter extends Printer implements ResultPrinter
 {
-    public const EVENT_TEST_START = 0;
-
-    public const EVENT_TEST_END = 1;
-
+    public const EVENT_TEST_START      = 0;
+    public const EVENT_TEST_END        = 1;
     public const EVENT_TESTSUITE_START = 2;
-
-    public const EVENT_TESTSUITE_END = 3;
-
-    public const COLOR_NEVER = 'never';
-
-    public const COLOR_AUTO = 'auto';
-
-    public const COLOR_ALWAYS = 'always';
-
-    public const COLOR_DEFAULT = self::COLOR_NEVER;
-
-    private const AVAILABLE_COLORS = [self::COLOR_NEVER, self::COLOR_AUTO, self::COLOR_ALWAYS];
+    public const EVENT_TESTSUITE_END   = 3;
+    public const COLOR_NEVER           = 'never';
+    public const COLOR_AUTO            = 'auto';
+    public const COLOR_ALWAYS          = 'always';
+    public const COLOR_DEFAULT         = self::COLOR_NEVER;
+    private const AVAILABLE_COLORS     = [self::COLOR_NEVER, self::COLOR_AUTO, self::COLOR_ALWAYS];
 
     /**
      * @var int

diff --git a/src/TextUI/Help.php b/src/TextUI/Help.php
@@ -27,8 +27,7 @@
 final class Help
 {
     private const LEFT_MARGIN = '  ';
-
-    private const HELP_TEXT = [
+    private const HELP_TEXT   = [
         'Usage' => [
             ['text' => 'phpunit [options] UnitTest.php'],
             ['text' => 'phpunit [options] <directory>'],

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -88,10 +88,8 @@
  */
 final class TestRunner extends BaseTestRunner
 {
-    public const SUCCESS_EXIT = 0;
-
-    public const FAILURE_EXIT = 1;
-
+    public const SUCCESS_EXIT   = 0;
+    public const FAILURE_EXIT   = 1;
     public const EXCEPTION_EXIT = 2;
 
     /**

diff --git a/src/Util/Annotation/DocBlock.php b/src/Util/Annotation/DocBlock.php
@@ -67,17 +67,12 @@ final class DocBlock
      */
     public const REGEX_DATA_PROVIDER = '/@dataProvider\s+([a-zA-Z0-9._:-\\\\x7f-\xff]+)/';
 
-    private const REGEX_REQUIRES_VERSION = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m';
-
+    private const REGEX_REQUIRES_VERSION            = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m';
     private const REGEX_REQUIRES_VERSION_CONSTRAINT = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<constraint>[\d\t \-.|~^]+)[ \t]*\r?$/m';
-
-    private const REGEX_REQUIRES_OS = '/@requires\s+(?P<name>OS(?:FAMILY)?)\s+(?P<value>.+?)[ \t]*\r?$/m';
-
-    private const REGEX_REQUIRES_SETTING = '/@requires\s+(?P<name>setting)\s+(?P<setting>([^ ]+?))\s*(?P<value>[\w\.-]+[\w\.]?)?[ \t]*\r?$/m';
-
-    private const REGEX_REQUIRES = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^\s<>=!]+))\s*(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+[\d\.]?)?[ \t]*\r?$/m';
-
-    private const REGEX_TEST_WITH = '/@testWith\s+/';
+    private const REGEX_REQUIRES_OS                 = '/@requires\s+(?P<name>OS(?:FAMILY)?)\s+(?P<value>.+?)[ \t]*\r?$/m';
+    private const REGEX_REQUIRES_SETTING            = '/@requires\s+(?P<name>setting)\s+(?P<setting>([^ ]+?))\s*(?P<value>[\w\.-]+[\w\.]?)?[ \t]*\r?$/m';
+    private const REGEX_REQUIRES                    = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^\s<>=!]+))\s*(?P<operator>[<>=!]{0,2})\s*(?P<version>[\d\.-]+[\d\.]?)?[ \t]*\r?$/m';
+    private const REGEX_TEST_WITH                   = '/@testWith\s+/';
 
     /** @var string */
     private $docComment;

diff --git a/src/Util/TestDox/CliTestDoxPrinter.php b/src/Util/TestDox/CliTestDoxPrinter.php
@@ -66,7 +66,6 @@ class CliTestDoxPrinter extends TestDoxPrinter
         " \e[36m◑\e[0m running tests",
         " \e[36m◒\e[0m running tests",
     ];
-
     private const STATUS_STYLES = [
         BaseTestRunner::STATUS_PASSED => [
             'symbol' => '✔',

diff --git a/tests/end-to-end/regression/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/end-to-end/regression/2724/SeparateClassRunMethodInNewProcessTest.php
@@ -14,11 +14,9 @@
  */
 final class SeparateClassRunMethodInNewProcessTest extends TestCase
 {
-    public const PROCESS_ID_FILE_PATH = __DIR__ . '/parent_process_id.txt';
-
+    public const PROCESS_ID_FILE_PATH      = __DIR__ . '/parent_process_id.txt';
     public const INITIAL_PARENT_PROCESS_ID = 0;
-
-    public const INITIAL_PROCESS_ID = 1;
+    public const INITIAL_PROCESS_ID        = 1;
 
     public static $parentProcessId = self::INITIAL_PARENT_PROCESS_ID;
 

diff --git a/tests/unit/Runner/PhptTestCaseTest.php b/tests/unit/Runner/PhptTestCaseTest.php
@@ -31,7 +31,6 @@ final class PhptTestCaseTest extends TestCase
 --EXPECT--
 Hello PHPUnit!
 EOF;
-
     private const EXPECTF_CONTENT = <<<'EOF'
 --TEST--
 EXPECTF test
@@ -40,7 +39,6 @@ final class PhptTestCaseTest extends TestCase
 --EXPECTF--
 Hello %s!
 EOF;
-
     private const EXPECTREGEX_CONTENT = <<<'EOF'
 --TEST--
 EXPECTREGEX test
@@ -49,15 +47,13 @@ final class PhptTestCaseTest extends TestCase
 --EXPECTREGEX--
 Hello [HPU]{4}[nit]{3}!
 EOF;
-
     private const EXPECT_MISSING_ASSERTION_CONTENT = <<<'EOF'
 --TEST--
 Missing EXPECTF value test
 --EXPECTF--
 --FILE--
 <?php echo "Hello PHPUnit!"; ?>
 EOF;
-
     private const FILE_SECTION = <<<'EOF'
 <?php echo "Hello PHPUnit!"; ?>
 

diff --git a/tests/unit/Runner/TestSuiteSorterTest.php b/tests/unit/Runner/TestSuiteSorterTest.php
@@ -34,8 +34,7 @@ final class TestSuiteSorterTest extends TestCase
      */
     private const IGNORE_DEPENDENCIES = false;
 
-    private const RESOLVE_DEPENDENCIES = true;
-
+    private const RESOLVE_DEPENDENCIES                = true;
     private const MULTIDEPENDENCYTEST_EXECUTION_ORDER = [
         MultiDependencyTest::class . '::testOne',
         MultiDependencyTest::class . '::testTwo',