mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
switch to symfony 2.6-dev + correct travis error
This commit is contained in:
parent
1bcaf92ebf
commit
051feb03ce
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,6 +15,7 @@ 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
|
||||||
|
11
.travis.yml
11
.travis.yml
@ -9,10 +9,21 @@ 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:
|
||||||
|
11
Tests/Fixtures/App/config/parameters.yml.travis
Normal file
11
Tests/Fixtures/App/config/parameters.yml.travis
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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
|
@ -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.5.*",
|
"symfony/framework-bundle": "2.6.x-dev@dev",
|
||||||
"symfony/yaml": "2.5.*",
|
"symfony/yaml": "2.6.x-dev@dev",
|
||||||
"symfony/symfony": "2.5.*",
|
"symfony/symfony": "2.6.x-dev@dev",
|
||||||
"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.5",
|
"symfony/dom-crawler": "2.6.x-dev@dev",
|
||||||
"doctrine/doctrine-fixtures-bundle": "~2.2"
|
"doctrine/doctrine-fixtures-bundle": "~2.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user