Skip to content

Commit

Permalink
Merge pull request #278 from ADmad/maintainence
Browse files Browse the repository at this point in the history
Bump up min. PHP version to 7.2 and get test suite running again.
  • Loading branch information
reinink authored Jul 7, 2020
2 parents b976168 + 650aee4 commit 8759b8e
Show file tree
Hide file tree
Showing 29 changed files with 140 additions and 1,745 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
build
vendor
docs/_site
docs/_site
.phpunit.result.cache
composer.lock
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
language: php

sudo: false

env:
- COMPOSER_OPTS=""
- COMPOSER_OPTS="--prefer-lowest"

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- 7.4

cache:
directories:
Expand All @@ -24,7 +19,7 @@ install:
- travis_retry composer update --no-interaction --prefer-source

script:
- phpunit --coverage-text --coverage-clover=coverage.clover
- vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"require": {
"intervention/image": "^2.4",
"league/flysystem": "^1.0",
"php": "^5.5 | ^7.0",
"php": "^7.2",
"psr/http-message": "^1.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpunit/php-token-stream": "^1.4",
"phpunit/phpunit": "~4.4"
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^8.5",
"phpunit/php-token-stream": "^3.1"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 8759b8e

Please sign in to comment.