Merge pull request #2 from enlightn/laravel9

Add support for Laravel 9

Author: paras-malhotra

.gitattributes

@@ -14,7 +14,7 @@
 /phpunit.xml.dist   export-ignore
 /tests              export-ignore
 /.editorconfig      export-ignore
-/.php_cs.dist       export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /.github            export-ignore
 /psalm.xml          export-ignore
 /psalm.xml.dist     export-ignore

.github/workflows/format_php.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Run php-cs-fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php_cs.dist
+          args: --config=.php-cs-fixer.dist.php
 
       - uses: stefanzweifel/[email protected]
         with:

.github/workflows/manual.yaml

@@ -13,8 +13,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0]
-        laravel: [6.*, 7.*, 8.*]
+        php: [7.3, 7.4, 8.0, 8.1]
+        laravel: [6.*, 7.*, 8.*, 9.*]
+        exclude:
+          - php: 8.1
+            laravel: 6.*
+          - php: 8.1
+            laravel: 7.*
+          - php: 7.3
+            laravel: 9.*
+          - php: 7.4
+            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 

.github/workflows/tests.yaml

@@ -8,8 +8,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0]
-        laravel: [6.*, 7.*, 8.*]
+        php: [7.3, 7.4, 8.0, 8.1]
+        laravel: [6.*, 7.*, 8.*, 9.*]
+        exclude:
+          - php: 8.1
+            laravel: 6.*
+          - php: 8.1
+            laravel: 7.*
+          - php: 7.3
+            laravel: 9.*
+          - php: 7.4
+            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 

.gitignore

@@ -2,6 +2,7 @@
 .idea
 .php_cs
 .php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 build
 /composer.lock

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -4,15 +4,15 @@
     ->exclude('Fixtures')
     ->in([__DIR__.'/src', __DIR__.'/tests']);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setFinder($finder)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -23,7 +23,7 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method',
+                'method' => 'one',
             ],
         ],
         'method_argument_space' => [

composer.json

@@ -19,13 +19,13 @@
     "require": {
         "php": "^7.2|^8.0",
         "enlightn/security-checker": "^1.8",
-        "laravel/framework": "^6.0|^7.0|^8.0"
+        "laravel/framework": "^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.8",
-        "friendsofphp/php-cs-fixer": "^2.18",
+        "friendsofphp/php-cs-fixer": "^2.18|^3.0",
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
+        "orchestra/testbench": "^4.0|^5.20|^6.15|^7.0",
         "phpunit/phpunit": "^7.5|^8.0|^9.0"
     },
     "autoload": {
@@ -38,6 +38,9 @@
             "Enlightn\\LaravelSecurityChecker\\Tests\\": "tests"
         }
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit --verbose"
+    },
     "config": {
         "sort-packages": true
     },