Merge branch 'master' into expose-query-complexity

# Conflicts:
#	CHANGELOG.md

Author: spawnia

.github/workflows/validate.yml

@@ -27,6 +27,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         laravel-version:
           - "^9"
           - "^10"
@@ -74,7 +75,7 @@ jobs:
           --update-with-all-dependencies
           ${{ matrix.composer.arg }}
 
-      - run: vendor/bin/phpstan
+      - run: vendor/bin/phpstan --verbose
 
   tests:
     name: PHPUnit on PHP ${{ matrix.php-version }} with Laravel ${{ matrix.laravel-version }} and ${{ matrix.composer.name }} dependencies
@@ -88,6 +89,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         laravel-version:
           - "^9"
           - "^10"
@@ -159,7 +161,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["8.3"]
+        php-version: ["8.4"]
         laravel-version: ["^11"]
 
     services:
@@ -206,7 +208,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["8.3"]
+        php-version: ["8.4"]
         laravel-version: ["^11"]
 
     steps:

.php-cs-fixer.php

@@ -1,9 +1,5 @@
 <?php declare(strict_types=1);
 
-use Tests\LaravelPhpdocAlignmentFixer;
-
-use function MLL\PhpCsFixerConfig\risky;
-
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
     ->name('*.php')
@@ -12,7 +8,7 @@
     ->ignoreDotFiles(false)
     ->ignoreVCS(true);
 
-return risky($finder, [
+return MLL\PhpCsFixerConfig\risky($finder, [
     'general_phpdoc_annotation_remove' => [
         'annotations' => [
             'throws',
@@ -30,4 +26,6 @@
         'phpdoc_tags' => [],
     ],
     'Laravel/laravel_phpdoc_alignment' => true,
-])->registerCustomFixers([new LaravelPhpdocAlignmentFixer()]);
+])->registerCustomFixers([
+    new Tests\LaravelPhpdocAlignmentFixer(),
+]);