From 437e268036811d3c59c62fe961ee7e6f8482f7cf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 25 Oct 2015 21:44:48 +0100
Subject: [PATCH 1/3] [travis] Fail early when an invalid composer.json is
 found

---
 .travis.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.php b/.travis.php
index 1334f14ad4..511e05008a 100644
--- a/.travis.php
+++ b/.travis.php
@@ -19,8 +19,11 @@ foreach ($dirs as $dir) {
     }
     echo "$dir\n";
 
-    $json = file_get_contents($dir.'/composer.json');
-    $package = json_decode($json);
+    $json = ltrim(file_get_contents($dir.'/composer.json'));
+    if (null === $package = json_decode($json)) {
+        passthru("composer validate $dir/composer.json");
+        exit(1);
+    }
 
     $package->repositories = array(array(
         'type' => 'composer',

From c188b35b18780e420b4f469a42be0dfc8f71695c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 3 Nov 2015 14:00:54 +0100
Subject: [PATCH 2/3] [HttpKernel] Fix time-sensitive test case

---
 .../HttpKernel/Tests/Fragment/FragmentHandlerTest.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index 3f6780a876..e569accac4 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -15,6 +15,9 @@ use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+/**
+ * @group time-sensitive
+ */
 class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
 {
     /**

From d51ab88541e00ac9d79a937bb913df7f098a6b2b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 3 Nov 2015 15:07:35 +0100
Subject: [PATCH 3/3] [Security][2.7] Clean deps

---
 src/Symfony/Component/Security/Core/composer.json | 3 +--
 src/Symfony/Component/Security/composer.json      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 5672a283a3..bae25188bb 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -22,8 +22,7 @@
         "symfony/event-dispatcher": "~2.1",
         "symfony/expression-language": "~2.6",
         "symfony/http-foundation": "~2.4",
-        "symfony/translation": "~2.0,>=2.0.5",
-        "symfony/validator": "~2.5,>=2.5.5",
+        "symfony/validator": "~2.5,>=2.5.9",
         "psr/log": "~1.0",
         "ircmaxell/password-compat": "1.0.*"
     },
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index be42c2a8ac..39fdb6fc64 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -31,8 +31,7 @@
         "symfony/finder": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
-        "symfony/translation": "~2.0,>=2.0.5",
-        "symfony/validator": "~2.5,>=2.5.5",
+        "symfony/validator": "~2.5,>=2.5.9",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0",