Skip to content

Commit cca0cd4

Browse files
Fix some small things
- Allow SF 3.0 - Deduplicate script in .travis.yml
1 parent 3b2b651 commit cca0cd4

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ before_install:
3535
fi
3636
3737
install:
38-
- composer update --prefer-source
38+
- composer update --prefer-dist
3939

4040
script:
4141
- vendor/bin/php-cs-fixer fix -v --diff --dry-run
42-
- vendor/bin/behat --tags=~symfony27
4342
- >
4443
if [ "$SYMFONY_VERSION" == "2.5.*" ]; then
4544
vendor/bin/behat --tags=~symfony27
@@ -48,6 +47,6 @@ script:
4847
fi
4948
5049
notifications:
51-
email: p.a.waclawczyk@gmail.com
50+
email: matthiasnoback@gmail.com
5251

5352
sudo: false

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
},
2525
"require": {
2626
"php": ">=5.5",
27-
"symfony/form": "~2.5",
28-
"symfony/console": "~2.5"
27+
"symfony/form": "~2.5|~3.0",
28+
"symfony/console": "~2.5|~3.0"
2929
},
3030
"require-dev": {
3131
"beberlei/assert": "~2.1",
32-
"behat/behat": "~3.0@dev",
32+
"behat/behat": "~3.0",
3333
"fabpot/php-cs-fixer": "^1.10",
34-
"symfony/console": "~2.5",
35-
"symfony/finder": "~2.5",
36-
"symfony/form": "~2.5",
37-
"symfony/framework-bundle": "~2.5",
38-
"symfony/validator": "~2.5",
39-
"symfony/yaml": "~2.5"
34+
"symfony/console": "~2.5|~3.0",
35+
"symfony/finder": "~2.5|~3.0",
36+
"symfony/form": "~2.5|~3.0",
37+
"symfony/framework-bundle": "~2.5|~3.0",
38+
"symfony/validator": "~2.5|~3.0",
39+
"symfony/yaml": "~2.5|~3.0"
4040
}
4141
}

0 commit comments

Comments
 (0)