Skip to content

Commit 5df5c57

Browse files
authored
Merge pull request #117 from phansys/dependencies
Make "symfony/*" dependencies explicit
2 parents f79c81e + 2c854d5 commit 5df5c57

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ cache:
3939
- $HOME/.composer/cache
4040

4141
before_script:
42-
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
42+
- if [[ $TRAVIS_PHP_VERSION != hhvm && -f xdebug.ini ]]; then phpenv config-rm xdebug.ini; fi
4343
- if [ "$GITHUB_OAUTH_TOKEN" != "" ]; then echo -e $GITHUB_OAUTH_TOKEN && composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
4444
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
4545
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

composer.json

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,38 @@
2626
],
2727
"require": {
2828
"php": "^5.6 || ^7.0",
29-
"symfony/symfony": "^2.8 || ^3.0 || ^4.0",
30-
"sensio/framework-extra-bundle": "^3.0.2 || ^4.0",
29+
"doctrine/doctrine-bundle": "^1.4",
3130
"doctrine/orm": "^2.4.8",
32-
"doctrine/doctrine-bundle": "~1.4",
33-
"knplabs/knp-paginator-bundle": "~2.3"
31+
"knplabs/knp-paginator-bundle": "^2.3",
32+
"sensio/framework-extra-bundle": "^3.0.2 || ^4.0",
33+
"symfony/config": "^2.8 || ^3.0 || ^4.0",
34+
"symfony/console": "^2.8 || ^3.0 || ^4.0",
35+
"symfony/dependency-injection": "^2.8 || ^3.0 || ^4.0",
36+
"symfony/event-dispatcher": "^2.8 || ^3.0 || ^4.0",
37+
"symfony/form": "^2.8 || ^3.0 || ^4.0",
38+
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0",
39+
"symfony/http-foundation": "^2.8 || ^3.0 || ^4.0",
40+
"symfony/http-kernel": "^2.8 || ^3.0 || ^4.0",
41+
"symfony/options-resolver": "^2.8 || ^3.0 || ^4.0",
42+
"symfony/validator": "^2.8 || ^3.0 || ^4.0"
3443
},
3544
"suggest": {
3645
"vich/uploader-bundle": "Allow attaching files to ticket messages"
3746
},
3847
"require-dev": {
39-
"symfony/form": "^2.8 || ^3.0 || ^4.0",
40-
"symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
4148
"phpunit/phpunit": "^5.4",
42-
"sllh/php-cs-fixer-styleci-bridge": "^1.5"
49+
"sllh/php-cs-fixer-styleci-bridge": "^1.5",
50+
"symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
51+
"symfony/security": "^2.8 || ^3.0 || ^4.0"
4352
},
4453
"autoload": {
4554
"psr-4": {
4655
"Hackzilla\\Bundle\\TicketBundle\\": ""
4756
}
4857
},
58+
"config": {
59+
"sort-packages": true
60+
},
4961
"extra": {
5062
"branch-alias": {
5163
"dev-master": "3.x-dev"

0 commit comments

Comments
 (0)