Skip to content

Commit 384ef2f

Browse files
committed
fix tests
1 parent 63ff9c8 commit 384ef2f

File tree

4 files changed

+44
-29
lines changed

4 files changed

+44
-29
lines changed

.travis.yml

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
11
language: php
22

33
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
- 5.6
8+
- 7.0
9+
- hhvm
10+
11+
sudo: false
12+
13+
cache:
14+
directories:
15+
- $HOME/.composer/cache
716

817
env:
9-
- SYMFONY_VERSION=2.5.*
10-
18+
- SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
19+
1120
matrix:
12-
allow_failures:
13-
- env: SYMFONY_VERSION=dev-master
1421
include:
15-
- php: 5.5
16-
env: SYMFONY_VERSION=2.3.*
17-
- php: 5.5
18-
env: SYMFONY_VERSION=2.4.*
19-
- php: 5.5
20-
env: SYMFONY_VERSION=dev-master
21-
22-
22+
- php: 5.3
23+
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
24+
- php: 5.6
25+
env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
26+
- php: 5.6
27+
env: SYMFONY_VERSION=2.8.*
28+
- php: 5.6
29+
env: SYMFONY_VERSION=3.0.*
30+
allow_failures:
31+
- env: SYMFONY_VERSION=2.8.*
32+
- env: SYMFONY_VERSION=3.0.*
33+
fast_finish: true
2334

24-
before_script:
35+
before_install:
36+
- sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
2537
- composer self-update
26-
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
27-
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
38+
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
2839
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
2940

41+
install: composer update $COMPOSER_FLAGS --prefer-dist
42+
43+
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
44+
3045
script: phpunit --coverage-text
3146

3247
notifications:
3348
irc: "irc.freenode.org#symfony-cmf"
34-
49+

Tests/Resources/app/config/config.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12+
$container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\BlogBundle');
1213
$loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
1314
$loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
1415
$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');

Tests/Unit/Util/PostsUtilTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function dataProviderSlugify()
2121
array('this is a slug', 'this-is-a-slug'),
2222
array('This Is A SLUG', 'this-is-a-slug'),
2323
array('je suis une dévelopeur web', 'je-suis-une-developeur-web'),
24-
array('foo!" 812391 !"£ %!"$£*%!"$£', 'foo-812391'),
24+
array('foo!" 812391 !"£ %!"$£*%!"$£', 'foo-812391-lb-lblb'),
2525
array('ĉràzŷ& cĥärs', 'crazy-chars'),
2626
);
2727
}

composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
],
1414
"minimum-stability": "dev",
1515
"require": {
16-
"php": ">=5.3.9",
17-
"symfony/framework-bundle": "~2.2",
18-
"symfony-cmf/core-bundle": "1.0.*",
19-
"symfony-cmf/routing-auto-bundle": "1.0.*",
20-
"doctrine/phpcr-bundle": "1.0.*",
21-
"doctrine/phpcr-odm": "1.0.*"
16+
"php": "^5.3.9|~7.0",
17+
"symfony/framework-bundle": "~2.3|~3.0",
18+
"symfony-cmf/core-bundle": "~1.2",
19+
"symfony-cmf/routing-auto-bundle": "~1.1",
20+
"doctrine/phpcr-bundle": "~1.0",
21+
"doctrine/phpcr-odm": "~1.0"
2222
},
2323
"require-dev": {
24-
"symfony-cmf/testing": "1.1.*",
25-
"sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
26-
"symfony-cmf/core-bundle": "1.0.*"
24+
"symfony-cmf/testing": "~1.3",
25+
"sonata-project/doctrine-phpcr-admin-bundle": "~1.2"
2726
},
2827
"suggest": {
2928
"sonata-project/doctrine-phpcr-admin-bundle": "For sonata administration"

0 commit comments

Comments
 (0)