bug symfony#114 Fix Travis failure for PHP 5.6 (bocharsky-bw)

javiereguiluz · javiereguiluz · commit 3d085baa1e8e · 2015-07-24T12:21:20.000+02:00
This PR was squashed before being merged into the master branch (closes symfony#114). Discussion ---------- Fix Travis failure for PHP 5.6 Commits ------- a4a2a72 Fix Travis failure for PHP 5.6
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,7 @@ matrix:
     - env: SYMFONY_VERSION="2.8.x-dev"
 
 before_install:
+  - composer self-update
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:$SYMFONY_VERSION; fi
 
 install:
diff --git a/composer.json b/composer.json
@@ -7,11 +7,11 @@
         "psr-0": { "": "src/", "SymfonyStandard": "app/" }
     },
     "require": {
-        "php"                                  : ">=5.3.3",
+        "php"                                  : ">=5.3.9",
         "ext-pdo_sqlite"                       : "*",
         "doctrine/doctrine-bundle"             : "~1.5",
         "doctrine/doctrine-fixtures-bundle"    : "~2.2",
-        "doctrine/orm"                         : "~2.5",
+        "doctrine/orm"                         : "~2.4",
         "erusev/parsedown"                     : "~1.5",
         "incenteev/composer-parameter-handler" : "~2.1",
         "ircmaxell/password-compat"            : "~1.0",
@@ -47,7 +47,10 @@
         ]
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.3.9"
+        }
     },
     "extra": {
         "symfony-app-dir": "app",
diff --git a/composer.lock b/composer.lock
