diff --git a/composer.json b/composer.json
index 0a14af20f7..8d1cc0bd7d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
     ],
     "scripts": {
         "test": "vendor/bin/phpunit",
-        "lint": "vendor/bin/phpcs",
-        "format": "vendor/bin/phpcbf"
+        "lint": "vendor/bin/pint --test",
+        "format": "vendor/bin/pint"
     },
     "autoload": {
         "psr-4": {
@@ -81,7 +81,6 @@
         "ext-fileinfo": "*",
         "appwrite/sdk-generator": "0.37.0-rc.6",
         "phpunit/phpunit": "9.5.20",
-        "squizlabs/php_codesniffer": "^3.7",
         "swoole/ide-helper": "5.0.2",
         "textalk/websocket": "1.5.7",
         "utopia-php/fetch": "0.1.*",
diff --git a/composer.lock b/composer.lock
index 6907425742..1203807f50 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3144,16 +3144,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.1",
+            "version": "v5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69"
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
                 "shasum": ""
             },
             "require": {
@@ -3196,9 +3196,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
             },
-            "time": "2024-02-21T19:24:10+00:00"
+            "time": "2024-03-05T20:51:40+00:00"
         },
         {
             "name": "phar-io/manifest",
diff --git a/pint.json b/pint.json
index e00da8b88e..14614b0208 100644
--- a/pint.json
+++ b/pint.json
@@ -8,10 +8,14 @@
     "rules": {
         "array_indentation": true,
         "single_import_per_statement": true,
-        "use_arrow_functions": true,
         "simplified_null_return": true,
         "ordered_imports": {
-            "sort_algorithm": "alpha"
+            "sort_algorithm": "alpha",
+            "imports_order": [
+                "const",
+                "class",
+                "function"
+            ]
         }
     }
 }