Skip to content

Commit

Permalink
laravel 6.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
melihovv committed Sep 7, 2019
1 parent 0fe17d5 commit d0e848f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 48 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.idea
/node_modules
/composer.lock
/.phpunit.result.cache
3 changes: 0 additions & 3 deletions .sensiolabs.yml

This file was deleted.

62 changes: 23 additions & 39 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
cache:
directories:
- $HOME/.composer/cache

language: php

sudo: false
Expand All @@ -9,51 +13,31 @@ notifications:

matrix:
include:
- php: 7.0
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.0
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS=""
- php: 7.1
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.1
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS=""
- php: 7.1
env: LARAVEL_VERSION=5.6.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.1
env: LARAVEL_VERSION=5.6.* COMPOSER_FLAGS=""
- php: 7.1
env: LARAVEL_VERSION=5.7.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.1
env: LARAVEL_VERSION=5.7.* COMPOSER_FLAGS=""
- php: 7.1
env: LARAVEL_VERSION=5.8.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.1
env: LARAVEL_VERSION=5.8.* COMPOSER_FLAGS=""
- php: 7.2
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: LARAVEL_VERSION=5.5.* COMPOSER_FLAGS=""
- php: 7.2
env: LARAVEL_VERSION=5.6.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: LARAVEL_VERSION=5.6.* COMPOSER_FLAGS=""
- php: 7.2
env: LARAVEL_VERSION=5.7.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: LARAVEL_VERSION=5.7.* COMPOSER_FLAGS=""
- php: 7.2
env: LARAVEL_VERSION=5.8.* COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: LARAVEL_VERSION=5.8.* COMPOSER_FLAGS=""
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.2
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.3
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.3
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.4snapshot
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.4snapshot
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
fast_finish: true
allow_failures:
- php: 7.4snapshot

before_install:
- travis_retry composer self-update --stable -n
- composer config discard-changes true
- composer validate --no-check-all --strict
- composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
- travis_retry composer self-update
- travis_retry composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update

install:
- travis_retry composer update --prefer-source $COMPOSER_FLAGS
- travis_retry composer require --dev satooshi/php-coveralls
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
- composer require satooshi/php-coveralls --dev

script:
- composer run phpunit -- --coverage-clover ./tests/logs/clover.xml
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
}
],
"require": {
"php": ">=7.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/validation": "~5.5.0|~5.6.0|~5.7.0|~5.8.0"
"php": ">=7.2",
"illuminate/support": "^6.0",
"illuminate/validation": "^6.0"
},
"require-dev": {
"mockery/mockery": "^0.9.9",
"phpunit/phpunit": "~6.0|~7.0"
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/EloquentPresenceVerifierTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class EloquentPresenceVerifierTest extends TestCase
{
public function tearDown()
public function tearDown() : void
{
m::close();
}
Expand Down

0 comments on commit d0e848f

Please sign in to comment.