Skip to content

Commit 7a7c4d1

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 2884c26 + d7dfe7f commit 7a7c4d1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Tests/InlineTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ public function getScalarIndicators()
255255

256256
/**
257257
* @group legacy
258+
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
258259
* throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
259260
*/
260261
public function testParseUnquotedScalarStartingWithPercentCharacter()

0 commit comments

Comments
 (0)