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

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

diff --git a/.gitignore b/.gitignore
index efdeea5a0..8383a1071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ 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 2da9ed20d..78a494918 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,21 +9,10 @@ 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
deleted file mode 100644
index f2b5606d9..000000000
--- a/Tests/Fixtures/App/config/parameters.yml.travis
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 52e728995..5fab1a8b9 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.6.x-dev@dev",
-        "symfony/yaml": "2.6.x-dev@dev",
-        "symfony/symfony": "2.6.x-dev@dev",
+        "symfony/framework-bundle": "2.5.*",
+        "symfony/yaml": "2.5.*",
+        "symfony/symfony": "2.5.*",
         "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.6.x-dev@dev",
+        "symfony/dom-crawler": "2.5",
         "doctrine/doctrine-fixtures-bundle": "~2.2"
     }
 }