Skip to content

Commit f114149

Browse files
committed
fix master branch by updating sonata cache packages and bumping php versions < 7.1
1 parent 8160553 commit f114149

File tree

9 files changed

+614
-579
lines changed

9 files changed

+614
-579
lines changed

.travis.yml

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

33
php:
4-
- 5.6
5-
- 7.0
6-
# 7.1 is tested using composer install
4+
- 7.1
75

86
sudo: false
97

@@ -18,24 +16,25 @@ matrix:
1816
env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
1917
- php: 7.1
2018
env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
21-
- php: hhvm
22-
dist: trusty
2319

2420
env:
2521
global:
22+
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
2623
- SYMFONY_DEPRECATIONS_HELPER=weak
2724
matrix:
2825
- TRANSPORT=jackrabbit
2926
- TRANSPORT=doctrine_dbal
3027

3128
before_install:
32-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
33-
# hack to avoid segmentation fault because of https://bugs.php.net/bug.php?id=74843
29+
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
3430
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then echo "zend.enable_gc = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3531
- phpenv config-rm xdebug.ini || true
3632
- composer self-update
3733

38-
install: if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
34+
install:
35+
- phpenv config-add travis.php.ini
36+
- php -ini | grep memory_limit
37+
- if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
3938

4039
before_script:
4140
- cp app/config/phpcr_${TRANSPORT}.yml.dist app/config/phpcr.yml
@@ -44,7 +43,7 @@ before_script:
4443
- bin/console doctrine:phpcr:workspace:create sandbox_test -e=test
4544
- bin/console doctrine:phpcr:repository:init -e=test
4645

47-
script: vendor/bin/simple-phpunit
46+
script: php vendor/bin/simple-phpunit --debug
4847

4948
notifications:
5049
irc: "irc.freenode.org#symfony-cmf"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Functional tests are written with PHPUnit. Note that Bundles and Components are
162162
php bin/console doctrine:phpcr:workspace:create sandbox_test
163163
phpunit -c app
164164

165+
165166
## Remove demo configuration
166167

167168
If you start a project from the sandbox, remove ```.sensiolabs.yml``` as its not a good example for production use.

app/config/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ cmf_menu:
117117

118118
cmf_resource:
119119
description:
120-
enhancers: [sonata_phpcr_admin, cmf_tree_icons, doctrine_phpcr_position]
120+
enhancers: [doctrine_phpcr_position]
121121
repositories:
122122
default:
123123
type: doctrine/phpcr-odm

composer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"psr-4": { "Tests\\": "tests/" }
1818
},
1919
"require": {
20-
"php": "^5.6|^7.0",
20+
"php": "^7.1",
2121
"symfony/symfony": "^3.3",
2222
"symfony/assetic-bundle": "^2.8",
2323
"symfony/swiftmailer-bundle": "^2.3.10",
@@ -40,7 +40,7 @@
4040
"doctrine/doctrine-cache-bundle": "^1.2",
4141
"doctrine/phpcr-odm": "^1.4",
4242

43-
"sonata-project/cache-bundle": "^2.1",
43+
"sonata-project/cache-bundle": "^2.4",
4444
"sonata-project/translation-bundle": "2.1.0",
4545
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
4646

@@ -55,7 +55,7 @@
5555
"sensio/generator-bundle": "^3.0",
5656
"liip/functional-test-bundle": "^1.3",
5757
"symfony-cmf/testing": "^2.0",
58-
"symfony/phpunit-bridge": "^3.2"
58+
"symfony/phpunit-bridge": "^3.3"
5959
},
6060
"scripts": {
6161
"post-install-cmd": [
@@ -90,5 +90,8 @@
9090
"branch-alias": {
9191
"dev-master": "2.0-dev"
9292
}
93+
},
94+
"conflict": {
95+
"sonata-project/cache": "<1.1.1"
9396
}
9497
}

0 commit comments

Comments
 (0)