Merge branch '4.2' into 4.3

* 4.2:
  Use willReturn() instead of will(returnValue()).

Author: nicolas-grekas

Tests/ApplicationTest.php

@@ -709,7 +709,7 @@ public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
         $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['getNamespaces'])->getMock();
         $application->expects($this->once())
             ->method('getNamespaces')
-            ->will($this->returnValue(['foo:sublong', 'bar:sub']));
+            ->willReturn(['foo:sublong', 'bar:sub']);
 
         $this->assertEquals('foo:sublong', $application->findNamespace('f:sub'));
     }
@@ -853,7 +853,7 @@ public function testRenderExceptionLineBreaks()
         $application->setAutoExit(false);
         $application->expects($this->any())
             ->method('getTerminalWidth')
-            ->will($this->returnValue(120));
+            ->willReturn(120);
         $application->register('foo')->setCode(function () {
             throw new \InvalidArgumentException("\n\nline 1 with extra spaces        \nline 2\n\nline 4\n");
         });

Tests/Command/CommandTest.php

@@ -321,7 +321,7 @@ public function testRunReturnsIntegerExitCode()
         $command = $this->getMockBuilder('TestCommand')->setMethods(['execute'])->getMock();
         $command->expects($this->once())
             ->method('execute')
-            ->will($this->returnValue('2.3'));
+            ->willReturn('2.3');
         $exitCode = $command->run(new StringInput(''), new NullOutput());
         $this->assertSame(2, $exitCode, '->run() returns integer exit code (casts numeric to int)');
     }

Tests/Helper/AbstractQuestionHelperTest.php

@@ -21,7 +21,7 @@ protected function createStreamableInputInterfaceMock($stream = null, $interacti
         $mock = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
         $mock->expects($this->any())
             ->method('isInteractive')
-            ->will($this->returnValue($interactive));
+            ->willReturn($interactive);
 
         if ($stream) {
             $mock->expects($this->any())

Tests/Helper/HelperSetTest.php

@@ -114,7 +114,7 @@ private function getGenericMockHelper($name, HelperSet $helperset = null)
         $mock_helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\HelperInterface')->getMock();
         $mock_helper->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue($name));
+            ->willReturn($name);
 
         if ($helperset) {
             $mock_helper->expects($this->any())

Tests/Helper/QuestionHelperTest.php

@@ -760,7 +760,7 @@ protected function createInputInterfaceMock($interactive = true)
         $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
         $mock->expects($this->any())
             ->method('isInteractive')
-            ->will($this->returnValue($interactive));
+            ->willReturn($interactive);
 
         return $mock;
     }

Tests/Helper/SymfonyQuestionHelperTest.php

@@ -154,7 +154,7 @@ protected function createInputInterfaceMock($interactive = true)
         $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
         $mock->expects($this->any())
             ->method('isInteractive')
-            ->will($this->returnValue($interactive));
+            ->willReturn($interactive);
 
         return $mock;
     }

Tests/Logger/ConsoleLoggerTest.php

@@ -166,7 +166,7 @@ public function testObjectCastToString()
         } else {
             $dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
         }
-        $dummy->method('__toString')->will($this->returnValue('DUMMY'));
+        $dummy->method('__toString')->willReturn('DUMMY');
 
         $this->getLogger()->warning($dummy);