Merge branch '8.5' into 9.6

sebastianbergmann · Dec 27, 2023 · 60e02df · 60e02df
2 parents 37dcc92 + 00300f1
commit 60e02df
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.41.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.42.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.10" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>

diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -141,11 +141,11 @@ public function __clone()
      *
      * @param null|array $methods
      *
-     * @throws \PHPUnit\Framework\InvalidArgumentException
      * @throws ClassAlreadyExistsException
      * @throws ClassIsFinalException
      * @throws ClassIsReadonlyException
      * @throws DuplicateMethodException
+     * @throws InvalidArgumentException
      * @throws InvalidMethodNameException
      * @throws OriginalConstructorInvocationRequiredException
      * @throws ReflectionException
@@ -295,11 +295,11 @@ public function getMockForInterfaces(array $interfaces, bool $callAutoload = tru
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\InvalidArgumentException
      * @throws ClassAlreadyExistsException
      * @throws ClassIsFinalException
      * @throws ClassIsReadonlyException
      * @throws DuplicateMethodException
+     * @throws InvalidArgumentException
      * @throws InvalidMethodNameException
      * @throws OriginalConstructorInvocationRequiredException
      * @throws ReflectionException
@@ -357,11 +357,11 @@ interface_exists($originalClassName, $callAutoload)) {
      *
      * @psalm-param trait-string $traitName
      *
-     * @throws \PHPUnit\Framework\InvalidArgumentException
      * @throws ClassAlreadyExistsException
      * @throws ClassIsFinalException
      * @throws ClassIsReadonlyException
      * @throws DuplicateMethodException
+     * @throws InvalidArgumentException
      * @throws InvalidMethodNameException
      * @throws OriginalConstructorInvocationRequiredException
      * @throws ReflectionException

diff --git a/src/Framework/MockObject/Rule/ConsecutiveParameters.php b/src/Framework/MockObject/Rule/ConsecutiveParameters.php
@@ -80,8 +80,8 @@ public function apply(BaseInvocation $invocation): void
     }
 
     /**
-     * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws ExpectationFailedException
      */
     public function verify(): void
     {

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -313,7 +313,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     private $snapshot;
 
     /**
-     * @var \Prophecy\Prophet
+     * @var Prophet
      */
     private $prophet;
 
@@ -2185,8 +2185,8 @@ private function handleDependencies(): bool
             }
 
             if (isset($passed[$dependencyTarget])) {
-                if ($passed[$dependencyTarget]['size'] != \PHPUnit\Util\Test::UNKNOWN &&
-                    $this->getSize() != \PHPUnit\Util\Test::UNKNOWN &&
+                if ($passed[$dependencyTarget]['size'] != TestUtil::UNKNOWN &&
+                    $this->getSize() != TestUtil::UNKNOWN &&
                     $passed[$dependencyTarget]['size'] > $this->getSize()) {
                     $this->result->addError(
                         $this,

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -593,10 +593,10 @@ public function setGroupDetails(array $groups): void
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @throws \PHPUnit\Framework\CodeCoverageException
      * @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
      * @throws \SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws CodeCoverageException
      * @throws Warning
      */
     public function run(TestResult $result = null): TestResult

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -689,7 +689,7 @@ private function handleListGroups(TestSuite $suite, bool $exit): int
 
     /**
      * @throws \PHPUnit\Framework\Exception
-     * @throws \PHPUnit\TextUI\XmlConfiguration\Exception
+     * @throws XmlConfiguration\Exception
      */
     private function handleListSuites(bool $exit): int
     {

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -135,8 +135,8 @@ public function __construct(TestSuiteLoader $loader = null, CodeCoverageFilter $
 
     /**
      * @throws \PHPUnit\Runner\Exception
-     * @throws \PHPUnit\TextUI\XmlConfiguration\Exception
      * @throws Exception
+     * @throws XmlConfiguration\Exception
      */
     public function run(TestSuite $suite, array $arguments = [], array $warnings = [], bool $exit = true): TestResult
     {
@@ -864,8 +864,8 @@ private function write(string $buffer): void
     }
 
     /**
-     * @throws \PHPUnit\TextUI\XmlConfiguration\Exception
      * @throws Exception
+     * @throws XmlConfiguration\Exception
      */
     private function handleConfiguration(array &$arguments): void
     {

diff --git a/src/Util/Json.php b/src/Util/Json.php
@@ -29,7 +29,7 @@ final class Json
     /**
      * Prettify json string.
      *
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      */
     public static function prettify(string $json): string
     {

diff --git a/src/Util/TestDox/XmlResultPrinter.php b/src/Util/TestDox/XmlResultPrinter.php
@@ -215,7 +215,7 @@ static function ($group)
             $testNode->appendChild($testDoubleNode);
         }
 
-        $inlineAnnotations = \PHPUnit\Util\Test::getInlineAnnotations(get_class($test), $test->getName(false));
+        $inlineAnnotations = TestUtil::getInlineAnnotations(get_class($test), $test->getName(false));
 
         if (isset($inlineAnnotations['given'], $inlineAnnotations['when'], $inlineAnnotations['then'])) {
             $testNode->setAttribute('given', $inlineAnnotations['given']['value']);

diff --git a/tests/end-to-end/regression/2137/Issue2137Test.php b/tests/end-to-end/regression/2137/Issue2137Test.php
@@ -12,9 +12,9 @@ class Issue2137Test extends PHPUnit\Framework\TestCase
     /**
      * @dataProvider provideBrandService
      *
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
+     * @throws PHPUnit\Framework\ExpectationFailedException
+     * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function testBrandService($provided, $expected): void
     {
@@ -32,9 +32,9 @@ public function provideBrandService()
     /**
      * @dataProvider provideBrandService
      *
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
+     * @throws PHPUnit\Framework\ExpectationFailedException
+     * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function testSomethingElseInvalid($provided, $expected): void
     {

diff --git a/tests/unit/Framework/Constraint/IsJsonTest.php b/tests/unit/Framework/Constraint/IsJsonTest.php
@@ -30,8 +30,8 @@ public static function evaluateDataprovider(): array
      *
      * @dataProvider evaluateDataprovider
      *
-     * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws ExpectationFailedException
      */
     public function testEvaluate($expected, $jsonOther): void
     {

diff --git a/tests/unit/Framework/MockObject/MockObjectTest.php b/tests/unit/Framework/MockObject/MockObjectTest.php
@@ -1024,7 +1024,7 @@ public function testInvokingStubbedStaticMethodRaisesException(): void
     {
         $mock = $this->getMockBuilder(ClassWithStaticMethod::class)->getMock();
 
-        $this->expectException(\PHPUnit\Framework\MockObject\BadMethodCallException::class);
+        $this->expectException(BadMethodCallException::class);
 
         $mock->staticMethod();
     }
@@ -1056,15 +1056,15 @@ public function testGetMockForClassWithSelfTypeHint(): void
 
     public function testStringableClassDoesNotThrow(): void
     {
-        /** @var PHPUnit\Framework\MockObject\MockObject|StringableClass $mock */
+        /** @var MockObject|StringableClass $mock */
         $mock = $this->getMockBuilder(StringableClass::class)->getMock();
 
         $this->assertIsString((string) $mock);
     }
 
     public function testStringableClassCanBeMocked(): void
     {
-        /** @var PHPUnit\Framework\MockObject\MockObject|StringableClass $mock */
+        /** @var MockObject|StringableClass $mock */
         $mock = $this->getMockBuilder(StringableClass::class)->getMock();
 
         $mock->method('__toString')->willReturn('foo');
@@ -1128,7 +1128,7 @@ public function testDisableAutomaticReturnValueGeneration(): void
 
     public function testDisableAutomaticReturnValueGenerationWithToString(): void
     {
-        /** @var \PHPUnit\Framework\MockObject\MockObject|StringableClass $mock */
+        /** @var MockObject|StringableClass $mock */
         $mock = $this->getMockBuilder(StringableClass::class)
             ->disableAutoReturnValueGeneration()
             ->getMock();
@@ -1294,7 +1294,7 @@ public function testReturnValueCannotBeAutomaticallyGeneratedForMethodThatReturn
     {
         $stub = $this->createStub(InterfaceWithMethodReturningIntersection::class);
 
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $stub->method();
     }

diff --git a/tests/unit/Util/JsonTest.php b/tests/unit/Util/JsonTest.php
@@ -51,9 +51,9 @@ public function canonicalizeProvider(): array
      *
      * @dataProvider prettifyProvider
      *
-     * @throws \PHPUnit\Framework\Exception
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws Exception
      */
     public function testPrettify($actual, $expected): void
     {

diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer