Skip to content

Commit 37849b9

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Minor fixes [Console] Overcomplete argument exception message tweak.
2 parents d3097b7 + c1fefb6 commit 37849b9

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Symfony\Component\Finder\Finder;
2424
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
2525
use Symfony\Component\Config\FileLocator;
26-
use Symfony\Component\Validator\Validation;
2726

2827
/**
2928
* FrameworkExtension.

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
1919
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
2020
use Symfony\Component\DependencyInjection\Reference;
21-
use Symfony\Component\Validator\Validation;
2221

2322
abstract class FrameworkExtensionTest extends TestCase
2423
{

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

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

4343
public function logoutAction(Request $request)
4444
{
45-
$request->getSession('session')->invalidate();
45+
$request->getSession()->invalidate();
4646

4747
return new Response('Session cleared.');
4848
}

0 commit comments

Comments
 (0)