diff --git a/.github/workflows/linter.yml b/.github/workflows/code-style.yml
similarity index 63%
rename from .github/workflows/linter.yml
rename to .github/workflows/code-style.yml
index 1c5332551..dfb84ca80 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/code-style.yml
@@ -1,4 +1,4 @@
-name: linter
+name: code style
 
 permissions:
   contents: read
@@ -22,5 +22,8 @@ on:
   push: *ignore-paths
 
 jobs:
-  phpcs:
-    uses: yiisoft/yii2-actions/.github/workflows/linter.yml@master
+  php-cs-fixer:
+    uses: yiisoft/yii2-actions/.github/workflows/php-cs-fixer.yml@9bfbe47bd91bc31a6ff9f0ea77ba3724d7816c3d # master
+    with:
+      configuration: .php-cs-fixer.dist.php
+      php-version: '["7.4"]'
diff --git a/.gitignore b/.gitignore
index bcc42bb33..4ea33013e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,7 @@ coverage.xml
 # local tests configuration
 /tests/data/config.local.php
 /tests/runtime
+
+# PHP CS Fixer
+.php-cs-fixer.php
+.php-cs-fixer.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..67d9f3534
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,30 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$header = '@link https://www.yiiframework.com/
+@copyright Copyright (c) 2008 Yii Software LLC
+@license https://www.yiiframework.com/license/';
+
+$finder = (new Finder())
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->notPath([
+        '#(^|/)views/#',
+    ]);
+
+return (new Config())
+    ->setFinder($finder)
+    ->setRules([
+        '@PSR2' => true,
+        'no_unused_imports' => true,
+        'phpdoc_scalar' => true,
+        'header_comment' => [
+            'comment_type' => 'PHPDoc',
+            'header' => $header,
+            'location' => 'after_open',
+        ],
+    ]);
diff --git a/composer.json b/composer.json
index 14e18dedb..e3262a5d2 100644
--- a/composer.json
+++ b/composer.json
@@ -34,12 +34,12 @@
     },
     "require-dev": {
         "yiisoft/yii2-swiftmailer": "*",
-        "yiisoft/yii2-coding-standards": "~3.0",
         "phpunit/phpunit": "^9.6",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-phpunit": "^2.0",
         "rector/rector": "^2.6",
-        "mspirkov/yii2-rector": "^0.1"
+        "mspirkov/yii2-rector": "^0.1",
+        "friendsofphp/php-cs-fixer": "^3.95"
     },
     "autoload": {
         "psr-4": {
@@ -68,8 +68,8 @@
         }
     },
     "scripts": {
-        "cs": "./vendor/bin/phpcs",
-        "cs-fix": "./vendor/bin/phpcbf",
+        "cs": "./vendor/bin/php-cs-fixer check",
+        "cs-fix": "./vendor/bin/php-cs-fixer fix",
         "static": "./vendor/bin/phpstan --memory-limit=-1",
         "tests": "./vendor/bin/phpunit",
         "rector": "./vendor/bin/rector"
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
deleted file mode 100644
index 3da0add8f..000000000
--- a/phpcs.xml.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="Yii2">
-    <rule ref="vendor/yiisoft/yii2-coding-standards/Yii2"></rule>
-
-    <!-- generate relative paths -->
-    <arg name="basepath" value="src"/>
-
-    <!-- directories to check -->
-    <file>src</file>
-    <file>tests</file>
-
-    <rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore">
-        <exclude-pattern>/*\.php$</exclude-pattern>
-    </rule>
-    <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <exclude-pattern>/tests/PanelTest\.php$</exclude-pattern>
-    </rule>
-</ruleset>
diff --git a/src/Module.php b/src/Module.php
index face0a591..fdfb39168 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -179,29 +179,28 @@ class Module extends \yii\base\Module implements BootstrapInterface
      * @since 2.1.1
      */
     public $urlRuleClass = 'yii\web\UrlRule';
-     /**
-      * @var string|callable Page title could be a string or a callable function
-      *
-      * ```php
-      * ...
-      * 'pageTitle' => 'Custom Debug Title',
-      * ...
-      * // OR
-      * 'pageTitle' => function($url) {
-      *     $domain = getDomain($url);
-      *     return $domain . ' debugger';
-      * }
-      * ```
-      *
-      * @since 2.1.1
-      */
+    /**
+     * @var string|callable Page title could be a string or a callable function
+     *
+     * ```php
+     * ...
+     * 'pageTitle' => 'Custom Debug Title',
+     * ...
+     * // OR
+     * 'pageTitle' => function($url) {
+     *     $domain = getDomain($url);
+     *     return $domain . ' debugger';
+     * }
+     * ```
+     *
+     * @since 2.1.1
+     */
     public $pageTitle;
     /**
      * @var string Yii logo URL
      */
     private static $_yiiLogo = 'data:image/png;base64,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';
 
-
     /**
      * @var array routes of AJAX requests to skip from being displayed in toolbar
      * @since 2.1.14
diff --git a/src/Panel.php b/src/Panel.php
index d5e2ecfe1..e95ff24c6 100644
--- a/src/Panel.php
+++ b/src/Panel.php
@@ -8,7 +8,6 @@
 
 namespace yii\debug;
 
-use Yii;
 use yii\base\Component;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
diff --git a/src/models/UserSwitch.php b/src/models/UserSwitch.php
index ec4cb7101..c7685676a 100644
--- a/src/models/UserSwitch.php
+++ b/src/models/UserSwitch.php
@@ -35,7 +35,6 @@ class UserSwitch extends Model
      */
     private $_mainUser;
 
-
     /**
      * @var string|User ID of the user component or a user object
      * @since 2.0.13
diff --git a/src/panels/DbPanel.php b/src/panels/DbPanel.php
index 3b4e5d70b..6be374099 100644
--- a/src/panels/DbPanel.php
+++ b/src/panels/DbPanel.php
@@ -85,7 +85,6 @@ class DbPanel extends Panel
      */
     private $_profileLogs;
 
-
     /**
      * @var array of event names used to get profile logs.
      * @since 2.1.17
diff --git a/tests/FlattenExceptionTest.php b/tests/FlattenExceptionTest.php
index 23afd0eab..36f4ae77a 100644
--- a/tests/FlattenExceptionTest.php
+++ b/tests/FlattenExceptionTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug;
 
 use yii\debug\FlattenException;
diff --git a/tests/LogTargetTest.php b/tests/LogTargetTest.php
index 3240d525f..501dd5928 100644
--- a/tests/LogTargetTest.php
+++ b/tests/LogTargetTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug;
 
 use Yii;
diff --git a/tests/ModuleTest.php b/tests/ModuleTest.php
index 4ebf99d01..227ac8df3 100644
--- a/tests/ModuleTest.php
+++ b/tests/ModuleTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug;
 
 use Yii;
diff --git a/tests/PanelTest.php b/tests/PanelTest.php
index 467e9b60b..35c4e3d75 100644
--- a/tests/PanelTest.php
+++ b/tests/PanelTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug;
 
 use yii\debug\Module;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d58d95cfe..7142aa522 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug;
 
 use Yii;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3d94b833e..1ebabaf34 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,13 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 // phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
+
 // ensure we get report on all possible php errors
 error_reporting(-1);
 
diff --git a/tests/router/ActionRoutesTest.php b/tests/router/ActionRoutesTest.php
index 1d602323a..62d11a98a 100644
--- a/tests/router/ActionRoutesTest.php
+++ b/tests/router/ActionRoutesTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router;
 
 use yii\debug\models\router\ActionRoutes;
diff --git a/tests/router/CurrentRouteTest.php b/tests/router/CurrentRouteTest.php
index 62b152f91..e383962b4 100644
--- a/tests/router/CurrentRouteTest.php
+++ b/tests/router/CurrentRouteTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/router/CustomRuleStub.php b/tests/router/CustomRuleStub.php
index 1a8d2a5e3..a5b629153 100644
--- a/tests/router/CustomRuleStub.php
+++ b/tests/router/CustomRuleStub.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router;
 
 use yii\web\UrlRuleInterface;
diff --git a/tests/router/RouterRulesTest.php b/tests/router/RouterRulesTest.php
index 83b208611..16481a4f6 100644
--- a/tests/router/RouterRulesTest.php
+++ b/tests/router/RouterRulesTest.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router;
 
 use yii\debug\models\router\RouterRules;
diff --git a/tests/router/controllers/BadController.php b/tests/router/controllers/BadController.php
index 5f08b56a0..f6f9ceaac 100644
--- a/tests/router/controllers/BadController.php
+++ b/tests/router/controllers/BadController.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\controllers;
 
 use yii\web\Controller;
diff --git a/tests/router/controllers/RedirectController.php b/tests/router/controllers/RedirectController.php
index 1bf4a4527..d01ab2565 100644
--- a/tests/router/controllers/RedirectController.php
+++ b/tests/router/controllers/RedirectController.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\controllers;
 
 use yii\web\Controller;
diff --git a/tests/router/controllers/RestController.php b/tests/router/controllers/RestController.php
index 7ddb51d02..55335d80c 100644
--- a/tests/router/controllers/RestController.php
+++ b/tests/router/controllers/RestController.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\controllers;
 
 use yii\rest\ActiveController;
diff --git a/tests/router/controllers/WebController.php b/tests/router/controllers/WebController.php
index 702c241fc..9672ef043 100644
--- a/tests/router/controllers/WebController.php
+++ b/tests/router/controllers/WebController.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\controllers;
 
 use yii\web\Controller;
diff --git a/tests/router/module/Module.php b/tests/router/module/Module.php
index 33a536560..efe912261 100644
--- a/tests/router/module/Module.php
+++ b/tests/router/module/Module.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\module;
 
 class Module extends \yii\base\Module
diff --git a/tests/router/module/controllers/ModuleWebController.php b/tests/router/module/controllers/ModuleWebController.php
index 12413eb25..367b8e2f9 100644
--- a/tests/router/module/controllers/ModuleWebController.php
+++ b/tests/router/module/controllers/ModuleWebController.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\debug\router\module\controllers;
 
 use yii\web\Controller;