Merge pull request #11 from DanielGSoftware/daniel-allow-laravel-9

Allow Laravel 9

Author: jessarcher

.github/workflows/php-cs-fixer.yml

@@ -1,6 +1,6 @@
 name: Check & fix styling
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   php-cs-fixer:
@@ -9,13 +9,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-        with:
-          ref: ${{ github.head_ref }}
 
       - name: Run PHP CS Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php_cs.dist --allow-risky=yes
+          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/psalm.yml

@@ -1,6 +1,10 @@
 name: Psalm
 
 on:
+  pull_request:
+    paths:
+      - '**.php'
+      - 'psalm.xml.dist'
   push:
     paths:
       - '**.php'

.github/workflows/run-tests.yml

@@ -13,12 +13,14 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0]
-        laravel: [8.*]
+        php: [8.0, 8.1]
+        laravel: [8.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 8.*
-            testbench: ^6.6
+            testbench: ^6.24
+          - laravel: 9.*
+            testbench: ^7.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

.gitignore

@@ -1,5 +1,5 @@
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 .phpunit.result.cache
 build
 composer.lock

.php_cs.dist .php-cs-fixer.dist.php

@@ -13,14 +13,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->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' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -31,7 +31,7 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method',
+                'method' => 'one',
             ],
         ],
         'method_argument_space' => [

composer.json

@@ -23,15 +23,15 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^8.0",
+        "illuminate/contracts": "^8.0|^9.0",
         "spatie/data-transfer-object": "^3.0",
         "thecodingmachine/safe": "^1.3"
     },
     "require-dev": {
         "brianium/paratest": "^6.2",
         "mockery/mockery": "^1.4",
-        "nunomaduro/collision": "^5.3",
-        "orchestra/testbench": "^6.15",
+        "nunomaduro/collision": "^5.3|^6.0",
+        "orchestra/testbench": "^6.15|^7.0",
         "phpunit/phpunit": "^9.5",
         "vimeo/psalm": "^4.4"
     },