Skip to content

Commit 598b37f

Browse files
Merge branch '2.8' into 3.3
* 2.8: fix merge Fix 7.2 compat layer Fix PHP 7.2 support [HttpFoundation] Add missing session.lazy_write config option [HttpFoundation] Combine Cache-Control headers [Form] fix parsing invalid floating point numbers Escape command usage when displaying it in the text descriptor Use for=ID on radio/checkbox label.
2 parents f440e16 + d0f0182 commit 598b37f

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Tests/Command/CacheClearCommand/CacheClearCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
6767
$finder = new Finder();
6868
$metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
6969
// simply check that cache is warmed up
70-
$this->assertGreaterThanOrEqual(1, count($metaFiles));
70+
$this->assertNotEmpty($metaFiles);
7171
$configCacheFactory = new ConfigCacheFactory(true);
7272

7373
foreach ($metaFiles as $file) {

Tests/Controller/ControllerTraitTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,9 @@ public function testRedirectToRoute()
373373
$this->assertSame(302, $response->getStatusCode());
374374
}
375375

376+
/**
377+
* @runInSeparateProcess
378+
*/
376379
public function testAddFlash()
377380
{
378381
$flashBag = new FlashBag();

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/dependency-injection": "~3.3",
2424
"symfony/config": "~3.3",
2525
"symfony/event-dispatcher": "^3.3.1",
26-
"symfony/http-foundation": "~3.3",
26+
"symfony/http-foundation": "^3.3.11",
2727
"symfony/http-kernel": "~3.3",
2828
"symfony/polyfill-mbstring": "~1.0",
2929
"symfony/filesystem": "~2.8|~3.0",

0 commit comments

Comments
 (0)