Update squizlabs/php_codesniffer from 3.13.5 to 4.0.1

Author: RomanZubach

.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:"dev-4.x"'
                     - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: true
-                      variant: 'squizlabs/php_codesniffer:"dev-master"'
+                      variant: 'squizlabs/php_codesniffer:"dev-4.x"'
                     - php-version: '8.4'
                       dependencies: highest
                       allowed-to-fail: true
-                      variant: 'squizlabs/php_codesniffer:"dev-master"'
+                      variant: 'squizlabs/php_codesniffer:"dev-4.x"'
 
         steps:
             - name: Checkout

Swivl/Sniffs/Commenting/ClassCommentSniff.php

@@ -3,8 +3,8 @@
 namespace Swivl\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\ClassCommentSniff as SquizClassCommentSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\ClassCommentSniff as SquizClassCommentSniff;
 
 /**
  * ClassCommentSniff

Swivl/Sniffs/Commenting/FunctionCommentSniff.php

@@ -4,10 +4,10 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\DocCommentSniff;
-use PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\FunctionCommentSniff as SquizFunctionCommentSniff;
 use PHP_CodeSniffer\Util\Tokens;
 use Swivl\Helpers\FunctionHelper;
 use Swivl\Helpers\TypeHelper;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\FunctionCommentSniff as SquizFunctionCommentSniff;
 
 /**
  * FunctionCommentSniff

Swivl/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php

@@ -51,8 +51,12 @@ public function process(File $phpcsFile, $stackPtr): void
         $closeBrace = $tokens[$stackPtr]['scope_closer'];
         $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBrace - 1), null, true);
 
-        // Special case for empty JS functions
-        if ($phpcsFile->tokenizerType === 'JS' && $prevContent === $tokens[$stackPtr]['scope_opener']) {
+        // Special case for empty JS functions (PHPCS < 4 only; JS support removed in PHPCS 4+)
+        if (
+            property_exists($phpcsFile, 'tokenizerType')
+            && $phpcsFile->tokenizerType === 'JS'
+            && $prevContent === $tokens[$stackPtr]['scope_opener']
+        ) {
             // In this case, the opening and closing brace must be
             // right next to each other.
             if ($tokens[$stackPtr]['scope_closer'] !== ($tokens[$stackPtr]['scope_opener'] + 1)) {

Swivl/ruleset.xml

@@ -69,8 +69,6 @@
         </properties>
     </rule>
 
-    <rule ref="Generic.Functions.CallTimePassByReference"/>
-
     <rule ref="Generic.Metrics.NestingLevel">
         <properties>
             <property name="nestingLevel" value="6"/>
@@ -271,7 +269,6 @@
             <property name="spacingAfterLast" value="0"/>
         </properties>
     </rule>
-    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
     <rule ref="Squiz.WhiteSpace.MemberVarSpacing">
         <properties>

Swivl/slevomat.xml

@@ -295,7 +295,7 @@
             <property name="spacesCountBeforeColon" value="0"/>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
         <properties>
             <property name="withSpaces" value="no"/>
             <property name="nullPosition" value="last"/>

composer.json

@@ -14,8 +14,8 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "squizlabs/php_codesniffer": "^3.6"
+        "php": ">=7.2",
+        "squizlabs/php_codesniffer": "4.0.*"
     },
     "conflict": {
         "doctrine/orm": "<2.9"