Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit 3c4e65fb9e53 · 2016-12-18T22:04:59.000+01:00
* 3.1:
  [HttpKernel] Fix ClientTest cookie format assertions
diff --git a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
@@ -18,6 +18,9 @@
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;
 
+/**
+ * @group time-sensitive
+ */
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
     public function testDoRequest()

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`use Symfony\Component\HttpFoundation\File\UploadedFile;`
`19`	`19`	`use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;`
`20`	`20`
	`21`	`+/**`
	`22`	`+ * @group time-sensitive`
	`23`	`+ */`
`21`	`24`	`class ClientTest extends \PHPUnit_Framework_TestCase`
`22`	`25`	`{`
`23`	`26`	`public function testDoRequest()`