Security update for Core, with self-updated composer

[yaffs-website] / vendor / symfony / http-kernel / Tests / ClientTest.php

diff --git a/vendor/symfony/http-kernel/Tests/ClientTest.php b/vendor/symfony/http-kernel/Tests/ClientTest.php
index ac3ea1e860af2bc364d9187de80113b7492f903c..5ce7fb44d2aa2d1dd93cc3e1a3a0d59be238bfe6 100644 (file)
--- a/vendor/symfony/http-kernel/Tests/ClientTest.php
+++ b/vendor/symfony/http-kernel/Tests/ClientTest.php
@@ -19,6 +19,9 @@ use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;
 
+/**
+ * @group time-sensitive
+ */
 class ClientTest extends TestCase
 {
     public function testDoRequest()
@@ -57,22 +60,44 @@ class ClientTest extends TestCase
         $m = $r->getMethod('filterResponse');
         $m->setAccessible(true);
 
-        $expected = array(
+        $expected31 = array(
             'foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
             'foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
         );
+        $expected33 = array(
+            'foo=bar; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly',
+            'foo1=bar1; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly',
+        );
 
         $response = new Response();
         $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $domResponse = $m->invoke($client, $response);
-        $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
+        try {
+            $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+        }
 
         $response = new Response();
         $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $response->headers->setCookie(new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $domResponse = $m->invoke($client, $response);
-        $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
-        $this->assertEquals($expected, $domResponse->getHeader('Set-Cookie', false));
+        try {
+            $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+        }
+        try {
+            $this->assertEquals($expected31, $domResponse->getHeader('Set-Cookie', false));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33, $domResponse->getHeader('Set-Cookie', false));
+        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals($expected33, $domResponse->getHeader('Set-Cookie', false));
+        }
     }
 
     public function testFilterResponseSupportsStreamedResponses()