Merge branch '9.6' into 10.5

sebastianbergmann · Dec 27, 2023 · 71685c3 · 71685c3
2 parents f15372e + 60e02df
commit 71685c3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 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/TestCase.php b/src/Framework/TestCase.php
@@ -1219,8 +1219,8 @@ protected function setLocale(mixed ...$arguments): void
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      * @throws NoPreviousThrowableException
      */
     protected function createMock(string $originalClassName): MockObject
@@ -1247,7 +1247,7 @@ protected function createMock(string $originalClassName): MockObject
     /**
      * @psalm-param list<class-string> $interfaces
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
+     * @throws MockObject\Exception
      */
     protected function createMockForIntersectionOfInterfaces(array $interfaces): MockObject
     {
@@ -1271,8 +1271,8 @@ protected function createMockForIntersectionOfInterfaces(array $interfaces): Moc
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      * @throws NoPreviousThrowableException
      */
     protected function createConfiguredMock(string $originalClassName, array $configuration): MockObject
@@ -1297,8 +1297,8 @@ protected function createConfiguredMock(string $originalClassName, array $config
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      */
     protected function createPartialMock(string $originalClassName, array $methods): MockObject
     {
@@ -1327,8 +1327,8 @@ protected function createPartialMock(string $originalClassName, array $methods):
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5240
      */
@@ -1358,8 +1358,8 @@ protected function createTestProxy(string $originalClassName, array $constructor
      *
      * @psalm-return MockObject&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5241
      */
@@ -1389,7 +1389,7 @@ protected function getMockForAbstractClass(string $originalClassName, array $arg
     /**
      * Creates a mock object based on the given WSDL file.
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
+     * @throws MockObject\Exception
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5242
      */
@@ -1445,8 +1445,8 @@ protected function getMockFromWsdl(string $wsdlFile, string $originalClassName =
      *
      * @psalm-param trait-string $traitName
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243
      */
@@ -1475,7 +1475,7 @@ protected function getMockForTrait(string $traitName, array $arguments = [], str
      *
      * @psalm-param trait-string $traitName
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
+     * @throws MockObject\Exception
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5244
      */
@@ -2370,8 +2370,8 @@ private function hasExpectationOnOutput(): bool
      *
      * @psalm-return Stub&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      * @throws NoPreviousThrowableException
      */
     protected static function createStub(string $originalClassName): Stub
@@ -2396,7 +2396,7 @@ protected static function createStub(string $originalClassName): Stub
     /**
      * @psalm-param list<class-string> $interfaces
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
+     * @throws MockObject\Exception
      */
     protected static function createStubForIntersectionOfInterfaces(array $interfaces): Stub
     {
@@ -2416,8 +2416,8 @@ protected static function createStubForIntersectionOfInterfaces(array $interface
      *
      * @psalm-return Stub&RealInstanceType
      *
-     * @throws \PHPUnit\Framework\MockObject\Exception
      * @throws InvalidArgumentException
+     * @throws MockObject\Exception
      * @throws NoPreviousThrowableException
      */
     final protected static function createConfiguredStub(string $originalClassName, array $configuration): Stub

diff --git a/tests/unit/Framework/TestSizeTest.php b/tests/unit/Framework/TestSizeTest.php
@@ -17,7 +17,7 @@
 #[CoversClass(Known::class)]
 #[CoversClass(Large::class)]
 #[CoversClass(Medium::class)]
-#[CoversClass(\PHPUnit\Framework\TestSize\Small::class)]
+#[CoversClass(Small::class)]
 #[CoversClass(TestSize::class)]
 #[CoversClass(Unknown::class)]
 #[Small]

diff --git a/tests/unit/Metadata/MetadataCollectionTest.php b/tests/unit/Metadata/MetadataCollectionTest.php
@@ -25,7 +25,7 @@
 #[UsesClass(Before::class)]
 #[UsesClass(BeforeClass::class)]
 #[UsesClass(Covers::class)]
-#[UsesClass(\PHPUnit\Metadata\CoversClass::class)]
+#[UsesClass(CoversClass::class)]
 #[UsesClass(CoversDefaultClass::class)]
 #[UsesClass(CoversFunction::class)]
 #[UsesClass(CoversNothing::class)]
@@ -56,7 +56,7 @@
 #[UsesClass(TestDox::class)]
 #[UsesClass(TestWith::class)]
 #[UsesClass(Uses::class)]
-#[UsesClass(\PHPUnit\Metadata\UsesClass::class)]
+#[UsesClass(UsesClass::class)]
 #[UsesClass(UsesDefaultClass::class)]
 #[UsesClass(UsesFunction::class)]
 #[Small]

diff --git a/tests/unit/Metadata/MetadataTest.php b/tests/unit/Metadata/MetadataTest.php
@@ -22,7 +22,7 @@
 #[CoversClass(Before::class)]
 #[CoversClass(BeforeClass::class)]
 #[CoversClass(Covers::class)]
-#[CoversClass(\PHPUnit\Metadata\CoversClass::class)]
+#[CoversClass(CoversClass::class)]
 #[CoversClass(CoversDefaultClass::class)]
 #[CoversClass(CoversFunction::class)]
 #[CoversClass(CoversNothing::class)]

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