Merge branch 'release/2.2.0'

Author: tristansb1

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
   schedule:
     interval: "daily"
   reviewers:
-  - PKuebler
+  - tristansb1
   - krns
   assignees:
-  - PKuebler
+  - tristansb1

.github/workflows/lint.yaml

@@ -0,0 +1,54 @@
+name: "Lint PHP"
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+jobs:
+  phpcs:
+    name: PHPCS
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-versions: ['7.4']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, curl, zip
+          coverage: none
+          tools: composer
+
+      - name: Install dependencies
+        run: composer update --no-interaction --no-suggest --no-progress --optimize-autoloader
+
+      - name: Run
+        run: composer run lint:phpcs
+  phpmd:
+    name: PHPMD
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-versions: ['7.4']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, curl, zip
+          coverage: none
+          tools: composer
+
+      - name: Install dependencies
+        run: composer update --no-interaction --no-suggest --no-progress --optimize-autoloader
+
+      - name: Run
+        run: composer run lint:phpmd

.github/workflows/test.yaml

@@ -0,0 +1,40 @@
+name: "Test PHP"
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+jobs:
+  phpunit:
+    name: PHPUnit
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-versions: ['7.3', '7.4', '8.0']
+        composer-arguments: ['--prefer-lowest', '']
+        allowed-to-fail: [false]
+        include:
+          - php-versions: '8.1'
+            composer-arguments: ['--prefer-lowest', '']
+            allowed-to-fail: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, curl, zip
+          coverage: xdebug
+          tools: composer
+
+      - name: Install dependencies
+        continue-on-error: ${{ matrix.allowed-to-fail }}
+        run: composer update --no-interaction --no-suggest --no-progress --optimize-autoloader ${{ matrix.composer-arguments }}
+
+      - name: Run tests
+        continue-on-error: ${{ matrix.allowed-to-fail }}
+        run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

.travis.yml

@@ -1,7 +1,7 @@
 # laravel-static-permission
 
+[![Tests](https://github.com/sourceboat/laravel-static-permission/actions/workflows/test.yaml/badge.svg?branch=develop)](https://github.com/sourceboat/laravel-static-permission/actions/workflows/test.yaml)
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/sourceboat/laravel-static-permission.svg?style=flat-square)](https://packagist.org/packages/sourceboat/laravel-static-permission)
-[![Build Status](https://img.shields.io/travis/sourceboat/laravel-static-permission/master.svg?style=flat-square)](https://travis-ci.org/sourceboat/laravel-static-permission)
 [![Total Downloads](https://img.shields.io/packagist/dt/sourceboat/laravel-static-permission.svg?style=flat-square)](https://packagist.org/packages/sourceboat/laravel-static-permission)
 
 Manage user permissions and roles in your Laravel application by domain driven rules.
@@ -253,6 +253,7 @@ composer lint:phpmd
 This package is heavily inspired by [Spatie / laravel-permission](https://github.com/spatie/laravel-permission).
 
 - [Philipp Kübler](https://github.com/pkuebler)
+- [Tristan Damm](tristansb1)
 - [All Contributors](https://github.com/sourceboat/laravel-static-permission/graphs/contributors)
 
 ## License

README.md

@@ -20,15 +20,16 @@
     ],
     "require": {
         "php": ">=7.3",
-        "laravel/framework": "^6.0|^7.0|^8.0"
+        "illuminate/support": "^6.0|^7.0|^8.0",
+        "illuminate/view": "^6.0|^7.0|^8.0",
+        "illuminate/http": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
       "orchestra/testbench": "^5.0 || ^6.0",
       "phpunit/phpunit": "^9.3",
       "phpmd/phpmd": "^2.6",
       "squizlabs/php_codesniffer": "^3.3",
-      "consistence/coding-standard": "^3.8",
-      "slevomat/coding-standard": "^6.3"
+      "slevomat/coding-standard": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -37,7 +38,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Sourceboat\\Permission\\Test\\": "tests"
+            "Sourceboat\\Permission\\Tests\\": "tests"
         }
     },
     "scripts": {