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 1c53325..dfb84ca 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 4c3b916..674dac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,7 @@ phpunit.phar
 # 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 0000000..67d9f35
--- /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 a0ea612..a8bd0c2 100644
--- a/composer.json
+++ b/composer.json
@@ -27,9 +27,9 @@
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-phpunit": "^2.0",
         "yiisoft/yii2-debug": "^2.1",
-        "yiisoft/yii2-coding-standards": "^3.0",
         "rector/rector": "^2.6",
-        "mspirkov/yii2-rector": "^0.1"
+        "mspirkov/yii2-rector": "^0.1",
+        "friendsofphp/php-cs-fixer": "^3.95"
     },
     "repositories": [
         {
@@ -53,8 +53,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 6530e7b..0000000
--- a/phpcs.xml.dist
+++ /dev/null
@@ -1,20 +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>/Request\.php$</exclude-pattern>
-        <exclude-pattern>/MockTransport\.php$</exclude-pattern>
-        <exclude-pattern>/tests/MockTransportTest\.php$</exclude-pattern>
-    </rule>
-    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>/tests/XmlFormatterTest\.php$</exclude-pattern>
-    </rule>
-</ruleset>
diff --git a/src/CurlFormatter.php b/src/CurlFormatter.php
index 4ced136..994a586 100644
--- a/src/CurlFormatter.php
+++ b/src/CurlFormatter.php
@@ -8,7 +8,6 @@
 
 namespace yii\httpclient;
 
-use Yii;
 use yii\base\BaseObject;
 
 /**
diff --git a/src/Message.php b/src/Message.php
index 8175cf1..2e598a9 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -13,7 +13,6 @@
 use yii\web\Cookie;
 use yii\web\CookieCollection;
 use yii\web\HeaderCollection;
-use Yii;
 
 /**
  * Message represents a base HTTP message.
@@ -246,7 +245,6 @@ public function hasContent($key)
     }
 
 
-
     /**
      * Sets the data fields, which composes message content.
      * @param mixed $data content data fields.
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index ad8e8eb..186b1a3 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.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\extensions\httpclient;
 
 use yii\httpclient\Client;
diff --git a/tests/CurlFormatterTest.php b/tests/CurlFormatterTest.php
index 6e7b6e3..c1604fe 100644
--- a/tests/CurlFormatterTest.php
+++ b/tests/CurlFormatterTest.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\extensions\httpclient;
 
 use yii\httpclient\CurlFormatter;
diff --git a/tests/CurlTransportTest.php b/tests/CurlTransportTest.php
index ab52d35..eaba7db 100644
--- a/tests/CurlTransportTest.php
+++ b/tests/CurlTransportTest.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\extensions\httpclient;
 
 use yii\httpclient\Client;
diff --git a/tests/JsonFormatterTest.php b/tests/JsonFormatterTest.php
index 1e31937..67e57d0 100644
--- a/tests/JsonFormatterTest.php
+++ b/tests/JsonFormatterTest.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\extensions\httpclient;
 
 use yii\helpers\Json;
diff --git a/tests/JsonParserTest.php b/tests/JsonParserTest.php
index 8382285..7e06c77 100644
--- a/tests/JsonParserTest.php
+++ b/tests/JsonParserTest.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\extensions\httpclient;
 
 use yii\helpers\Json;
@@ -53,7 +59,8 @@ public function testParse2(): void
             ],
             'errors' => null,
         ];
-        $document->setContent(<<<JSON
+        $document->setContent(
+            <<<JSON
 {
   "code": 412,
   "httpMessage": "Precondition Failed",
diff --git a/tests/MessageTest.php b/tests/MessageTest.php
index cdb8d8c..2131934 100644
--- a/tests/MessageTest.php
+++ b/tests/MessageTest.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\extensions\httpclient;
 
 use yii\httpclient\Message;
diff --git a/tests/MockTransportTest.php b/tests/MockTransportTest.php
index 100a6e4..b27b29d 100644
--- a/tests/MockTransportTest.php
+++ b/tests/MockTransportTest.php
@@ -1,10 +1,15 @@
 <?php
 
+/**
+ * @link https://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license https://www.yiiframework.com/license/
+ */
+
 namespace yiiunit\extensions\httpclient;
 
 use yii\httpclient\Client;
 use yii\httpclient\MockTransport;
-use yii\httpclient\Request;
 use yii\httpclient\Response;
 
 final class MockTransportTest extends TestCase
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index ee64f39..57e2617 100644
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.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\extensions\httpclient;
 
 use yii\httpclient\Client;
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index 81933ed..d700fe4 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.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\extensions\httpclient;
 
 use yii\httpclient\Client;
diff --git a/tests/StreamTransportTest.php b/tests/StreamTransportTest.php
index e94e40b..890e29c 100644
--- a/tests/StreamTransportTest.php
+++ b/tests/StreamTransportTest.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\extensions\httpclient;
 
 use yii\httpclient\StreamTransport;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6234f42..11aff21 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\extensions\httpclient;
 
 use yii\di\Container;
diff --git a/tests/TransportTestCase.php b/tests/TransportTestCase.php
index 255797e..7f26832 100644
--- a/tests/TransportTestCase.php
+++ b/tests/TransportTestCase.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\extensions\httpclient;
 
 use Yii;
diff --git a/tests/UrlEncodedFormatterTest.php b/tests/UrlEncodedFormatterTest.php
index a7832c6..5420270 100644
--- a/tests/UrlEncodedFormatterTest.php
+++ b/tests/UrlEncodedFormatterTest.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\extensions\httpclient;
 
 use yii\httpclient\Request;
diff --git a/tests/UrlEncodedParserTest.php b/tests/UrlEncodedParserTest.php
index 939ae0f..b297aaf 100644
--- a/tests/UrlEncodedParserTest.php
+++ b/tests/UrlEncodedParserTest.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\extensions\httpclient;
 
 use yii\httpclient\UrlEncodedParser;
diff --git a/tests/XmlFormatterTest.php b/tests/XmlFormatterTest.php
index d34226c..5f79dbc 100644
--- a/tests/XmlFormatterTest.php
+++ b/tests/XmlFormatterTest.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\extensions\httpclient;
 
 use DOMDocument;
diff --git a/tests/XmlParserTest.php b/tests/XmlParserTest.php
index e25fd4d..e29ea4b 100644
--- a/tests/XmlParserTest.php
+++ b/tests/XmlParserTest.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\extensions\httpclient;
 
 use yii\httpclient\Response;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index fe9f343..cec1dbc 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);