Merge branch '9.6' into 10.5

sebastianbergmann · sebastianbergmann · commit 0cef856509ba · 2024-03-05T17:04:03.000+01:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -103,7 +103,7 @@
         'explicit_string_variable' => true,
         'fopen_flag_order' => true,
         'full_opening_tag' => true,
-        'fully_qualified_strict_types' => true,
+        'fully_qualified_strict_types' => ['import_symbols' => true],
         'function_declaration' => true,
         'function_to_constant' => true,
         'get_class_to_class_keyword' => true,
diff --git a/src/Framework/Constraint/Traversable/TraversableContainsOnly.php b/src/Framework/Constraint/Traversable/TraversableContainsOnly.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Framework\Constraint;
 
+use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\ExpectationFailedException;
 
 /**
@@ -20,7 +21,7 @@ final class TraversableContainsOnly extends Constraint
     private readonly string $type;
 
     /**
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      */
     public function __construct(string $type, bool $isNativeType = true)
     {
diff --git a/src/Framework/MockObject/MockBuilder.php b/src/Framework/MockObject/MockBuilder.php
@@ -12,6 +12,7 @@
 use function array_merge;
 use function assert;
 use function trait_exists;
+use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\InvalidArgumentException;
 use PHPUnit\Framework\MockObject\Generator\ClassAlreadyExistsException;
 use PHPUnit\Framework\MockObject\Generator\ClassIsEnumerationException;
@@ -120,7 +121,7 @@ public function getMock(): MockObject
      *
      * @psalm-return MockObject&MockedType
      *
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      * @throws ReflectionException
      * @throws RuntimeException
      *
@@ -151,7 +152,7 @@ public function getMockForAbstractClass(): MockObject
      *
      * @psalm-return MockObject&MockedType
      *
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      * @throws ReflectionException
      * @throws RuntimeException
      *
diff --git a/src/Framework/TestRunner.php b/src/Framework/TestRunner.php
@@ -37,6 +37,7 @@
 use PHPUnit\Util\PHP\AbstractPhpProcess;
 use ReflectionClass;
 use SebastianBergmann\CodeCoverage\Exception as OriginalCodeCoverageException;
+use SebastianBergmann\CodeCoverage\InvalidArgumentException;
 use SebastianBergmann\CodeCoverage\StaticAnalysisCacheNotConfiguredException;
 use SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException;
 use SebastianBergmann\Invoker\Invoker;
@@ -59,8 +60,8 @@ public function __construct()
 
     /**
      * @throws \PHPUnit\Runner\Exception
-     * @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
      * @throws CodeCoverageException
+     * @throws InvalidArgumentException
      * @throws MoreThanOneDataSetFromDataProviderException
      * @throws UnintentionallyCoveredCodeException
      */
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -44,6 +44,7 @@
 use PHPUnit\Util\Test as TestUtil;
 use ReflectionClass;
 use ReflectionMethod;
+use SebastianBergmann\CodeCoverage\InvalidArgumentException;
 use SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException;
 use Throwable;
 
@@ -308,10 +309,10 @@ public function groupDetails(): array
     }
 
     /**
-     * @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
      * @throws CodeCoverageException
      * @throws Event\RuntimeException
      * @throws Exception
+     * @throws InvalidArgumentException
      * @throws NoPreviousThrowableException
      * @throws UnintentionallyCoveredCodeException
      */
diff --git a/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php b/src/Metadata/Exception/AnnotationsAreNotSupportedForInternalClassesException.php
@@ -10,12 +10,13 @@
 namespace PHPUnit\Metadata;
 
 use function sprintf;
+use PHPUnit\Exception;
 use RuntimeException;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class AnnotationsAreNotSupportedForInternalClassesException extends RuntimeException implements \PHPUnit\Exception
