Laravel 7 Support (#181)

matthewnessworthy · web-flow · commit 6ab12dbe4d5f · 2020-03-11T12:26:48.000-07:00
* Laravel 7 Support

* Build matrix

* double matrix

* lumen 7 dev

* cache

* version constraint update

* Update .travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,38 +1,50 @@
 dist: trusty
 
-language: php
-
-php:
-  - 5.5.9
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-  - hhvm
-  - nightly
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
-sudo: false
+language: php
 
 matrix:
   allow_failures:
-    - php: hhvm
     - php: nightly
+
+  include:
+    - php: 5.5.9
+      env: LARAVEL="5.1.*" LUMEN="5.1.*"
+    - php: hhvm-3.18
+      env: LARAVEL="5.1.*" LUMEN="5.1.*"
+    - php: 7.0
+      env: LARAVEL="5.5.*" LUMEN="5.5.*"
+    - php: 7.1
+      env: LARAVEL="^5.5" LUMEN="^5.5"
+    - php: 7.2
+      env: LARAVEL="^5.5" LUMEN="^5.5"
+    - php: 7.2
+      env: LARAVEL="^6.0" LUMEN="^6.0"
+    - php: 7.2
+      env: LARAVEL="^7.0" LUMEN="^7.0@dev"
+    - php: 7.3
+      env: LARAVEL="^6.0" LUMEN="^6.0"
+    - php: 7.3
+      env: LARAVEL="^7.0" LUMEN="^7.0@dev"
     - php: 7.4
+      env: LARAVEL="^6.0" LUMEN="^6.0"
+    - php: 7.4
+      env: LARAVEL="^7.0" LUMEN="^7.0@dev"
+    - php: nightly
+      env: LARAVEL="^6.0" LUMEN="^6.0"
+    - php: nightly
+      env: LARAVEL="^7.0" LUMEN="^7.0@dev"
 
 before_install:
-- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-
-install:
-  - if [ ${TRAVIS_PHP_VERSION} == "5.5.9" ]; then
-        travis_retry composer require laravel/framework "5.2.*";
-    elif [ ${TRAVIS_PHP_VERSION} == "5.6" ]; then
-        travis_retry composer require laravel/framework "5.4.*";
-    elif [ ${TRAVIS_PHP_VERSION} == "7.0" ]; then
-        travis_retry composer require laravel/framework "5.5.*";
-    else
-        travis_retry composer update --no-interaction --prefer-source;
-    fi
+  - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-script: make test
+script:
+  - travis_retry composer require laravel/framework:${LARAVEL} --no-interaction --prefer-dist
+  - vendor/bin/phpunit
+  - composer remove laravel/framework
+  - rm composer.lock
+  - travis_retry composer require laravel/lumen-framework:${LUMEN} --no-interaction --prefer-dist
+  - vendor/bin/phpunit
diff --git a/Makefile b/Makefile
@@ -14,14 +14,17 @@ test-lumen:
 
 remove-deps:
 	rm -rf vendor
+	rm composer.lock
 
-uninstall-laravel: remove-deps
+uninstall-laravel:
+	make remove-deps
 	composer remove laravel/framework
-	composer remove illuminate/support
+	make remove-deps
 
-uninstall-lumen: remove-deps
+uninstall-lumen:
+	make remove-deps
 	composer remove laravel/lumen-framework
-	composer remove illuminate/support
+	make remove-deps
 
 # Ensures that the TAG variable was passed to the make command
 check-tag:
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# AWS Service Provider for Laravel 5
+# AWS Service Provider for Laravel 5/6/7
 
 [![@awsforphp on Twitter](http://img.shields.io/badge/twitter-%40awsforphp-blue.svg?style=flat)](https://twitter.com/awsforphp)
 [![Build Status](https://img.shields.io/travis/aws/aws-sdk-php-laravel.svg)](https://travis-ci.org/aws/aws-sdk-php-laravel)
@@ -14,7 +14,7 @@ PHP and Laravel 5.1.
 
 **Major Versions:**
 
-* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0` and `aws/aws-sdk-php:~3.0`
+* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0|~7.0` and `aws/aws-sdk-php:~3.0`
 * **2.x** ([2.0 branch](https://github.com/aws/aws-sdk-php-laravel/tree/2.0)) - For `laravel/framework:5.0.*` and `aws/aws-sdk-php:~2.4`
 * **1.x** ([1.0 branch](https://github.com/aws/aws-sdk-php-laravel/tree/1.0)) - For `laravel/framework:4.*` and `aws/aws-sdk-php:~2.4`
 
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "aws/aws-sdk-php-laravel",
     "homepage": "http://aws.amazon.com/sdkforphp2",
-    "description": "A simple Laravel 5 service provider for including the AWS SDK for PHP.",
-    "keywords": ["laravel", "laravel 5", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"],
+    "description": "A simple Laravel 5/6/7 service provider for including the AWS SDK for PHP.",
+    "keywords": ["laravel", "laravel 5", "laravel 6", "laravel 7", "aws", "amazon", "sdk", "s3", "ec2", "dynamodb"],
     "type":"library",
     "license":"Apache-2.0",
     "authors":[
@@ -14,11 +14,11 @@
     "require": {
         "php": ">=5.5.9",
         "aws/aws-sdk-php": "~3.0",
-        "illuminate/support": "~5.1|~6.0"
+        "illuminate/support": "^5.1 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0|~5.0",
-        "vlucas/phpdotenv": "~2.0|~3.0"
+        "phpunit/phpunit": "^4.0 || ^5.0",
+        "vlucas/phpdotenv": "^1.0 || ^2.0 || ^3.0 || ^4.0"
     },
     "suggest": {
         "laravel/framework": "To test the Laravel bindings",
