Merge branch '2.7' into 2.8

* 2.7:
  Minor fixes
  [Console] Overcomplete argument exception message tweak.

Author: fabpot

src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use Symfony\Bridge\Twig\Extension\ExpressionExtension;
-use Symfony\Component\ExpressionLanguage\Expression;
 
 class ExpressionExtensionTest extends \PHPUnit_Framework_TestCase
 {

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -23,7 +23,6 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Validator\Validation;
 
 /**
  * FrameworkExtension.

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -18,7 +18,6 @@
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Validator\Validation;
 
 abstract class FrameworkExtensionTest extends TestCase
 {

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

@@ -42,7 +42,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.');
     }

src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php

@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 return 1;
             }
-            $passwordQuestion = $this->createPasswordQuestion($input, $output);
+            $passwordQuestion = $this->createPasswordQuestion();
             $password = $io->askQuestion($passwordQuestion);
         }
 

src/Symfony/Component/Console/Input/ArgvInput.php

@@ -176,7 +176,12 @@ private function parseArgument($token)
 
         // unexpected argument
         } else {
-            throw new RuntimeException('Too many arguments.');
+            $all = $this->definition->getArguments();
+            if (count($all)) {
+                throw new RuntimeException(sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all))));
+            }
+
+            throw new RuntimeException(sprintf('No arguments expected, got "%s".', $token));
         }
     }
 

src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php

@@ -249,11 +249,6 @@ protected function getConsoleOutput($stderr)
         return $output;
     }
 
-    private function hasStderrSupport()
-    {
-        return false === $this->isRunningOS400();
-    }
-
     private function hasSttyAvailable()
     {
         exec('stty 2>&1', $output, $exitcode);

src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php

@@ -183,7 +183,17 @@ public function provideInvalidInput()
             array(
                 array('cli.php', 'foo', 'bar'),
                 new InputDefinition(),
-                'Too many arguments.',
+                'No arguments expected, got "foo".',
+            ),
+            array(
+                array('cli.php', 'foo', 'bar'),
+                new InputDefinition(array(new InputArgument('number'))),
+                'Too many arguments, expected arguments "number".',
+            ),
+            array(
+                array('cli.php', 'foo', 'bar', 'zzz'),
+                new InputDefinition(array(new InputArgument('number'), new InputArgument('county'))),
+                'Too many arguments, expected arguments "number" "county".',
             ),
             array(
                 array('cli.php', '--foo'),

src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\Exception\ContextErrorException;
 
 class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 {

src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -51,7 +51,7 @@ public function testProcess()
         $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
         $this->assertTrue($container->has('container'));
 
-        $resolvedFactory = $aDefinition->getFactory(false);
+        $resolvedFactory = $aDefinition->getFactory();
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 

src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -115,7 +115,7 @@ public function testGet()
         try {
             @$builder->get('baz');
             $this->fail('->get() throws a ServiceCircularReferenceException if the service has a circular reference to itself');
-        } catch (\Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException $e) {
+        } catch (ServiceCircularReferenceException $e) {
             $this->assertEquals('Circular reference detected for service "baz", path: "baz".', $e->getMessage(), '->get() throws a LogicException if the service has a circular reference to itself');
         }
 

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php

@@ -4,7 +4,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\ExpressionLanguage\Expression;
 
 $container = new ContainerBuilder();
 $container->

src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

src/Symfony/Component/DomCrawler/Tests/FormTest.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\DomCrawler\Form;
 use Symfony\Component\DomCrawler\FormFieldRegistry;
-use Symfony\Component\DomCrawler\Field;
 
 class FormTest extends \PHPUnit_Framework_TestCase
 {

src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\Tests\Fixtures\Author;
 
 class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php

@@ -58,7 +58,7 @@ public function testWrongTableOptionsRead()
     {
         $storage = new LegacyPdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
         $this->setExpectedException('RuntimeException');
-        $storage->read('foo', 'bar');
+        $storage->read('foo');
     }
 
     public function testWriteRead()

src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\EventListener\LocaleListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;

src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\EventListener\RouterListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;

src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php

@@ -3,7 +3,6 @@
 namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\HttpKernel\Bundle;
 
 /**
  * This command has a required parameter on the constructor and will be ignored by the default Bundle implementation.

src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -656,7 +656,7 @@ public function testParseTypeInt32($value, $expected, $message = '')
     {
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $parsedValue = $formatter->parse($value, NumberFormatter::TYPE_INT32);
-        $this->assertSame($expected, $parsedValue);
+        $this->assertSame($expected, $parsedValue, $message);
     }
 
     public function parseTypeInt32Provider()

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php

@@ -81,6 +81,6 @@ public function testIsReadable($collection, $path)
      */
     public function testIsWritable($collection, $path)
     {
-        $this->assertTrue($this->propertyAccessor->isWritable($collection, $path, 'Updated'));
+        $this->assertTrue($this->propertyAccessor->isWritable($collection, $path));
     }
 }

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php

@@ -166,33 +166,25 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()
     public function testIsWritableReturnsTrueIfAdderAndRemoverExists()
     {
         $car = $this->getMock(__CLASS__.'_Car');
-        $axes = $this->getContainer(array(1 => 'first', 2 => 'second', 3 => 'third'));
-
-        $this->assertTrue($this->propertyAccessor->isWritable($car, 'axes', $axes));
+        $this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyAdderExists()
     {
         $car = $this->getMock(__CLASS__.'_CarOnlyAdder');
-        $axes = $this->getContainer(array(1 => 'first', 2 => 'second', 3 => 'third'));
-
-        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes', $axes));
+        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyRemoverExists()
     {
         $car = $this->getMock(__CLASS__.'_CarOnlyRemover');
-        $axes = $this->getContainer(array(1 => 'first', 2 => 'second', 3 => 'third'));
-
-        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes', $axes));
+        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
     {
         $car = $this->getMock(__CLASS__.'_CarNoAdderAndRemover');
-        $axes = $this->getContainer(array(1 => 'first', 2 => 'second', 3 => 'third'));
-
-        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes', $axes));
+        $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     /**

src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php

@@ -121,7 +121,7 @@ public function testGetInvalidEngine()
         $secondEngine = $this->getEngineMock('template.php', false);
 
         $delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
-        $delegatingEngine->getEngine('template.php', array('foo' => 'bar'));
+        $delegatingEngine->getEngine('template.php');
     }
 
     private function getEngineMock($template, $supports)

src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php

@@ -37,7 +37,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase
      */
     public function testFailedLangcodes($nplural, $langCodes)
     {
-        $matrix = $this->generateTestData($nplural, $langCodes);
+        $matrix = $this->generateTestData($langCodes);
         $this->validateMatrix($nplural, $matrix, false);
     }
 
@@ -46,7 +46,7 @@ public function testFailedLangcodes($nplural, $langCodes)
      */
     public function testLangcodes($nplural, $langCodes)
     {
-        $matrix = $this->generateTestData($nplural, $langCodes);
+        $matrix = $this->generateTestData($langCodes);
         $this->validateMatrix($nplural, $matrix);
     }
 
@@ -108,7 +108,7 @@ protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
         }
     }
 
-    protected function generateTestData($plural, $langCodes)
+    protected function generateTestData($langCodes)
     {
         $matrix = array();
         foreach ($langCodes as $langCode) {