Skip to content

Commit 6110e97

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: fixed a typo fixed CS for lambdas [Yaml] fixed some license headers Fixes message value for objects Check for hour, minute & second validity fixed various typos [Filesystem] Fixed mirror for symlinks [Validator] Removed duplicated test for IBAN in data provider Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Component/Console/Application.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
2 parents 9255b06 + 6a41767 commit 6110e97

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Tests/DependencyInjection/ContainerAwareHttpKernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testVerifyRequestStackPushPopDuringHandle($type)
5656
{
5757
$request = new Request();
5858
$expected = new Response();
59-
$controller = function() use ($expected) {
59+
$controller = function () use ($expected) {
6060
return $expected;
6161
};
6262

Tests/KernelTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ public function doStuff()
268268

269269
$output = Kernel::stripComments($source);
270270

271-
// Heredocs are preserved, making the output mixing unix and windows line
272-
// endings, switching to "\n" everywhere on windows to avoid failure.
271+
// Heredocs are preserved, making the output mixing Unix and Windows line
272+
// endings, switching to "\n" everywhere on Windows to avoid failure.
273273
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
274274
$expected = str_replace("\r\n", "\n", $expected);
275275
$output = str_replace("\r\n", "\n", $output);

0 commit comments

Comments
 (0)