Merge branch '3.1'

* 3.1:
  Minor fixes
  [Cache] Fix abstract AdapterTestCase cache property
  [Console] Overcomplete argument exception message tweak.
  fixed bad auto merge
  Console table cleanup
  undefined offset fix (#19406)
  [EventDispatcher] Removed unused variable

Author: fabpot

DependencyInjection/FrameworkExtension.php

@@ -30,7 +30,6 @@
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
-use Symfony\Component\Validator\Validation;
 use Symfony\Component\Workflow;
 
 /**

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

@@ -45,7 +45,7 @@ public function welcomeAction(Request $request, $name = null)
 
     public function logoutAction(Request $request)
     {
-        $request->getSession('session')->invalidate();
+        $request->getSession()->invalidate();
 
         return new Response('Session cleared.');
     }