From f514bdf70805eeb8590090408bfce32eb30c1898 Mon Sep 17 00:00:00 2001 From: Howard Lopez Date: Mon, 9 Sep 2019 12:48:21 -0700 Subject: [PATCH 1/5] Add PHP 7.4 to travis builds --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 74812ec..da68d07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 - hhvm - nightly @@ -16,6 +17,7 @@ matrix: allow_failures: - php: hhvm - php: nightly + - php: 7.4 before_install: - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini From 0e7bf5f932a4742ada09c4b78f0e86277011ff6e Mon Sep 17 00:00:00 2001 From: Howard Lopez Date: Mon, 9 Sep 2019 12:49:32 -0700 Subject: [PATCH 2/5] Add illuminate 6.0 to allowed composer versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2e3ecd2..a8ebfc5 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require": { "php": ">=5.5.9", "aws/aws-sdk-php": "~3.0", - "illuminate/support": "~5.1" + "illuminate/support": "~5.1|~6.0" }, "require-dev": { "phpunit/phpunit": "~4.0|~5.0", From c6c63b60d9b3a87c2fb08ab3406c7e08bc76d1d5 Mon Sep 17 00:00:00 2001 From: Howard Lopez Date: Mon, 9 Sep 2019 12:55:32 -0700 Subject: [PATCH 3/5] Use trusty distribution for Travis CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index da68d07..be33e16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +dist: trusty + language: php php: From 6096f75e269eedbecb51506213209c863c3fcca0 Mon Sep 17 00:00:00 2001 From: Howard Lopez Date: Mon, 9 Sep 2019 13:06:31 -0700 Subject: [PATCH 4/5] Makefile uninstall change --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index dbc14c9..1f286a4 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,11 @@ remove-deps: uninstall-laravel: remove-deps composer remove laravel/framework + composer remove illuminate/support uninstall-lumen: remove-deps composer remove laravel/lumen-framework + composer remove illuminate/support # Ensures that the TAG variable was passed to the make command check-tag: From f1ef13dfa6c8878367feceeefb22b2d94934324e Mon Sep 17 00:00:00 2001 From: Howard Lopez Date: Mon, 9 Sep 2019 13:42:44 -0700 Subject: [PATCH 5/5] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c63d2f8..8139321 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ PHP and Laravel 5.1. **Major Versions:** -* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1` and `aws/aws-sdk-php:~3.0` +* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.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` pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy