Fix CS/WS issues

sebastianbergmann · sebastianbergmann · commit 00300f193ba4 · 2023-12-27T14:25:04.000+01:00
diff --git a/src/Framework/Assert/Functions.php b/src/Framework/Assert/Functions.php
diff --git a/src/Framework/MockObject/InvocationHandler.php b/src/Framework/MockObject/InvocationHandler.php
@@ -177,7 +177,7 @@ public function matches(Invocation $invocation): bool
     }
 
     /**
-     * @throws \PHPUnit\Framework\ExpectationFailedException
+     * @throws ExpectationFailedException
      */
     public function verify(): void
     {
diff --git a/src/Framework/MockObject/Rule/ConsecutiveParameters.php b/src/Framework/MockObject/Rule/ConsecutiveParameters.php
@@ -78,8 +78,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
@@ -289,7 +289,7 @@ abstract class TestCase extends Assert implements SelfDescribing, Test
     private $snapshot;
 
     /**
-     * @var \Prophecy\Prophet
+     * @var Prophet
      */
     private $prophet;
 
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -530,13 +530,13 @@ public function setGroupDetails(array $groups): void
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @throws \PHPUnit\Framework\CodeCoverageException
      * @throws \SebastianBergmann\CodeCoverage\CoveredCodeNotExecutedException
      * @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
      * @throws \SebastianBergmann\CodeCoverage\MissingCoversAnnotationException
      * @throws \SebastianBergmann\CodeCoverage\RuntimeException
      * @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
@@ -187,7 +187,7 @@ class Command
     private $versionStringPrinted = false;
 
     /**
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      */
     public static function main(bool $exit = true): int
     {
@@ -1265,7 +1265,7 @@ private function handleListGroups(TestSuite $suite, bool $exit): int
     }
 
     /**
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      */
     private function handleListSuites(bool $exit): int
     {
diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -982,7 +982,7 @@ private function getConfigurationArguments(DOMNodeList $nodes): array
     }
 
     /**
-     * @throws \PHPUnit\Framework\Exception
+     * @throws Exception
      */
     private function getTestSuite(DOMElement $testSuiteNode, string $testSuiteFilter = ''): TestSuite
     {
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/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/GeneratorTest.php b/tests/unit/Framework/MockObject/GeneratorTest.php
@@ -56,7 +56,7 @@ protected function setUp(): void
 
     public function testGetMockThrowsExceptionWhenInvalidFunctionNameIsPassedInAsAFunctionToMock(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->generator->getMock(stdClass::class, [0]);
     }
@@ -77,7 +77,7 @@ public function testGetMockThrowsExceptionWithInvalidMethods(): void
 
     public function testGetMockThrowsExceptionWithNonExistingClass(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->assertFalse(class_exists('Tux'));
 
@@ -86,7 +86,7 @@ public function testGetMockThrowsExceptionWithNonExistingClass(): void
 
     public function testGetMockThrowsExceptionWithNonExistingClasses(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->assertFalse(class_exists('Tux'));
 
@@ -95,7 +95,7 @@ public function testGetMockThrowsExceptionWithNonExistingClasses(): void
 
     public function testGetMockThrowsExceptionWithExistingClassAsMockName(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->generator->getMock(stdClass::class, [], [], RuntimeException::class);
     }
@@ -109,7 +109,7 @@ public function testGetMockCanCreateNonExistingFunctions(): void
 
     public function testGetMockGeneratorThrowsException(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('duplicates: "foo, bar, foo" (duplicate: "foo")');
 
         $this->generator->getMock(stdClass::class, ['foo', 'bar', 'foo']);
@@ -167,7 +167,7 @@ public function testGetMockForAbstractClassShouldCreateStubsOnlyForAbstractMetho
 
     public function testGetMockForAbstractClassAbstractClassDoesNotExist(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->generator->getMockForAbstractClass('Tux');
     }
@@ -199,21 +199,21 @@ public function testGetMockForTraitStubbingAbstractMethod(): void
 
     public function testGetMockForTraitWithNonExistantTrait(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $mock = $this->generator->getMockForTrait('Tux');
     }
 
     public function testGetObjectForTraitWithNonExistantTrait(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $mock = $this->generator->getObjectForTrait('Tux');
     }
 
     public function testGetMockClassMethodsForNonExistantClass(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $mock = $this->generator->mockClassMethods('Tux', true, true);
     }
@@ -227,7 +227,7 @@ public function testGetMockForSingletonWithReflectionSuccess(): void
 
     public function testExceptionIsRaisedForMutuallyExclusiveOptions(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->generator->getMock(stdClass::class, [], [], '', false, true, true, true, true);
     }
@@ -319,14 +319,14 @@ public function testVariadicArgumentsArePassedToMockedMethod(): void
 
     public function testGetClassMethodsWithNonExistingClass(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $this->generator->getClassMethods('Tux');
     }
 
     public function testCannotMockFinalClass(): void
     {
-        $this->expectException(\PHPUnit\Framework\MockObject\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
 
         $mock = $this->createMock(FinalClass::class);
     }
diff --git a/tests/unit/Framework/MockObject/MockObjectTest.php b/tests/unit/Framework/MockObject/MockObjectTest.php
@@ -1033,7 +1033,7 @@ public function testInvokingStubbedStaticMethodRaisesException(): void
     {
         $mock = $this->getMockBuilder(ClassWithStaticMethod::class)->getMock();
 
-        $this->expectException(\PHPUnit\Framework\MockObject\BadMethodCallException::class);
+        $this->expectException(BadMethodCallException::class);
 
         $mock->staticMethod();
     }
@@ -1065,15 +1065,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');
@@ -1137,7 +1137,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();
diff --git a/tests/unit/Util/JsonTest.php b/tests/unit/Util/JsonTest.php
@@ -49,9 +49,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
     {

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function matches(Invocation $invocation): bool`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`/**`
`180`		`- * @throws \PHPUnit\Framework\ExpectationFailedException`
	`180`	`+ * @throws ExpectationFailedException`
`181`	`181`	`*/`
`182`	`182`	`public function verify(): void`
`183`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ public function apply(BaseInvocation $invocation): void`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * @throws \PHPUnit\Framework\ExpectationFailedException`
`82`	`81`	`* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException`
	`82`	`+ * @throws ExpectationFailedException`
`83`	`83`	`*/`
`84`	`84`	`public function verify(): void`
`85`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ class Command`
`187`	`187`	`private $versionStringPrinted = false;`
`188`	`188`
`189`	`189`	`/**`
`190`		`- * @throws \PHPUnit\Framework\Exception`
	`190`	`+ * @throws Exception`
`191`	`191`	`*/`
`192`	`192`	`public static function main(bool $exit = true): int`
`193`	`193`	`{`
`@@ -1265,7 +1265,7 @@ private function handleListGroups(TestSuite $suite, bool $exit): int`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`	`1267`	`/**`
`1268`		`- * @throws \PHPUnit\Framework\Exception`
	`1268`	`+ * @throws Exception`
`1269`	`1269`	`*/`
`1270`	`1270`	`private function handleListSuites(bool $exit): int`
`1271`	`1271`	`{`
Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ private function getConfigurationArguments(DOMNodeList $nodes): array`
`982`	`982`	`}`
`983`	`983`
`984`	`984`	`/**`
`985`		`- * @throws \PHPUnit\Framework\Exception`
	`985`	`+ * @throws Exception`
`986`	`986`	`*/`
`987`	`987`	`private function getTestSuite(DOMElement $testSuiteNode, string $testSuiteFilter = ''): TestSuite`
`988`	`988`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class Json`
`29`	`29`	`/**`
`30`	`30`	`* Prettify json string.`
`31`	`31`	`*`
`32`		`- * @throws \PHPUnit\Framework\Exception`
	`32`	`+ * @throws Exception`
`33`	`33`	`*/`
`34`	`34`	`public static function prettify(string $json): string`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ class Issue2137Test extends PHPUnit\Framework\TestCase`
`12`	`12`	`/**`
`13`	`13`	`* @dataProvider provideBrandService`
`14`	`14`	`*`
`15`		`- * @throws \PHPUnit\Framework\ExpectationFailedException`
`16`		`- * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException`
`17`	`15`	`* @throws Exception`
	`16`	`+ * @throws PHPUnit\Framework\ExpectationFailedException`
	`17`	`+ * @throws SebastianBergmann\RecursionContext\InvalidArgumentException`
`18`	`18`	`*/`
`19`	`19`	`public function testBrandService($provided, $expected): void`
`20`	`20`	`{`
`@@ -32,9 +32,9 @@ public function provideBrandService()`
`32`	`32`	`/**`
`33`	`33`	`* @dataProvider provideBrandService`
`34`	`34`	`*`
`35`		`- * @throws \PHPUnit\Framework\ExpectationFailedException`
`36`		`- * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException`
`37`	`35`	`* @throws Exception`
	`36`	`+ * @throws PHPUnit\Framework\ExpectationFailedException`
	`37`	`+ * @throws SebastianBergmann\RecursionContext\InvalidArgumentException`
`38`	`38`	`*/`
`39`	`39`	`public function testSomethingElseInvalid($provided, $expected): void`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public static function evaluateDataprovider(): array`
`30`	`30`	`*`
`31`	`31`	`* @dataProvider evaluateDataprovider`
`32`	`32`	`*`
`33`		`- * @throws \PHPUnit\Framework\ExpectationFailedException`
`34`	`33`	`* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException`
	`34`	`+ * @throws ExpectationFailedException`
`35`	`35`	`*/`
`36`	`36`	`public function testEvaluate($expected, $jsonOther): void`
`37`	`37`	`{`