Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 5805cc50402e · 2015-11-03T15:28:10.000+01:00
* 2.7:
  [Security][2.7] Clean deps
  [HttpKernel] Fix time-sensitive test case
  [travis] Fail early when an invalid composer.json is found

Conflicts:
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/composer.json
diff --git a/.travis.php b/.travis.php
@@ -19,8 +19,11 @@
     }
     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',
diff --git 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\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+/**
+ * @group time-sensitive
+ */
 class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
 {
     private $requestStack;
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
@@ -27,8 +27,7 @@
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/http-foundation": "~2.4|~3.0.0",
         "symfony/ldap": "~2.8|~3.0.0",
-        "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
+        "symfony/validator": "~2.5,>=2.5.9|~3.0.0",
         "psr/log": "~1.0"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -37,8 +37,7 @@
         "symfony/finder": "~2.3|~3.0.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.2|~3.0.0",
-        "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
+        "symfony/validator": "~2.5,>=2.5.9|~3.0.0",
         "psr/log": "~1.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/ldap": "~2.8|~3.0.0"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`use Symfony\Component\HttpFoundation\Request;`
`16`	`16`	`use Symfony\Component\HttpFoundation\Response;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * @group time-sensitive`
	`20`	`+ */`
`18`	`21`	`class FragmentHandlerTest extends \PHPUnit_Framework_TestCase`
`19`	`22`	`{`
`20`	`23`	`private $requestStack;`