Skip to content

Commit 9c746de

Browse files
committed
Merge pull request #328 from symfony-cmf/test_setup
Improve test set-up
2 parents ae4728e + e4815a6 commit 9c746de

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

.travis.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,32 @@ sudo: false
1212

1313
cache:
1414
directories:
15-
- $HOME/.composer/cache
15+
- $HOME/.composer/cache/files
1616

1717
env:
18-
- SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
18+
global:
19+
- SYMFONY_DEPRECATIONS_HELPER=322
1920

2021
matrix:
2122
include:
22-
- php: 5.3
23-
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
2423
- php: 5.6
25-
env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
24+
env: DEPS=dev
25+
- php: 5.3
26+
env: COMPOSER_FLAGS="--prefer-lowest"
2627
- php: 5.6
27-
env: SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=309
28+
env: SYMFONY_VERSION=2.3.*
2829
- php: 5.6
29-
env: SYMFONY_VERSION=3.0.*
30-
allow_failures:
31-
- env: SYMFONY_VERSION=3.0.*
30+
env: SYMFONY_VERSION=2.7.*
3231
fast_finish: true
3332

3433
before_install:
3534
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3635
- phpenv config-rm xdebug.ini || true
37-
3836
- composer self-update
39-
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
37+
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
38+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
4039

41-
install: composer update --prefer-source $COMPOSER_FLAGS
40+
install: composer update --prefer-dist $COMPOSER_FLAGS
4241

4342
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
4443

composer.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,32 @@
1111
"homepage": "https://github.com/symfony-cmf/RoutingBundle/contributors"
1212
}
1313
],
14-
"minimum-stability": "dev",
15-
"prefer-stable": false,
1614
"require": {
1715
"php": "^5.3.9|^7.0",
1816
"symfony-cmf/routing": "~1.2",
1917
"symfony/framework-bundle": "~2.3"
2018
},
2119
"require-dev": {
2220
"symfony-cmf/core-bundle": "~1.1",
23-
"symfony-cmf/testing": "~1.2,>=1.2.7",
21+
"symfony-cmf/testing": "~1.3@dev",
2422
"doctrine/phpcr-odm": "~1.3",
2523
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2624
"matthiasnoback/symfony-config-test": "^1.3.1",
2725
"phpunit/php-code-coverage": "@stable",
2826
"sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
2927
"symfony/monolog-bundle": "~2.3",
3028
"doctrine/orm": "~2.3",
31-
"doctrine/data-fixtures": "1.*,>=1.0.0-alpha3"
29+
"doctrine/data-fixtures": "^1.0.0-alpha3"
3230
},
3331
"suggest": {
34-
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",
32+
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
3533
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
36-
"doctrine/orm": "To enable support for the ORM entities",
34+
"doctrine/orm": "To enable support for the ORM entities (^2.3)",
3735

3836
"symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle",
39-
"symfony-cmf/core-bundle": "To use the provided Doctrine\\Phpcr documents and for easier configuration",
37+
"symfony-cmf/core-bundle": "To use the provided Doctrine\\Phpcr documents and for easier configuration (^1.1)",
4038

41-
"sonata-project/doctrine-phpcr-admin-bundle": "To provide an admin interface for the PHPCR ODM documents"
39+
"sonata-project/doctrine-phpcr-admin-bundle": "To provide an admin interface for the PHPCR ODM documents (^1.1)"
4240
},
4341
"autoload": {
4442
"psr-4": {

0 commit comments

Comments
 (0)