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 41e2d2f commit 1feff5d
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 20 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.

38 changes: 26 additions & 12 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 @@ -7,23 +11,33 @@ notifications:
on_success: never
on_failure: always

php:
- 7.0
- 7.1
- 7.2

env:
matrix:
- COMPOSER_FLAGS="--prefer-lowest"
- COMPOSER_FLAGS=""
matrix:
include:
- php: 7.2
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
- 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
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

[![Build Status](https://travis-ci.org/melihovv/collection-grouped-by-model.svg?branch=master)](https://travis-ci.org/melihovv/collection-grouped-by-model)
[![styleci](https://styleci.io/repos/107822001/shield)](https://styleci.io/repos/107822001)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/melihovv/collection-grouped-by-model/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/melihovv/collection-grouped-by-model/?branch=master)
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/0cbdb2a1-cbed-4232-9c0a-48a78cf741ef/mini.png)](https://insight.sensiolabs.com/projects/0cbdb2a1-cbed-4232-9c0a-48a78cf741ef)
[![Coverage Status](https://coveralls.io/repos/github/melihovv/collection-grouped-by-model/badge.svg?branch=master)](https://coveralls.io/github/melihovv/collection-grouped-by-model?branch=master)

[![Packagist](https://img.shields.io/packagist/v/melihovv/collection-grouped-by-model.svg)](https://packagist.org/packages/melihovv/collection-grouped-by-model)
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
}
],
"require": {
"php": ">=7.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0"
"php": ">=7.2",
"illuminate/support": "^6.0"
},
"require-dev": {
"phpunit/phpunit": "~6.0|~7.0"
"phpunit/phpunit": "^8.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 1feff5d

Please sign in to comment.