Merge pull request #64 from hmazter/laravel-9

Allow Laravel v9 and Symfony v6

Author: mnapoli

.github/workflows/ci.yml

@@ -9,11 +9,11 @@ jobs:
         strategy:
             max-parallel: 10
             matrix:
-                php: ['7.3', '7.4', '8.0']
+                php: ['7.3', '7.4', '8.0', '8.1']
 
         steps:
             - name: Set up PHP
-              uses: shivammathur/setup-php@2.1.0
+              uses: shivammathur/setup-php@2.16.0
               with:
                   php-version: ${{ matrix.php }}
                   coverage: none
@@ -37,9 +37,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Set up PHP
-              uses: shivammathur/setup-php@2.1.0
+              uses: shivammathur/setup-php@2.16.0
               with:
-                  php-version: 7.3
+                  php-version: '7.3'
                   coverage: none
 
             - name: Checkout code

.github/workflows/static.yml

@@ -17,16 +17,28 @@ jobs:
                   args: analyze --no-progress
 
     phpcs:
-        name: PHPCS
+        name: PHP CodeSniffer
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
               uses: actions/checkout@v2
 
-            - name: Download dependencies
-              run: composer update --no-interaction --prefer-dist  --no-progress --no-suggest --dev
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.0
+                  tools: composer:v2, cs2pr
+                  coverage: none
 
-            - name: PHPCS check
-              uses: chekalsky/phpcs-action@v1
+            - name: Cache Composer dependencies
+              uses: actions/cache@v2
               with:
-                  phpcs_bin_path: './vendor/bin/phpcs'
+                  path: ~/.composer/cache
+                  key: php-composer-locked-${{ hashFiles('composer.lock') }}
+                  restore-keys: php-composer-locked-
+
+            - name: Install dependencies
+              run: composer install --no-interaction --prefer-dist --no-progress
+
+            - name: PHP CS
+              run: vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr

composer.json

@@ -19,22 +19,28 @@
         "php": ">=7.3",
         "ext-json": "*",
         "bref/bref": "^1.0",
-        "illuminate/queue": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
+        "illuminate/queue": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
         "aws/aws-sdk-php": "^3.134"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "mnapoli/hard-mode": "^0.3.0",
         "phpstan/phpstan": "^0.12.0",
-        "symfony/filesystem": "^5.0",
-        "symfony/process": "^5.0"
+        "symfony/filesystem": "^5.0|^6.0",
+        "symfony/process": "^5.0|^6.0",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "extra": {
         "laravel": {
             "providers": [
                 "Bref\\LaravelBridge\\BrefServiceProvider"
             ]
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

tests/App/composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": ">=7.2.5",
         "aws/aws-sdk-php": "^3.134",
-        "bref/bref": "^1.0",
+        "bref/bref": "^1.5",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^7.0.1",