Merge pull request #25 from InteractionDesignFoundation/phpcs4

PHPCS 4

Author: alies-dev

.gitattributes

@@ -1,3 +1,10 @@
+/.cache export-ignore
 /.github export-ignore
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
 /tests export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml export-ignore
+/psalm-baseline.xml export-ignore
+/renovate.json export-ignore

.github/workflows/format_php.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.4
           coverage: none
           tools: cs2pr
       - name: Get Composer cache directory

.github/workflows/psalm.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.4
           coverage: none
 
       - name: Get Composer cache directory

.github/workflows/test.yml

@@ -25,8 +25,8 @@ jobs:
           - "lowest"
           - "highest"
         php-version:
-          - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 

.github/workflows/validator.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.4
           coverage: none
 
       - name: Get Composer cache directory

IxDFCodingStandard/Helpers/ClassHelper.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace IxDFCodingStandard\Helpers;
+
+/** Created based on \SlevomatCodingStandard\Helpers to have a SSoT for this internal API */
+final class ClassHelper extends \SlevomatCodingStandard\Helpers\ClassHelper
+{
+}

IxDFCodingStandard/Helpers/TokenHelper.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace IxDFCodingStandard\Helpers;
+
+/** Created based on \SlevomatCodingStandard\Helpers to have a SSoT for this internal API */
+final class TokenHelper extends \SlevomatCodingStandard\Helpers\TokenHelper
+{
+    public const array NAME_TOKEN_CODES = parent::NAME_TOKEN_CODES;
+}

IxDFCodingStandard/Sniffs/Classes/ForbidMethodDeclarationSniff.php

@@ -2,9 +2,9 @@
 
 namespace IxDFCodingStandard\Sniffs\Classes;
 
+use IxDFCodingStandard\Helpers\ClassHelper;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use SlevomatCodingStandard\Helpers\ClassHelper;
 
 final class ForbidMethodDeclarationSniff implements Sniff
 {

IxDFCodingStandard/Sniffs/Functions/MissingOptionalArgumentSniff.php

@@ -2,10 +2,10 @@
 
 namespace IxDFCodingStandard\Sniffs\Functions;
 
+use IxDFCodingStandard\Helpers\TokenHelper;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
-use SlevomatCodingStandard\Helpers\TokenHelper;
 
 /** Inspired by {@see \SlevomatCodingStandard\Sniffs\Functions\StrictCallSniff}. */
 final class MissingOptionalArgumentSniff implements Sniff
@@ -21,7 +21,7 @@ final class MissingOptionalArgumentSniff implements Sniff
     /** @return array<int, (int|string)> */
     public function register(): array
     {
-        return TokenHelper::ONLY_NAME_TOKEN_CODES;
+        return TokenHelper::NAME_TOKEN_CODES;
     }
 
     /** @inheritDoc */

IxDFCodingStandard/Sniffs/Laravel/BladeTemplateExtractor.php

@@ -4,6 +4,7 @@
 
 use BadMethodCallException;
 
+/** phpcs:disable IxDFCodingStandard.Laravel.NonExistingBladeTemplate.TemplateNotFound */
 final class BladeTemplateExtractor
 {
     private const INVALID_METHOD_CALL = 'Invalid method call';
@@ -53,7 +54,7 @@ public function getBladeTemplateName(string $tokenContent): string
             throw new BadMethodCallException(self::INVALID_METHOD_CALL);
         }
 
-        return (string) $matches[2];
+        return $matches[2];
     }
 
     public function getConditionalBladeTemplateName(string $tokenContent): string
@@ -69,7 +70,7 @@ public function getConditionalBladeTemplateName(string $tokenContent): string
             throw new BadMethodCallException(self::INVALID_METHOD_CALL);
         }
 
-        return (string) $matches[2];
+        return $matches[2];
     }
 
     public function getEachBladeTemplateName(string $tokenContent): string
@@ -85,7 +86,7 @@ public function getEachBladeTemplateName(string $tokenContent): string
             throw new BadMethodCallException(self::INVALID_METHOD_CALL);
         }
 
-        return (string) $matches[1];
+        return $matches[1];
     }
 
     public function getFirstBladeTemplateName(string $tokenContent): string
@@ -101,6 +102,6 @@ public function getFirstBladeTemplateName(string $tokenContent): string
             throw new BadMethodCallException(self::INVALID_METHOD_CALL);
         }
 
-        return (string) $matches[2];
+        return $matches[2];
     }
 }