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

Commit

Permalink
Merge branch 'master' of https://github.com/AltThree/Throttle
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Mar 3, 2018
2 parents 75cdd96 + ca92a59 commit 41c8371
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 31 deletions.
46 changes: 22 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,37 @@ sudo: false

matrix:
include:
- php: 7.0
env: LARAVEL_VERSION=5.2.*
- php: 7.0
env: LARAVEL_VERSION=5.3.*
- php: 7.0
env: LARAVEL_VERSION=5.4.*
- php: 7.0
env: LARAVEL_VERSION=5.5.*
- php: 7.1
env: LARAVEL_VERSION=5.2.*
env:
- LARAVEL_VERSION=5.5.*
- SYMFONY_VERSION=^3.0
- PHPUNIT_VERSION=^6.5
- php: 7.1
env: LARAVEL_VERSION=5.3.*
- php: 7.1
env: LARAVEL_VERSION=5.4.*
- php: 7.1
env: LARAVEL_VERSION=5.5.*
- php: 7.2
env: LARAVEL_VERSION=5.2.*
- php: 7.2
env: LARAVEL_VERSION=5.3.*
env:
- LARAVEL_VERSION=5.6.*
- SYMFONY_VERSION=^4.0
- PHPUNIT_VERSION=^7.0
- php: 7.2
env: LARAVEL_VERSION=5.4.*
env:
- LARAVEL_VERSION=5.5.*
- SYMFONY_VERSION=^3.0
- PHPUNIT_VERSION=^6.5
- php: 7.2
env: LARAVEL_VERSION=5.5.*
env:
- LARAVEL_VERSION=5.6.*
- SYMFONY_VERSION=^4.0
- PHPUNIT_VERSION=^7.0

install:
- composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
- composer require "symfony/lts:${SYMFONY_VERSION}" --no-update -n
- composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update -n
- travis_retry composer install --no-suggest --prefer-dist -n -o

script:
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then vendor/bin/phpunit; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.1" ]; then vendor/bin/phpunit; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi

after_script:
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ An request rate limiter for Laravel 5.

## Installation

This version requires [PHP](https://php.net) 7, and supports Laravel 5.2, 5.3, 5.4, or 5.5.
This version requires [PHP](https://php.net) 7.1 or 7.2, and supports Laravel 5.5, or 5.6.

To get the latest version, simply require the project using [Composer](https://getcomposer.org):

Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
}
],
"require": {
"php": "^7.0",
"illuminate/cache": "5.2.*|5.3.*|5.4.*|5.5.*",
"illuminate/http": "5.2.*|5.3.*|5.4.*|5.5.*"
"php": "^7.1.3",
"illuminate/cache": "5.5.*|5.6.*",
"illuminate/http": "5.5.*|5.6.*"
},
"require-dev": {
"graham-campbell/analyzer": "^2.0",
"graham-campbell/testbench": "^4.0|^5.0",
"phpunit/phpunit": "^6.5"
"graham-campbell/testbench": "^5.0",
"phpunit/phpunit": "^6.5|^7.0"
},
"autoload": {
"psr-4": {
Expand All @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "3.0-dev"
}
},
"minimum-stability": "dev",
Expand Down

0 comments on commit 41c8371

Please sign in to comment.