Merge pull request #8 from Joeri-Abbo/master

Update existing workflows to support laravel-dashboard

Author: freekmurze

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

@@ -5,25 +5,13 @@ on: [push]
 jobs:
     style:
         runs-on: ubuntu-latest
-
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v1
-
-            -   name: Fix style
-                uses: docker://oskarstark/php-cs-fixer-ga
-                with:
-                    args: --config=.php_cs --allow-risky=yes
-
-            -   name: Extract branch name
-                shell: bash
-                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-                id: extract_branch
-
-            -   name: Commit changes
-                uses: stefanzweifel/[email protected]
-                with:
-                    commit_message: Fix styling
-                    branch: ${{ steps.extract_branch.outputs.branch }}
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          - name: Git checkout
+            uses: actions/checkout@v2
+          - name: Install Dependencies
+            run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+          - name: normalize php
+            run: php vendor/bin/phpcbf
+          - uses: stefanzweifel/[email protected]
+            with:
+              commit_message: Fix formatting with phpcbf

.github/workflows/run-tests.yml

@@ -10,11 +10,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [7.4]
-        laravel: [7.*]
+        laravel: [8.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 7.*
-            testbench: 5.*
+          - laravel: 8.*
+            testbench: 6.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --ignore-platform-req=ext-fileinfo
 
       - name: Execute tests
         run: vendor/bin/phpunit

.php_cs

@@ -20,7 +20,8 @@
         "spatie/laravel-dashboard": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3",
+        "squizlabs/php_codesniffer": "^3.6.2"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<ruleset name="spatie">
+
+    <file>src</file>
+    <file>tests</file>
+
+    <rule ref="PSR1" />
+    <rule ref="PSR2" />
+    <rule ref="PSR12" />
+
+    <rule ref="Generic.Files.LineLength">
+        <severity>0</severity>
+    </rule>
+
+</ruleset>