Update squizlabs/php_codesniffer from 3.13.5 to 4.0.1

.github/workflows/test.yaml

@@ -27,15 +27,15 @@ jobs:
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: true
-                      variant: 'squizlabs/php_codesniffer:"dev-master"'
+                      variant: 'squizlabs/php_codesniffer:"4.x-dev"'
                     - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: true
-                      variant: 'squizlabs/php_codesniffer:"dev-master"'
+                      variant: 'squizlabs/php_codesniffer:"4.x-dev"'
                     - php-version: '8.4'
                       dependencies: highest
                       allowed-to-fail: true
-                      variant: 'squizlabs/php_codesniffer:"dev-master"'
+                      variant: 'squizlabs/php_codesniffer:"4.x-dev"'
 
         steps:
             - name: Checkout
@@ -58,6 +58,7 @@ jobs:
                   composer-options: "--prefer-dist --prefer-stable"
 
             - name: Validate composer
+              if: matrix.variant == 'normal'
               run: composer validate --strict --no-check-lock
 
             - name: Check Code Style

Swivl/Helpers/Common.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Swivl\Helpers;
+
+use PHP_CodeSniffer\Util\Common as SnifferCommon;
+
+final class Common extends SnifferCommon
+{
+    /**
+     * @var string[]
+     */
+    public const SHORT_SCALAR_TYPES = ['int', 'bool'];
+
+    /**
+     * {@inheritDoc}
+     */
+    public static function suggestType(string $varType)
+    {
+        if (in_array($varType, self::SHORT_SCALAR_TYPES, true)) {
+            return $varType;
+        }
+
+        return parent::suggestType($varType);
+    }
+}

Swivl/Helpers/TypeHelper.php

@@ -13,8 +13,6 @@ class TypeHelper
         'traversable' => true,
     ];
 
-    private const SHORT_SCALAR_TYPES = ['int', 'bool'];
-
     public static function isTypeTraversable(string $mixedType): bool
     {
         foreach (explode('|', self::normalizeType($mixedType)) as $type) {
@@ -33,13 +31,6 @@ public static function isTypeTraversable(string $mixedType): bool
         return false;
     }
 
-    public static function allowShortScalarTypes(): void
-    {
-        if ($missedScalarTypes = array_diff(self::SHORT_SCALAR_TYPES, Common::$allowedTypes)) {
-            Common::$allowedTypes = array_merge(Common::$allowedTypes, $missedScalarTypes);
-        }
-    }
-
     public static function normalizeType(string $mixedType): string
     {
         if ($mixedType !== '' && $mixedType[0] === '?') {

Swivl/Sniffs/Classes/FullyQualifiedClassNameUsageSniff.php

@@ -28,13 +28,6 @@ class FullyQualifiedClassNameUsageSniff implements Sniff
      */
     protected $checkedPos = [];
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['PHP'];
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *

Swivl/Sniffs/Commenting/FullyQualifiedClassNameUsageSniff.php

@@ -14,13 +14,6 @@
  */
 class FullyQualifiedClassNameUsageSniff implements Sniff
 {
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['PHP'];
-
     /**
      * Returns an array of tokens this test wants to listen for.
      *