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

Commit 91c2df4

Browse files
committed
Merge pull request #158 from symfony-cmf/travis_setup
Travis setup
2 parents 0552ecd + f8c73ec commit 91c2df4

File tree

3 files changed

+41
-23
lines changed

3 files changed

+41
-23
lines changed

.travis.yml

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
language: php
22

33
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
7-
- 5.6
8-
- hhvm
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
- 5.6
8+
- hhvm
9+
- nightly
910

1011
sudo: false
1112

@@ -14,24 +15,39 @@ cache:
1415
- $HOME/.composer/cache
1516

1617
env:
17-
- SYMFONY_VERSION=2.5.*
18+
- SYMFONY_VERSION=2.6.*
1819

1920
matrix:
2021
include:
21-
- php: 5.5
22+
- php: 5.6
2223
env: SYMFONY_VERSION=2.3.*
23-
- php: 5.5
24-
env: SYMFONY_VERSION=2.4.*
25-
- php: 5.5
26-
env: SYMFONY_VERSION=2.6.*
27-
28-
before_script:
24+
- php: 5.6
25+
env: SYMFONY_VERSION=2.7.*
26+
- php: 5.6
27+
env: SYMFONY_VERSION=2.8.*
28+
- php: 5.6
29+
env: SYMFONY_VERSION=3.0.*
30+
- php: 5.3
31+
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
32+
allow_failures:
33+
- php: nightly
34+
- php: 5.6
35+
env: SYMFONY_VERSION=2.7.*
36+
- php: 5.6
37+
env: SYMFONY_VERSION=2.8.*
38+
- php: 5.6
39+
env: SYMFONY_VERSION=3.0.*
40+
41+
before_install:
42+
- sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
2943
- composer selfupdate
30-
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
31-
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
44+
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
45+
46+
install: composer update $COMPOSER_FLAGS --prefer-dist
47+
48+
before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
3249

33-
script:
34-
- phpunit
50+
script: phpunit
3551

3652
notifications:
3753
irc: "irc.freenode.org#symfony-cmf"

Tests/WebTest/RedirectTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ class RedirectTest extends BaseTestCase
1919
{
2020
public function setUp(array $options = array(), $routebase = null)
2121
{
22-
parent::setUp($options, $routebase);
2322
$this->client = $this->createClient();
2423

24+
parent::setUp($options, $routebase);
25+
2526
$article = new SeoArticle();
2627
$article->title = 'SEO Article';
2728
$article->path = '/test/article-1';

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,21 @@
1212
"minimum-stability": "dev",
1313
"require": {
1414
"php": ">=5.3.9",
15-
"symfony-cmf/routing-auto": "~1.0",
16-
"symfony-cmf/routing-bundle": "~1.2",
15+
"symfony-cmf/routing-auto": "~1.1",
16+
"symfony-cmf/routing-bundle": "~1.2,>=1.2.0",
1717
"symfony-cmf/core-bundle": "~1.2",
1818
"aferrandini/urlizer": "1.0.*",
1919
"symfony/config": "~2.2",
2020
"jms/metadata": "1.5.*"
2121
},
2222
"require-dev": {
23-
"symfony-cmf/testing": "~1.1",
23+
"symfony-cmf/testing": "~1.2,>=1.2.7",
2424
"symfony/yaml": "~2.1",
25-
"matthiasnoback/symfony-dependency-injection-test": "0.*",
25+
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2626
"matthiasnoback/symfony-config-test": "0.*",
2727
"doctrine/phpcr-odm": "~1.2",
28-
"phpunit/phpunit": "~4.5"
28+
"phpunit/phpunit": "~4.5",
29+
"symfony/phpunit-bridge": "2.7.x@beta"
2930
},
3031
"suggest": {
3132
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",

0 commit comments

Comments
 (0)