Skip to content

Commit 53bbfaa

Browse files
authored
Merge pull request #22 from php-school/looser-deps
Loosen symfony/console dependency
2 parents bb4208c + f037425 commit 53bbfaa

File tree

3 files changed

+242
-170
lines changed

3 files changed

+242
-170
lines changed

.travis.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,27 @@ matrix:
1212
- php: 5.6
1313
env:
1414
- EXECUTE_DEPLOYMENT=true
15-
- php: 7
15+
- php: 5.6
16+
env: COMPOSER_FLAGS="--prefer-lowest"
17+
- php: 7.0
18+
env: SYMFONY_VERSION='3.0.*'
19+
- php: 7.0
20+
env: SYMFONY_VERSION='3.1.*'
1621

1722
before_install:
18-
- openssl aes-256-cbc -K $encrypted_d3e7229d64cc_key -iv $encrypted_d3e7229d64cc_iv
19-
-in .travis/secrets.tar.enc -out .travis/secrets.tar -d
20-
- composer self-update
23+
- openssl aes-256-cbc -K $encrypted_d3e7229d64cc_key -iv $encrypted_d3e7229d64cc_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
24+
- composer self-update
25+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/console=$SYMFONY_VERSION; fi
2126

2227
install:
23-
- travis_retry composer install --no-interaction
24-
- composer info -i
28+
- travis_retry composer update $COMPOSER_FLAG --no-interaction
29+
- composer info -i
2530

2631
script:
27-
- composer test-travis
32+
- composer test-travis
2833

2934
after_success:
30-
- if [[ $EXECUTE_DEPLOYMENT == 'true' && $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then ./bin/deploy.sh ; fi
31-
- bash <(curl -s https://codecov.io/bash)
32-
- wget https://scrutinizer-ci.com/ocular.phar
33-
- php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml
35+
- if [[ $EXECUTE_DEPLOYMENT == 'true' && $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then ./bin/deploy.sh ; fi
36+
- bash <(curl -s https://codecov.io/bash)
37+
- wget https://scrutinizer-ci.com/ocular.phar
38+
- php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"knplabs/github-api": "^1.5",
1919
"composer/composer": "^1.1",
2020
"mnapoli/silly-php-di": "^1.0",
21-
"symfony/console": "^3.2@dev",
21+
"symfony/console": "^3.0",
2222
"mnapoli/silly": "^1.4",
2323
"tightenco/collect": "^5.2",
2424
"symfony/filesystem": "^3.1",
@@ -27,8 +27,8 @@
2727
"samsonasik/package-versions": "^1.0"
2828
},
2929
"require-dev": {
30-
"phpunit/phpunit": "~5.0",
31-
"squizlabs/php_codesniffer": "~2.0"
30+
"phpunit/phpunit": "~5.4",
31+
"squizlabs/php_codesniffer": "~2.6"
3232
},
3333
"autoload" : {
3434
"psr-4" : {

0 commit comments

Comments
 (0)