Upgrade 1-11.38

vendor/symfony/framework-bundle/Tests/Console/ApplicationTest.php

@@ -22,7 +22,7 @@ class ApplicationTest extends TestCase
 {
     public function testBundleInterfaceImplementation()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
 
         $kernel = $this->getKernel(array($bundle), true);
 
@@ -32,8 +32,7 @@ class ApplicationTest extends TestCase
 
     public function testBundleCommandsAreRegistered()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $bundle = $this->createBundleMock(array());
 
         $kernel = $this->getKernel(array($bundle), true);
 
@@ -46,8 +45,7 @@ class ApplicationTest extends TestCase
 
     public function testBundleCommandsAreRetrievable()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $bundle = $this->createBundleMock(array());
 
         $kernel = $this->getKernel(array($bundle));
 
@@ -60,47 +58,41 @@ class ApplicationTest extends TestCase
 
     public function testBundleSingleCommandIsRetrievable()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $application->add($command);
-
         $this->assertSame($command, $application->get('example'));
     }
 
     public function testBundleCommandCanBeFound()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $application->add($command);
-
         $this->assertSame($command, $application->find('example'));
     }
 
     public function testBundleCommandCanBeFoundByAlias()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+        $command->setAliases(array('alias'));
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $command->setAliases(array('alias'));
-        $application->add($command);
-
         $this->assertSame($command, $application->find('alias'));
     }
 
@@ -123,12 +115,27 @@ class ApplicationTest extends TestCase
         $tester->run(array('command' => 'foo'));
     }
 
+    public function testBundleCommandCanOverriddeAPreExistingCommandWithTheSameName()
+    {
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
+
+        $kernel = $this->getKernel(array($bundle));
+
+        $application = new Application($kernel);
+        $newCommand = new Command('example');
+        $application->add($newCommand);
+
+        $this->assertSame($newCommand, $application->get('example'));
+    }
+
     private function getKernel(array $bundles, $useDispatcher = false)
     {
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 
         if ($useDispatcher) {
-            $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+            $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
             $dispatcher
                 ->expects($this->atLeastOnce())
                 ->method('dispatch')
@@ -153,7 +160,7 @@ class ApplicationTest extends TestCase
             ->will($this->returnValue(array()))
         ;
 
-        $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
         $kernel
             ->expects($this->any())
             ->method('getBundles')
@@ -167,4 +174,18 @@ class ApplicationTest extends TestCase
 
         return $kernel;
     }
+
+    private function createBundleMock(array $commands)
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
+        $bundle
+            ->expects($this->once())
+            ->method('registerCommands')
+            ->will($this->returnCallback(function (Application $application) use ($commands) {
+                $application->addCommands($commands);
+            }))
+        ;
+
+        return $bundle;
+    }
 }

vendor/symfony/framework-bundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -22,7 +23,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractDescriptorTest extends TestCase
 {
     /** @dataProvider getDescribeRouteCollectionTestData */
     public function testDescribeRouteCollection(RouteCollection $routes, $expectedDescription)
@@ -129,6 +130,7 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
     }
 
     abstract protected function getDescriptor();
+
     abstract protected function getFormat();
 
     private function assertDescription($expectedDescription, $describedObject, array $options = array())

vendor/symfony/framework-bundle/Tests/Console/Descriptor/ObjectsProvider.php

@@ -115,6 +115,7 @@ class ObjectsProvider
                 ->addTag('tag1', array('attr1' => 'val1', 'attr2' => 'val2'))
                 ->addTag('tag1', array('attr3' => 'val3'))
                 ->addTag('tag2')
+                ->addMethodCall('setMailer', array(new Reference('mailer')))
                 ->setFactory(array(new Reference('factory.service'), 'get')),
         );
     }
@@ -157,9 +158,11 @@ class CallableClass
     public function __invoke()
     {
     }
+
     public static function staticMethod()
     {
     }
+
     public function method()
     {
     }