Skip to content

Commit 02eada7

Browse files
Merge branch '3.3' into 3.4
* 3.3: fix merge fix merge 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 3d6bbe5 + a8a8bf9 commit 02eada7

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
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

6161
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();

Tests/Fixtures/Validation/Article.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
44

5-
class Article implements NotExistingInterface
6-
{
7-
public $category;
5+
if (!function_exists('__phpunit_run_isolated_test')) {
6+
class Article implements NotExistingInterface
7+
{
8+
public $category;
9+
}
810
}

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.4|~4.0",
2424
"symfony/config": "~3.4|~4.0",
2525
"symfony/event-dispatcher": "^3.3.1|~4.0",
26-
"symfony/http-foundation": "~3.3|~4.0",
26+
"symfony/http-foundation": "^3.3.11|~4.0",
2727
"symfony/http-kernel": "~3.4|~4.0",
2828
"symfony/polyfill-mbstring": "~1.0",
2929
"symfony/filesystem": "~2.8|~3.0|~4.0",

0 commit comments

Comments
 (0)