Skip to content

Commit

Permalink
Merge pull request #41 from rdohms/cleanup-7
Browse files Browse the repository at this point in the history
Cleaning house for future support
  • Loading branch information
rdohms authored Jul 18, 2018
2 parents 13994b8 + 930708d commit f01d7bc
Show file tree
Hide file tree
Showing 17 changed files with 737 additions and 652 deletions.
12 changes: 1 addition & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.1.13
- 7.2

before_script:
- phpenv config-rm xdebug.ini
- composer self-update
- if [[ "$TRAVIS_PHP_VERSION" == 5* ]]; then rm composer.lock; fi;
- composer install --dev
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update && composer update --dev; fi;

script: ./vendor/bin/phpunit

matrix:
include:
- php: 5.6
env: SYMFONY_VERSION=2.8.*
- php: 5.6
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION=^3
- php: 7.2
env: SYMFONY_VERSION=3.0.*
- php: 7.2
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
],

"require": {
"php": "^5.6|^7",
"php": "^7.1.13",
"dms/dms-filter": "^2.0 | ^3.0",
"symfony/symfony": "^2.8 | ^3.0 | ^4.0"
"symfony/symfony": "^2.8.18 | ^3.0 | ^4.0"
},

"require-dev": {
"phpunit/phpunit": "^5"
"phpunit/phpunit": "^6"
},

"autoload": {
"psr-0": {
"DMS": "src"
"psr-4": {
"DMS\\Bundle\\FilterBundle\\": "./src/DMS/Bundle/FilterBundle"
}
}
}
Loading

0 comments on commit f01d7bc

Please sign in to comment.