Skip to content

Commit e69ee5b

Browse files
committed
Merge branch '3.0' into 3.1
* 3.0: Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable
2 parents 045a048 + 34ba5f2 commit e69ee5b

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
2929
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
3030
use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
31-
use Symfony\Component\Validator\Validation;
3231

3332
/**
3433
* FrameworkExtension.

Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function welcomeAction(Request $request, $name = null)
4545

4646
public function logoutAction(Request $request)
4747
{
48-
$request->getSession('session')->invalidate();
48+
$request->getSession()->invalidate();
4949

5050
return new Response('Session cleared.');
5151
}

0 commit comments

Comments
 (0)