Merge pull request #420 from FireEngineRed/master

Entrust permission caching. Thanks @scottconnerly
Zizaco · Nov 20, 2015 · 3b41a8e · 3b41a8e
2 parents 2f97b7c + 71e058b
commit 3b41a8e
Show file tree

Hide file tree

Showing 6 changed files with 729 additions and 336 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/composer.json b/composer.json
@@ -22,9 +22,10 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
         "illuminate/console": "~5.0",
-        "illuminate/support": "~5.0"
+        "illuminate/support": "~5.0",
+        "illuminate/cache": "~5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1",