Merge pull request #12 from JackieDo/v2.0

Add support for Laravel 5.5
JackieDo · Apr 14, 2020 · b21e5bb · b21e5bb
2 parents d1ee8e2 + 21c28c5
commit b21e5bb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,14 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 before_script:
+  # Additional PHP config
+  - phpenv config-add travis.php.ini
+
   - composer self-update
   - composer install --prefer-source --no-interaction
 

diff --git a/composer.json b/composer.json
@@ -11,9 +11,9 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
-        "illuminate/session": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
-        "illuminate/events": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*"
+        "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+        "illuminate/session": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+        "illuminate/events": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
@@ -25,5 +25,15 @@
             "Jackiedo\\Cart\\": "src"
         }
     },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Jackiedo\\Cart\\CartServiceProvider"
+            ],
+            "aliases": {
+                "Cart": "Jackiedo\\Cart\\Facades\\Cart"
+            }
+        }
+    },
     "minimum-stability": "stable"
 }
diff --git a/travis.php.ini b/travis.php.ini
@@ -0,0 +1 @@
+memory_limit = -1