Skip to content

Commit 39f3005

Browse files
Merge branch '3.0' into 3.1
* 3.0: [travis] Fix deps=low/high builds fixed CS skip test with current phpunit bridge Fix for #19183 to add support for new PHP MongoDB extension in sessions. [Console] Fix for block() padding formatting after #19189 [Security][Guard] check if session exist before using it bumped Symfony version to 3.0.9 updated VERSION for 3.0.8 updated CHANGELOG for 3.0.8 bumped Symfony version to 2.8.9 updated VERSION for 2.8.8 updated CHANGELOG for 2.8.8 bumped Symfony version to 2.7.16 updated VERSION for 2.7.15 update CONTRIBUTORS for 2.7.15 updated CHANGELOG for 2.7.15 Fix some lowest deps Fixed typos in the expectedException annotations Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php
2 parents 8515a10 + 0bec5f1 commit 39f3005

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ public function testSerializerCacheDisabled()
546546

547547
/**
548548
* @group legacy
549+
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
549550
*/
550551
public function testDeprecatedSerializerCacheOption()
551552
{

Tests/Templating/TemplateNameParserTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public function testParseValidNameWithNotFoundBundle()
8686
/**
8787
* @group legacy
8888
* @dataProvider provideAbsolutePaths
89+
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
8990
*/
9091
public function testAbsolutePathsAreDeprecated($name, $logicalName, $path, $ref)
9192
{

0 commit comments

Comments
 (0)