Skip to content

Commit 22ea21b

Browse files
committed
Merge pull request #323 from Ener-Getick/SF3
Add Symfony 3.0 support
2 parents f15a893 + 982fa99 commit 22ea21b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ matrix:
1616
allow_failures:
1717
- php: nightly
1818
fast_finish: true
19+
include:
20+
- php: 5.6
21+
env: DEPENDENCIES=dev
1922

2023
before_script:
2124
- composer self-update
22-
- if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then wget http://get.sensiolabs.org/php-cs-fixer.phar; fi;
25+
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ] && [ "$DEPENDENCIES" != "dev" ]; then wget http://get.sensiolabs.org/php-cs-fixer.phar; fi;
26+
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
2327

2428
install:
2529
- composer install
2630

2731
script:
2832
- vendor/bin/behat
2933
- vendor/bin/phpunit
30-
- if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then php php-cs-fixer.phar fix --no-interaction --dry-run --diff -vvv; fi;
34+
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ] && [ "$DEPENDENCIES" != "dev" ]; then php php-cs-fixer.phar fix --no-interaction --dry-run --diff -vvv; fi;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"symfony/serializer": "^2.7.2|~3.0",
1818
"symfony/validator": "~2.5|~3.0",
1919
"symfony/framework-bundle": "~2.6|~3.0",
20-
"symfony/proxy-manager-bridge": "~2.3",
20+
"symfony/proxy-manager-bridge": "~2.3|~3.0",
2121
"ocramius/proxy-manager": "~1.0",
2222
"doctrine/inflector": "~1.0",
2323
"dunglas/php-property-info": "~0.2",

0 commit comments

Comments
 (0)