From e5331d432454de3e9f0294dadac10dea199095a8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:36:00 +0900
Subject: [PATCH 1/4] chore: update php-cs-fixer version

---
 admin/framework/composer.json | 2 +-
 composer.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 9d7cba44ddbb..e50d6445aba4 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
diff --git a/composer.json b/composer.json
index f7f98d862c11..0b3a49f8c6ba 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

From 4b2985ce5edfb15d228ff893c4e69c7ce52e9c0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:47:27 +0900
Subject: [PATCH 2/4] chore: add fully_qualified_strict_types config

Do not process @see tag.
See https://cs.symfony.com/doc/rules/import/fully_qualified_strict_types.html
---
 .php-cs-fixer.dist.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 8c2a6b8b7a52..13f5ddc63e47 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -67,6 +67,31 @@
             'use',
         ],
     ],
+    'fully_qualified_strict_types' => [
+        'import_symbols'                        => false,
+        'leading_backslash_in_global_namespace' => false,
+        'phpdoc_tags'                           => [
+            'param',
+            'phpstan-param',
+            'phpstan-property',
+            'phpstan-property-read',
+            'phpstan-property-write',
+            'phpstan-return',
+            'phpstan-var',
+            'property',
+            'property-read',
+            'property-write',
+            'psalm-param',
+            'psalm-property',
+            'psalm-property-read',
+            'psalm-property-write',
+            'psalm-return',
+            'psalm-var',
+            'return',
+            'throws',
+            'var',
+        ],
+    ],
 ];
 
 $options = [

From a12d8d8dcb1f1d15497992ef1ef15324fcf41d31 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:49:04 +0900
Subject: [PATCH 3/4] docs: composer cs-fix

---
 system/Debug/Toolbar/Views/toolbar.tpl.php    | 32 +++++++++----------
 system/Exceptions/FrameworkException.php      |  2 +-
 user_guide_src/source/models/entities/018.php |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index aadf72ee19ad..3652a536443c 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @var \CodeIgniter\Debug\Toolbar $this
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var string                     $url
- * @var string                     $method
- * @var bool                       $isAJAX
- * @var int                        $startTime
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var float                      $segmentDuration
- * @var int                        $segmentCount
- * @var string                     $CI_VERSION
- * @var array                      $collectors
- * @var array                      $vars
- * @var array                      $styles
- * @var \CodeIgniter\View\Parser   $parser
+ * @var CodeIgniter\Debug\Toolbar $this
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var string                    $url
+ * @var string                    $method
+ * @var bool                      $isAJAX
+ * @var int                       $startTime
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var float                     $segmentDuration
+ * @var int                       $segmentCount
+ * @var string                    $CI_VERSION
+ * @var array                     $collectors
+ * @var array                     $vars
+ * @var array                     $styles
+ * @var CodeIgniter\View\Parser   $parser
  */
 ?>
 <style>
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index faf3f1480126..4cafd71177e2 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -66,7 +66,7 @@ public static function forMissingExtension(string $extension)
                 'The framework needs the following extension(s) installed and loaded: %s.',
                 $extension
             );
-        // @codeCoverageIgnoreEnd
+            // @codeCoverageIgnoreEnd
         } else {
             $message = lang('Core.missingExtension', [$extension]);
         }
diff --git a/user_guide_src/source/models/entities/018.php b/user_guide_src/source/models/entities/018.php
index dc793bb8de81..2bb8750affe1 100644
--- a/user_guide_src/source/models/entities/018.php
+++ b/user_guide_src/source/models/entities/018.php
@@ -13,7 +13,7 @@ class MyEntity extends Entity
 
     // Bind the type to the handler
     protected $castHandlers = [
-        'base64' => \App\Entities\Cast\CastBase64::class,
+        'base64' => Cast\CastBase64::class,
     ];
 }
 

From f514d3b25cc6e4125e5095f42c65a4c18672e62a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:49:22 +0900
Subject: [PATCH 4/4] test: composer cs-fix

---
 tests/system/Router/AutoRouterImprovedTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 0efecd2e50ac..9360352f4900 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -177,7 +177,7 @@ public function testAutoRouteFindsControllerWithSubfolder(): void
             = $router->getRoute('subfolder/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
         $this->assertSame([
@@ -195,7 +195,7 @@ public function testAutoRouteFindsControllerWithSubSubfolder()
             = $router->getRoute('subfolder/sub/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/Sub/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Sub\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -209,7 +209,7 @@ public function testAutoRouteFindsDashedSubfolder(): void
 
         $this->assertSame('Dash_folder/', $directory);
         $this->assertSame(
-            '\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
+            '\\' . Controllers\Dash_folder\Mycontroller::class,
             $controller
         );
         $this->assertSame('getSomemethod', $method);
@@ -281,7 +281,7 @@ public function testAutoRouteFallbackToDefaultControllerOneParam()
             = $router->getRoute('subfolder/15', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15'], $params);
         $this->assertSame([
@@ -299,7 +299,7 @@ public function testAutoRouteFallbackToDefaultControllerTwoParams()
             = $router->getRoute('subfolder/15/20', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15', '20'], $params);
         $this->assertSame([
@@ -317,7 +317,7 @@ public function testAutoRouteFallbackToDefaultControllerNoParams()
             = $router->getRoute('subfolder', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
         $this->assertSame([