Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit d9c1903

Browse files
committed
Sync with other CMF packages
1 parent f19c445 commit d9c1903

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: php
22

33
php:
4-
- 5.5
5-
- 5.6
64
- 7.0
75
- hhvm
86

@@ -11,32 +9,34 @@ sudo: false
119
cache:
1210
directories:
1311
- $HOME/.composer/cache/files
12+
- .phpunit
1413

1514
env:
16-
- SYMFONY_VERSION=2.7.*
15+
matrix: SYMFONY_VERSION=3.2.*
16+
global: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
1717

1818
matrix:
1919
include:
2020
- php: 5.6
21-
env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
22-
- php: 5.6
23-
env: SYMFONY_VERSION=2.8.*
24-
- php: 5.6
25-
env: SYMFONY_VERSION=3.0.*
26-
allow_failures:
27-
- env: SYMFONY_VERSION=2.8.*
28-
- env: SYMFONY_VERSION=3.0.*
21+
env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
22+
- php: 7.1
23+
env: DEPS=dev
24+
- php: 7.1
25+
env: SYMFONY_VERSION=3.1.*
2926
fast_finish: true
3027

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

35-
install: composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
35+
install: composer update --prefer-dist $COMPOSER_FLAGS
3636

3737
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
3838

39-
script: phpunit --coverage-text
39+
script: vendor/bin/simple-phpunit
4040

4141
notifications:
4242
irc: "irc.freenode.org#symfony-cmf"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ provide the context with which to resolve the documents.
2727

2828
## Requirements
2929

30-
* Symfony 2.2.x
30+
* Symfony 2.8+
3131
* See also the `require` section of [composer.json](composer.json)
3232

3333
## Documentation

composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^5.5.9|^7.0",
14-
"symfony/framework-bundle": "^2.7|3.*",
15-
"symfony/options-resolver": "^2.7|3.*",
16-
"symfony-cmf/resource": "dev-include-puli as 1.0.0"
13+
"php": "^5.6|^7.0",
14+
"symfony/framework-bundle": "^2.8|^3.0",
15+
"symfony/options-resolver": "^2.8|^3.0",
16+
"symfony-cmf/resource": "1.0.*@dev"
1717
},
1818
"require-dev": {
1919
"symfony-cmf/testing": "^1.3|^2.0",
20-
"doctrine/phpcr-odm": "^1.2|^2.0"
20+
"symfony/phpunit-bridge": "^3.2",
21+
"doctrine/phpcr-odm": "^1.3"
2122
},
22-
"minimum-stability": "dev",
23+
"minimum-stability": "RC",
2324
"prefer-stable": true,
2425
"suggest": {
25-
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.2)",
26+
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
2627
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents"
2728
},
2829
"autoload": {

0 commit comments

Comments
 (0)