Merge branch '8.5' into 9.6

sebastianbergmann · Jan 7, 2024 · 241c4aa · 241c4aa
2 parents d833627 + c59af7c
commit 241c4aa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 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.45.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.46.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/tests/end-to-end/regression/2382/Issue2382Test.php b/tests/end-to-end/regression/2382/Issue2382Test.php
@@ -16,14 +16,14 @@ class Issue2382Test extends TestCase
      */
     public function testOne($test): void
     {
-        $this->assertInstanceOf(\Exception::class, $test);
+        $this->assertInstanceOf(Exception::class, $test);
     }
 
     public function dataProvider()
     {
         return [
             [
-                $this->getMockBuilder(\Exception::class)->getMock(),
+                $this->getMockBuilder(Exception::class)->getMock(),
             ],
         ];
     }

diff --git a/tests/end-to-end/regression/2811/Issue2811Test.php b/tests/end-to-end/regression/2811/Issue2811Test.php
@@ -13,6 +13,6 @@ public function testOne(): void
     {
         $this->expectExceptionMessage('hello');
 
-        throw new \Exception('hello');
+        throw new Exception('hello');
     }
 }
diff --git a/tests/end-to-end/regression/3093/Issue3093Test.php b/tests/end-to-end/regression/3093/Issue3093Test.php
@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Issue3093Test extends \PHPUnit\Framework\TestCase
+class Issue3093Test extends PHPUnit\Framework\TestCase
 {
     public function someDataProvider(): array
     {

diff --git a/tests/end-to-end/regression/5210/Issue5210Test.php b/tests/end-to-end/regression/5210/Issue5210Test.php
@@ -13,7 +13,7 @@ final class Issue5210Test extends TestCase
 {
     protected function tearDown(): void
     {
-        throw new \Exception('test');
+        throw new Exception('test');
     }
 
     public function testOne(): void

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