Merge pull request #165 from mateusjunges/fixes/laravel-7.x

Fixes/laravel 7.x

Author: Mateus Junges

.travis.yml

@@ -4,31 +4,30 @@ matrix:
   fast_finish: true
   include:
     - php: 7.2
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.2
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.2
-      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.2
-      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='2.*'
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.3
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.3
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.3
-      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
+      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.3
-      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.4
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.4
-      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
+      env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.4
-      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='2.*'
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
 
 before_install:
   - travis_retry composer self-update
-  - travis_retry composer require --no-update --no-interaction "facade/ignition:${IGNITION}" --dev
   - travis_retry composer require --no-update --no-interaction "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}"
 
 install:

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 All notable changes to `mateusjunges/laravel-acl` will be documented in this file.
 
- 
+# 2.4.1
+- Fixed `facade/ignition` dependency for laravel 7.x
+
 # 2.4.0
 - Changed public method `getCorrectParameter` to `private` on `GroupsTrait` and `UsersTrait`
 - Improved documentations

composer.json

@@ -25,7 +25,8 @@
     "require-dev": {
         "orchestra/testbench": "^3.8|^4.0|^5.0",
         "phpunit/phpunit": "^8.0|^9.0",
-        "predis/predis": "^1.1"
+        "predis/predis": "^1.1",
+        "facade/ignition": "^1.4|^2.0"
     },
     "suggest": {
         "facade/igntion": "Needed to be able to use the ignition solutions for laravel-acl"