Skip to content

Commit 2f28b0e

Browse files
Merge branch '3.4' into 4.0
* 3.4: [YAML] Issue #26065: leading spaces in YAML multi-line string literals [Bridge\PhpUnit] Exit as late as possible [Bridge\PhpUnit] Cleanup BC layer [PhpBridge] add PHPUnit 7 support to SymfonyTestsListener [Lock] Log already-locked errors as "notice" instead of "warning" add context to serialize and deserialize Update Repository Symlink Helper Document explicitly that dotfiles and vcs files are ignored by default [HttpKernel] don't try to wire Request argument with controller.service_arguments Make kernel build time optionally deterministic Use 0 for unlimited expiry [Routing] fix typo Bump default PHPUnit version from 6.3 to 6.5 do not mock the container builder in tests [Cache][WebProfiler] fix collecting cache stats with sub-requests + allow clearing calls
2 parents 6ef6ebf + f505f18 commit 2f28b0e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Fixtures/dumper/url_matcher4.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function match($rawPathinfo)
6262
not_get_and_head:
6363

6464
// post_and_head
65-
if ('/post_and_get' === $pathinfo) {
65+
if ('/post_and_head' === $pathinfo) {
6666
if (!in_array($requestMethod, array('POST', 'HEAD'))) {
6767
$allow = array_merge($allow, array('POST', 'HEAD'));
6868
goto not_post_and_head;

Tests/Matcher/Dumper/PhpMatcherDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public function getRouteCollections()
354354
array('GET', 'HEAD')
355355
));
356356
$headMatchCasesCollection->add('post_and_head', new Route(
357-
'/post_and_get',
357+
'/post_and_head',
358358
array(),
359359
array(),
360360
array(),

0 commit comments

Comments
 (0)