Skip to content

Commit d0f0182

Browse files
Merge branch '2.7' into 2.8
* 2.7: 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 fa9fe1b + 23401a3 commit d0f0182

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
@@ -55,7 +55,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
5555
$finder = new Finder();
5656
$metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
5757
// simply check that cache is warmed up
58-
$this->assertGreaterThanOrEqual(1, count($metaFiles));
58+
$this->assertNotEmpty($metaFiles);
5959
$configCacheFactory = new ConfigCacheFactory(true);
6060
$that = $this;
6161

Tests/Controller/ControllerTest.php

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

226+
/**
227+
* @runInSeparateProcess
228+
*/
226229
public function testAddFlash()
227230
{
228231
$flashBag = new FlashBag();

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/config": "~2.8",
2525
"symfony/event-dispatcher": "~2.8|~3.0.0",
2626
"symfony/finder": "^2.0.5|~3.0.0",
27-
"symfony/http-foundation": "~2.7",
27+
"symfony/http-foundation": "~2.7.36|^2.8.29",
2828
"symfony/http-kernel": "^2.8.22",
2929
"symfony/polyfill-mbstring": "~1.0",
3030
"symfony/filesystem": "~2.3|~3.0.0",

0 commit comments

Comments
 (0)