From a8a7bb15390e30c34f0e8052cef05a9181032953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Thu, 6 Nov 2014 10:01:54 +0100
Subject: [PATCH] switch to symfony 2.6-dev + correct travis error

---
 .gitignore                                      |  1 +
 .travis.yml                                     | 11 +++++++++++
 Tests/Fixtures/App/config/parameters.yml.travis | 11 +++++++++++
 composer.json                                   |  8 ++++----
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 Tests/Fixtures/App/config/parameters.yml.travis

diff --git a/.gitignore b/.gitignore
index 8383a1071..efdeea5a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ web/bundles/*
 app/config/parameters.ini
 app/config/parameters.yml
 Tests/Fixtures/App/config/parameters.yml
+parameters.yml
 
 #composer
 composer.lock
diff --git a/.travis.yml b/.travis.yml
index 78a494918..2da9ed20d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,21 @@ matrix:
   allow_failures:
      - php: hhvm-nightly
 
+addons:
+  postgresql: "9.3"
+
 install: 
    - composer install --dev
    - 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
 
 notifications:
diff --git a/Tests/Fixtures/App/config/parameters.yml.travis b/Tests/Fixtures/App/config/parameters.yml.travis
new file mode 100644
index 000000000..f2b5606d9
--- /dev/null
+++ b/Tests/Fixtures/App/config/parameters.yml.travis
@@ -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
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5fab1a8b9..52e728995 100644
--- a/composer.json
+++ b/composer.json
@@ -19,16 +19,16 @@
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "symfony/framework-bundle": "2.5.*",
-        "symfony/yaml": "2.5.*",
-        "symfony/symfony": "2.5.*",
+        "symfony/framework-bundle": "2.6.x-dev@dev",
+        "symfony/yaml": "2.6.x-dev@dev",
+        "symfony/symfony": "2.6.x-dev@dev",
         "doctrine/dbal": "2.5.*@dev",
         "doctrine/orm": "2.5.*@dev",
         "doctrine/common": "2.4.*@dev",
         "doctrine/doctrine-bundle": "~1.2@dev"
     },
     "require-dev": {
-        "symfony/dom-crawler": "2.5",
+        "symfony/dom-crawler": "2.6.x-dev@dev",
         "doctrine/doctrine-fixtures-bundle": "~2.2"
     }
 }