+final class AnnotationsAreNotSupportedForInternalClassesException extends RuntimeException implements Exception
 {
     /**
      * @psalm-param class-string $className
diff --git a/src/Metadata/Exception/ReflectionException.php b/src/Metadata/Exception/ReflectionException.php
@@ -9,11 +9,12 @@
  */
 namespace PHPUnit\Metadata;
 
+use PHPUnit\Exception;
 use RuntimeException;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class ReflectionException extends RuntimeException implements \PHPUnit\Exception
+final class ReflectionException extends RuntimeException implements Exception
 {
 }
diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -57,6 +57,7 @@
 use PHPUnit\Util\PHP\AbstractPhpProcess;
 use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\InvalidArgumentException;
+use SebastianBergmann\CodeCoverage\ReflectionException;
 use SebastianBergmann\CodeCoverage\StaticAnalysisCacheNotConfiguredException;
 use SebastianBergmann\CodeCoverage\Test\TestSize\TestSize;
 use SebastianBergmann\CodeCoverage\Test\TestStatus\TestStatus;
@@ -106,11 +107,11 @@ public function count(): int
      * Runs a test and collects its result in a TestResult instance.
      *
      * @throws \PHPUnit\Framework\Exception
-     * @throws \SebastianBergmann\CodeCoverage\ReflectionException
      * @throws \SebastianBergmann\Template\InvalidArgumentException
      * @throws Exception
      * @throws InvalidArgumentException
      * @throws NoPreviousThrowableException
+     * @throws ReflectionException
      * @throws StaticAnalysisCacheNotConfiguredException
      * @throws TestIdMissingException
      * @throws UnintentionallyCoveredCodeException
diff --git a/src/TextUI/Configuration/Merger.php b/src/TextUI/Configuration/Merger.php
@@ -20,6 +20,7 @@
 use PHPUnit\Event\Facade as EventFacade;
 use PHPUnit\Runner\TestSuiteSorter;
 use PHPUnit\TextUI\CliArguments\Configuration as CliConfiguration;
+use PHPUnit\TextUI\CliArguments\Exception;
 use PHPUnit\TextUI\XmlConfiguration\Configuration as XmlConfiguration;
 use PHPUnit\TextUI\XmlConfiguration\LoadedFromFileConfiguration;
 use PHPUnit\TextUI\XmlConfiguration\SchemaDetector;
@@ -35,8 +36,8 @@
 final class Merger
 {
     /**
-     * @throws \PHPUnit\TextUI\CliArguments\Exception
      * @throws \PHPUnit\TextUI\XmlConfiguration\Exception
+     * @throws Exception
      * @throws NoCustomCssFileException
      */
     public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlConfiguration): Configuration
diff --git a/src/TextUI/Configuration/Registry.php b/src/TextUI/Configuration/Registry.php
@@ -16,6 +16,7 @@
 use function unserialize;
 use PHPUnit\Event\Facade as EventFacade;
 use PHPUnit\TextUI\CliArguments\Configuration as CliConfiguration;
+use PHPUnit\TextUI\CliArguments\Exception;
 use PHPUnit\TextUI\XmlConfiguration\Configuration as XmlConfiguration;
 use PHPUnit\Util\VersionComparisonOperator;
 
@@ -89,8 +90,8 @@ public static function get(): Configuration
     }
 
     /**
-     * @throws \PHPUnit\TextUI\CliArguments\Exception
      * @throws \PHPUnit\TextUI\XmlConfiguration\Exception
+     * @throws Exception
      * @throws NoCustomCssFileException
      */
     public static function init(CliConfiguration $cliConfiguration, XmlConfiguration $xmlConfiguration): Configuration
diff --git a/src/TextUI/Configuration/Xml/Loader.php b/src/TextUI/Configuration/Xml/Loader.php
@@ -30,6 +30,7 @@
 use DOMXPath;
 use PHPUnit\Runner\TestSuiteSorter;
 use PHPUnit\Runner\Version;
+use PHPUnit\TextUI\Configuration\Configuration;
 use PHPUnit\TextUI\Configuration\Constant;
 use PHPUnit\TextUI\Configuration\ConstantCollection;
 use PHPUnit\TextUI\Configuration\Directory;
