Skip to content

Commit 390f1e0

Browse files
authored
Laravel 6 support & Travis updates (#170)
* Add PHP 7.4 to travis builds * Add illuminate 6.0 to allowed composer versions * Use trusty distribution for Travis CI * Makefile uninstall change * Update README
1 parent d4e5267 commit 390f1e0

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
dist: trusty
2+
13
language: php
24

35
php:
@@ -7,6 +9,7 @@ php:
79
- 7.1
810
- 7.2
911
- 7.3
12+
- 7.4
1013
- hhvm
1114
- nightly
1215

@@ -16,6 +19,7 @@ matrix:
1619
allow_failures:
1720
- php: hhvm
1821
- php: nightly
22+
- php: 7.4
1923

2024
before_install:
2125
- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ remove-deps:
1717

1818
uninstall-laravel: remove-deps
1919
composer remove laravel/framework
20+
composer remove illuminate/support
2021

2122
uninstall-lumen: remove-deps
2223
composer remove laravel/lumen-framework
24+
composer remove illuminate/support
2325

2426
# Ensures that the TAG variable was passed to the make command
2527
check-tag:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PHP and Laravel 5.1.
1414

1515
**Major Versions:**
1616

17-
* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1` and `aws/aws-sdk-php:~3.0`
17+
* **3.x** (YOU ARE HERE) - For `laravel/framework:~5.1|~6.0` and `aws/aws-sdk-php:~3.0`
1818
* **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`
1919
* **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`
2020

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": ">=5.5.9",
1616
"aws/aws-sdk-php": "~3.0",
17-
"illuminate/support": "~5.1"
17+
"illuminate/support": "~5.1|~6.0"
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~4.0|~5.0",

0 commit comments

Comments
 (0)