Revert "switch to symfony 2.6-dev + correct travis error"

This reverts commit 051feb03ceb898a5b61696163c92bbe28fd82932.
This commit is contained in:
Julien Fastré 2014-11-06 15:27:25 +01:00
parent c3d6e504cb
commit 6f9fbaba38
4 changed files with 4 additions and 27 deletions

1
.gitignore vendored
View File

@ -15,7 +15,6 @@ web/bundles/*
app/config/parameters.ini app/config/parameters.ini
app/config/parameters.yml app/config/parameters.yml
Tests/Fixtures/App/config/parameters.yml Tests/Fixtures/App/config/parameters.yml
parameters.yml
#composer #composer
composer.lock composer.lock

View File

@ -9,21 +9,10 @@ matrix:
allow_failures: allow_failures:
- php: hhvm-nightly - php: hhvm-nightly
addons:
postgresql: "9.3"
install: install:
- composer install --dev - composer install --dev
- php Tests/Fixtures/App/console --env=test cache:warmup - php Tests/Fixtures/App/console --env=test cache:warmup
before_script:
- psql -c 'create database test0;' -U postgres
- cp Tests/Fixtures/App/config/parameters.travis.yml Tests/Fixtures/App/config/parameters.yml
- php Tests/Fixtures/App/console doctrine:schema:create --env=test
- php Tests/Fixtures/App/console doctrine:fixtures:load --env=test
script: phpunit --coverage-text script: phpunit --coverage-text
notifications: notifications:

View File

@ -1,11 +0,0 @@
parameters:
database_host: 127.0.0.1
database_port: 5432
database_name: test0
database_user: postgres
database_password: postgres
locale: fr
secret: ThisTokenIsNotSoSecretChangeIt
debug_toolbar: true
debug_redirects: false
use_assetic_controller: true

View File

@ -19,16 +19,16 @@
"twig/extensions": "~1.0", "twig/extensions": "~1.0",
"symfony/assetic-bundle": "~2.3", "symfony/assetic-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4", "symfony/monolog-bundle": "~2.4",
"symfony/framework-bundle": "2.6.x-dev@dev", "symfony/framework-bundle": "2.5.*",
"symfony/yaml": "2.6.x-dev@dev", "symfony/yaml": "2.5.*",
"symfony/symfony": "2.6.x-dev@dev", "symfony/symfony": "2.5.*",
"doctrine/dbal": "2.5.*@dev", "doctrine/dbal": "2.5.*@dev",
"doctrine/orm": "2.5.*@dev", "doctrine/orm": "2.5.*@dev",
"doctrine/common": "2.4.*@dev", "doctrine/common": "2.4.*@dev",
"doctrine/doctrine-bundle": "~1.2@dev" "doctrine/doctrine-bundle": "~1.2@dev"
}, },
"require-dev": { "require-dev": {
"symfony/dom-crawler": "2.6.x-dev@dev", "symfony/dom-crawler": "2.5",
"doctrine/doctrine-fixtures-bundle": "~2.2" "doctrine/doctrine-fixtures-bundle": "~2.2"
} }
} }