Skip to content

Commit 58a3894

Browse files
Merge branch '3.3' into 3.4
* 3.3: Ensure DeprecationErrorHandler::collectDeprecations() is triggered [FrameworkBundle] Allow to disable assets via framework:assets xml configuration fixed $_ENV/$_SERVER precedence in test framework [HttpFoundation] Fix FileBag issue with associative arrays [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop) fix the phpdoc that is not really inherited from response Minor docblock cleanup Remove redundant sprintf arguments.
2 parents 01a9ebd + df07222 commit 58a3894

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/CookieJarTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\BrowserKit\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\BrowserKit\CookieJar;
1615
use Symfony\Component\BrowserKit\Cookie;
16+
use Symfony\Component\BrowserKit\CookieJar;
1717
use Symfony\Component\BrowserKit\Response;
1818

1919
class CookieJarTest extends TestCase
@@ -94,7 +94,7 @@ public function testUpdateFromSetCookieWithMultipleCookies()
9494
{
9595
$timestamp = time() + 3600;
9696
$date = gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
97-
$setCookies = array(sprintf('foo=foo; expires=%s; domain=.symfony.com; path=/, bar=bar; domain=.blog.symfony.com, PHPSESSID=id; expires=%s', $date, $date));
97+
$setCookies = array(sprintf('foo=foo; expires=%s; domain=.symfony.com; path=/, bar=bar; domain=.blog.symfony.com, PHPSESSID=id; expires=%1$s', $date));
9898

9999
$cookieJar = new CookieJar();
100100
$cookieJar->updateFromSetCookie($setCookies);

0 commit comments

Comments
 (0)