@@ -863,15 +864,15 @@ private function phpunit(string $filename, DOMDocument $document): PHPUnit
 
     private function getColors(DOMDocument $document): string
     {
-        $colors = \PHPUnit\TextUI\Configuration\Configuration::COLOR_DEFAULT;
+        $colors = Configuration::COLOR_DEFAULT;
 
         if ($document->documentElement->hasAttribute('colors')) {
             /* only allow boolean for compatibility with previous versions
               'always' only allowed from command line */
             if ($this->getBoolean($document->documentElement->getAttribute('colors'), false)) {
-                $colors = \PHPUnit\TextUI\Configuration\Configuration::COLOR_AUTO;
+                $colors = Configuration::COLOR_AUTO;
             } else {
-                $colors = \PHPUnit\TextUI\Configuration\Configuration::COLOR_NEVER;
+                $colors = Configuration::COLOR_NEVER;
             }
         }
 
diff --git a/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php b/src/TextUI/Configuration/Xml/Migration/MigrationBuilderException.php
@@ -9,11 +9,12 @@
  */
 namespace PHPUnit\TextUI\XmlConfiguration;
 
+use PHPUnit\Exception;
 use RuntimeException;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class MigrationBuilderException extends RuntimeException implements \PHPUnit\Exception
+final class MigrationBuilderException extends RuntimeException implements Exception
 {
 }
diff --git a/src/TextUI/Configuration/Xml/Migration/MigrationException.php b/src/TextUI/Configuration/Xml/Migration/MigrationException.php
@@ -9,11 +9,12 @@
  */
 namespace PHPUnit\TextUI\XmlConfiguration;
 
+use PHPUnit\Exception;
 use RuntimeException;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class MigrationException extends RuntimeException implements \PHPUnit\Exception
+final class MigrationException extends RuntimeException implements Exception
 {
 }
diff --git a/tests/_files/BeforeClassWithOnlyDataProviderTest.php b/tests/_files/BeforeClassWithOnlyDataProviderTest.php
@@ -10,8 +10,9 @@
 namespace PHPUnit\TestFixture;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 
-class BeforeClassWithOnlyDataProviderTest extends \PHPUnit\Framework\TestCase
+class BeforeClassWithOnlyDataProviderTest extends TestCase
 {
     public static $setUpBeforeClassWasCalled;
     public static $beforeClassWasCalled;
diff --git a/tests/_files/NumericGroupAnnotationTest.php b/tests/_files/NumericGroupAnnotationTest.php
@@ -9,10 +9,12 @@
  */
 namespace PHPUnit\TestFixture;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @ticket t123456
  */
-class NumericGroupAnnotationTest extends \PHPUnit\Framework\TestCase
+class NumericGroupAnnotationTest extends TestCase
 {
     /**
      * @testdox Empty test for @ticket numeric annotation values
diff --git a/tests/end-to-end/event/_files/EmptyDataProviderTest.php b/tests/end-to-end/event/_files/EmptyDataProviderTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class EmptyDataProviderTest extends TestCase
@@ -18,7 +19,7 @@ public static function providerMethod(): array
         return [];
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('providerMethod')]
+    #[DataProvider('providerMethod')]
     public function testCase(): void
     {
     }
diff --git a/tests/end-to-end/event/_files/InvalidDataProviderTest.php b/tests/end-to-end/event/_files/InvalidDataProviderTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class InvalidDataProviderTest extends TestCase
@@ -18,7 +19,7 @@ public static function provider(): array
         return [0];
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('provider')]
+    #[DataProvider('provider')]
     public function testOne(): void
     {
         $this->assertTrue(true);
diff --git a/tests/end-to-end/event/_files/InvalidDataProviderWithOneTestPassingTest.php b/tests/end-to-end/event/_files/InvalidDataProviderWithOneTestPassingTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class InvalidDataProviderWithOneTestPassingTest extends TestCase
@@ -18,7 +19,7 @@ public static function provider(): array
         return [0];
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('provider')]
+    #[DataProvider('provider')]
     public function testOne(): void
     {
         $this->assertTrue(true);
diff --git a/tests/end-to-end/regression/2137/Issue2137Test.php b/tests/end-to-end/regression/2137/Issue2137Test.php
@@ -10,7 +10,9 @@
 namespace PHPUnit\TestFixture;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
+use SebastianBergmann\RecursionContext\InvalidArgumentException;
 use stdClass;
 
 class Issue2137Test extends TestCase
@@ -24,9 +26,9 @@ public static function provideBrandService()
     }
 
     /**
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
+     * @throws ExpectationFailedException
+     * @throws InvalidArgumentException
      */
     #[DataProvider('provideBrandService')]
     public function testBrandService($provided, $expected): void
@@ -36,8 +38,8 @@ public function testBrandService($provided, $expected): void
 
     /**
      * @throws \Exception
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws ExpectationFailedException
+     * @throws InvalidArgumentException
      */
     #[DataProvider('provideBrandService')]
     public function testSomethingElseInvalid($provided, $expected): void
diff --git a/tests/end-to-end/regression/498/Issue498Test.php b/tests/end-to-end/regression/498/Issue498Test.php
@@ -12,6 +12,7 @@
 use Exception;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 class Issue498Test extends TestCase
@@ -29,15 +30,15 @@ public static function shouldBeFalseDataProvider(): array
         throw new Exception("Can't create the data");
     }
 
-    #[\PHPUnit\Framework\Attributes\Test]
+    #[Test]
     #[DataProvider('shouldBeTrueDataProvider')]
     #[Group('falseOnly')]
     public function shouldBeTrue($testData): void
     {
         $this->assertTrue(true);
     }
 
-    #[\PHPUnit\Framework\Attributes\Test]
+    #[Test]
     #[DataProvider('shouldBeFalseDataProvider')]
     #[Group('trueOnly')]
     public function shouldBeFalse($testData): void
diff --git a/tests/end-to-end/regression/5020/Under/Score/Issue5020Test.php b/tests/end-to-end/regression/5020/Under/Score/Issue5020Test.php
@@ -7,7 +7,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Under_Score_Issue5020Test extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Under_Score_Issue5020Test extends TestCase
 {
     public function testTrue(): void
     {
diff --git a/tests/unit/Framework/Constraint/Cardinality/CountTest.php b/tests/unit/Framework/Constraint/Cardinality/CountTest.php
diff --git a/tests/unit/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpressionTest.php b/tests/unit/Framework/Constraint/Exception/ExceptionMessageMatchesRegularExpressionTest.php
diff --git a/tests/unit/Metadata/Api/CodeCoverageTest.php b/tests/unit/Metadata/Api/CodeCoverageTest.php
diff --git a/tests/unit/Metadata/Parser/AttributeParserTestCase.php b/tests/unit/Metadata/Parser/AttributeParserTestCase.php
diff --git a/tests/unit/TextUI/Configuration/Xml/LoaderTest.php b/tests/unit/TextUI/Configuration/Xml/LoaderTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`use function array_merge;`
`13`	`13`	`use function assert;`
`14`	`14`	`use function trait_exists;`
	`15`	`+use PHPUnit\Framework\Exception;`
`15`	`16`	`use PHPUnit\Framework\InvalidArgumentException;`
`16`	`17`	`use PHPUnit\Framework\MockObject\Generator\ClassAlreadyExistsException;`
`17`	`18`	`use PHPUnit\Framework\MockObject\Generator\ClassIsEnumerationException;`
`@@ -120,7 +121,7 @@ public function getMock(): MockObject`
`120`	`121`	`*`
`121`	`122`	`* @psalm-return MockObject&MockedType`
`122`	`123`	`*`
`123`		`- * @throws \PHPUnit\Framework\Exception`
	`124`	`+ * @throws Exception`
`124`	`125`	`* @throws ReflectionException`
`125`	`126`	`* @throws RuntimeException`
`126`	`127`	`*`
`@@ -151,7 +152,7 @@ public function getMockForAbstractClass(): MockObject`
`151`	`152`	`*`
`152`	`153`	`* @psalm-return MockObject&MockedType`
`153`	`154`	`*`
`154`		`- * @throws \PHPUnit\Framework\Exception`
	`155`	`+ * @throws Exception`
`155`	`156`	`* @throws ReflectionException`
`156`	`157`	`* @throws RuntimeException`
`157`	`158`	`*`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,12 @@`
`9`	`9`	`*/`
`10`	`10`	`namespace PHPUnit\Metadata;`
`11`	`11`
	`12`	`+use PHPUnit\Exception;`
`12`	`13`	`use RuntimeException;`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* @internal This class is not covered by the backward compatibility promise for PHPUnit`
`16`	`17`	`*/`
`17`		`-final class ReflectionException extends RuntimeException implements \PHPUnit\Exception`
	`18`	`+final class ReflectionException extends RuntimeException implements Exception`
`18`	`19`	`{`
`19`	`20`	`}`