Skip to content

Commit 4af0a94

Browse files
Merge branch '5.0'
* 5.0: (27 commits) Fix versions [Security/Http] Allow setting cookie security settings for delete_cookies [DI] fix generating TypedReference from PriorityTaggedServiceTrait [FrameworkBundle] revert to legacy wiring of the session when circular refs are detected bumped Symfony version to 3.4.40 updated VERSION for 3.4.39 update CONTRIBUTORS for 3.4.39 updated CHANGELOG for 3.4.39 [DomCrawler] Fix BC break in assertions breaking Panther [BrowserKit] fixed missing post request parameters in file uploads update Italian translation [Validator] Add missing Hungarian translations [Validator] Add the missing translations for the Arabic (ar) locale [Validator] Add missing vietnamese translations [Console] Fix OutputStream for PHP 7.4 add missing gitattributes for phpunit-bridge add German translations Bump Symfony version to 5.0.7 Update VERSION for 5.0.6 Update CHANGELOG for 5.0.6 ...
2 parents 116d144 + d98a95d commit 4af0a94

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/Tests export-ignore
22
/phpunit.xml.dist export-ignore
3+
/.gitattributes export-ignore
34
/.gitignore export-ignore

Tests/RouteCollectionBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public function providePrefixTests()
259259
// shows that a prefix will always be given the starting slash
260260
$tests[] = ['0', '/foo', '/0/foo'];
261261

262-
// spaces are ok, and double slahses at the end are cleaned
262+
// spaces are ok, and double slashes at the end are cleaned
263263
$tests[] = ['/ /', '/foo', '/ /foo'];
264264

265265
return $tests;

0 commit comments

Comments
 (0)