Run tests in CI also with PHP 8.4

.github/workflows/ci.yml

@@ -3,31 +3,12 @@ name: CI
 on: pull_request
 
 jobs:
-  cs:
-    name: PHP CS Fixer
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.0'
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
-
-      - name: Run PHP CS Fixer
-        run: composer cs
-
   tests:
     name: PHPUnit tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code
@@ -44,8 +25,8 @@ jobs:
       - name: Run tests
         run: composer test
 
-  stan:
-    name: PHPStan
+  stanAndCs:
+    name: Static Analysis (PHPStan) and Code Style (PHP CS Fixer)
     runs-on: ubuntu-latest
 
     steps:
@@ -62,3 +43,6 @@ jobs:
 
       - name: Run PHPStan
         run: composer stan
+
+      - name: Run PHP CS Fixer
+        run: composer cs

.php-cs-fixer.dist.php

@@ -1,15 +1,19 @@
 <?php
 
+use PhpCsFixer\Config;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
 $finder = PhpCsFixer\Finder::create()
     ->in([__DIR__ . '/src', __DIR__ . '/tests']);
 
-$config = new PhpCsFixer\Config();
-
-return $config->setFinder($finder)
+return (new Config())
+    ->setFinder($finder)
+    ->setParallelConfig(ParallelConfigFactory::detect())
     ->setRules([
-        '@PSR12' => true,
+        '@PER-CS' => true,
         'strict_param' => true,
         'array_syntax' => ['syntax' => 'short'],
+        'no_unused_imports' => true,
     ])
     ->setRiskyAllowed(true)
     ->setUsingCache(true);

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023 Christian Olear
+Copyright (c) 2024 Christian Olear
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

composer.json

@@ -30,13 +30,19 @@
         "source": "https://github.com/crwlrsoft/robots-txt",
         "docs": "https://www.crwlr.software/packages/robots-txt"
     },
+    "funding": [
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/otsch"
+        }
+    ],
     "require": {
         "php": "^8.0",
         "crwlr/url": "^1.0|^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "^3.57",
         "sempro/phpunit-pretty-print": "^1.4",
         "mockery/mockery": "^1.4",
         "phpstan/phpstan": "^1.1"

src/Encoding.php

@@ -23,7 +23,7 @@ public static function decodePercentEncodedAsciiCharactersInPath(string $path):
             trigger_error(
                 "Failed to Decode percent encoded ASCII characters. Preg error: \n" . preg_last_error() . ": " .
                     preg_last_error_msg(),
-                E_USER_WARNING
+                E_USER_WARNING,
             );
 
             return $path;

src/Exceptions/InvalidRobotsTxtFileException.php

@@ -4,6 +4,4 @@
 
 use Exception;
 
-class InvalidRobotsTxtFileException extends Exception
-{
-}
+class InvalidRobotsTxtFileException extends Exception {}

src/Parser.php

@@ -45,7 +45,7 @@ private function getLine(array $lines, int $lineNumber): string
     {
         return trim(
             $lines[$lineNumber],
-            " \n\r\t\v\x00 ­  ⁠​           ⠀͏‌"
+            " \n\r\t\v\x00 ­  ⁠​           ⠀͏‌",
         );
     }
 

src/RobotsTxt.php

@@ -17,7 +17,7 @@ public function __construct(private array $userAgentGroups, private array $sitem
         foreach ($userAgentGroups as $userAgentGroup) {
             if (!$userAgentGroup instanceof UserAgentGroup) {
                 throw new InvalidArgumentException(
-                    'Argument $userAgentGroups must exclusively contain objects of type UserAgentGroup.'
+                    'Argument $userAgentGroups must exclusively contain objects of type UserAgentGroup.',
                 );
             }
         }

tests/UserAgentGroupTest.php

@@ -65,7 +65,7 @@ public function test_is_allowed(array $disallowedPatterns, string $allowedPatter
     {
         array_walk(
             $disallowedPatterns,
-            fn (string $pattern) => $this->userAgentGroup->addDisallowedPattern(new RulePattern($pattern))
+            fn(string $pattern) => $this->userAgentGroup->addDisallowedPattern(new RulePattern($pattern)),
         );
         $this->userAgentGroup->addAllowedPattern(new RulePattern($allowedPattern));
         $this->assertTrue($this->userAgentGroup->isAllowed($uri));