Skip to content

Commit

Permalink
Merge pull request #8 from gerpo/master
Browse files Browse the repository at this point in the history
Add support for Laravel 5.8.* and 6.* and PHP 7.3
  • Loading branch information
mpociot authored Feb 18, 2020
2 parents e3af1b4 + 29723f1 commit efa1a42
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,32 @@ language: php
php:
- 7.1
- 7.2
- 7.3

env:
global:
- ILLUMINATE_VERSION=""
- TESTBENCH_VERSION=""

matrix:
- COMPOSER_FLAGS="--prefer-lowest"
- COMPOSER_FLAGS=""
- ILLUMINATE_VERSION="5.7.*" TESTBENCH_VERSION="3.7.*"
- ILLUMINATE_VERSION="5.8.*" TESTBENCH_VERSION="3.8.*"
- ILLUMINATE_VERSION="6.*" TESTBENCH_VERSION="4.*"

matrix:
exclude:
- php: 7.1
env: ILLUMINATE_VERSION="6.*" TESTBENCH_VERSION="4.*"

before_script:
- travis_retry composer self-update
- if [ "$ILLUMINATE_VERSION" != "" ] && [ "$TESTBENCH_VERSION" != "" ]; then
composer require "illuminate/http:${ILLUMINATE_VERSION}" --no-update;
composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update;
composer require "orchestra/testbench:${TESTBENCH_VERSION}" --no-update;
fi
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source

script:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
],
"require": {
"php": "^7.1",
"illuminate/http": "5.6.*|5.7.*",
"illuminate/support": "5.6.*|5.7.*",
"illuminate/http": "5.6.*|5.7.*|5.8.*|6.*",
"illuminate/support": "5.6.*|5.7.*|5.8.*|6.*",
"intervention/image": "^2.4"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"orchestra/testbench": "3.7.*"
"phpunit/phpunit": "^7.0|^8.0",
"orchestra/testbench": "^3.7|^4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/FaviconTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class FaviconTest extends \Orchestra\Testbench\TestCase
/** @var Favicon */
protected $favicon;

public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit efa1a42

Please sign in to comment.