Skip to content
This repository has been archived by the owner on Apr 7, 2021. It is now read-only.

Commit

Permalink
Merge 54908d5 into a9defe4
Browse files Browse the repository at this point in the history
  • Loading branch information
daison12006013 committed Feb 19, 2019
2 parents a9defe4 + 54908d5 commit 425125d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build:
format: 'clover'
environment:
php:
version: 7.1, 7.2
version: 7.2
tools:
php_loc:
enabled: true
Expand Down
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,24 @@ matrix:
env: LARAVEL=56
- php: 7.1
env: LARAVEL=57
- php: 7.1
env: LARAVEL=58
- php: 7.2
env: LARAVEL=55
- php: 7.2
env: LARAVEL=56
- php: 7.2
env: LARAVEL=57
- php: 7.2
env: LARAVEL=58
- php: 7.3
env: LARAVEL=55
- php: 7.3
env: LARAVEL=56
- php: 7.3
env: LARAVEL=57
- php: 7.3
env: LARAVEL=58

services:
- mysql
Expand Down Expand Up @@ -57,6 +63,11 @@ script:
- if [ "$LARAVEL" = "57" ] ; then composer require "laravel/framework:5.7.*" --no-update ; fi
- if [ "$LARAVEL" = "57" ] ; then composer require "orchestra/database:3.7.x-dev as 3.7" --no-update ; fi
- if [ "$LARAVEL" = "57" ] ; then composer require "orchestra/testbench:3.7.*" --no-update ; fi
# Packages: Laravel 5.8.x
- if [ "$LARAVEL" = "58" ] ; then composer require "phpunit/phpunit:7.*" --no-update ; fi
- if [ "$LARAVEL" = "58" ] ; then composer require "laravel/framework:5.8.*-dev" --no-update ; fi
- if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/database:3.7.x-dev as 3.7" --no-update ; fi
- if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/testbench:3.7.*" --no-update ; fi
# Packages: Update
- composer update --prefer-source --no-interaction
# Tests: Run
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"require": {
"php": ">=7.1.0",
"laravel/framework": "5.5.*|5.6.*|5.7.*",
"laravel/framework": "5.8.x-dev",
"paragonie/random_compat": "^2.0"
},
"require-dev": {
Expand All @@ -69,7 +69,8 @@
"src/helpers.php"
]
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"laravel": {
"providers": [
Expand Down
2 changes: 1 addition & 1 deletion tests/DatabaseTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class DatabaseTestCase extends TestCase

private $last_random_strings = null;

public function tearDown()
public function tearDown(): void
{
$this->tearDownDatabase();
parent::tearDown();
Expand Down

0 comments on commit 425125d

Please sign in to comment.