feature #29541 [FrameworkBundle] Stop calling Kernel::boot() twice in cli (chalasr)

fabpot · fabpot · commit d069c264b34c · 2018-12-10T05:26:30.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [FrameworkBundle] Stop calling Kernel::boot() twice in cli | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29505 | License | MIT | Doc PR | n/a Allows custom `Kernel::boot()` implementations to not be aware of the protected `Kernel::$booted` prop. Commits ------- 97e15fe [FrameworkBundle] Stop calling Kernel::boot() twice in cli
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -62,16 +62,14 @@ public function getKernel()
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
-        $this->kernel->boot();
-
-        $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));
-
         $this->registerCommands();
 
         if ($this->registrationErrors) {
             $this->renderRegistrationErrors($input, $output);
         }
 
+        $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));
+
         return parent::doRun($input, $output);
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -204,6 +204,7 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
         $container->setParameter('console.command.ids', array(ThrowingCommand::class => ThrowingCommand::class));
 
         $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
+        $kernel->expects($this->once())->method('boot');
         $kernel
             ->method('getBundles')
             ->willReturn(array($this->createBundleMock(
@@ -256,6 +257,7 @@ private function getKernel(array $bundles, $useDispatcher = false)
         ;
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel->expects($this->once())->method('boot');
         $kernel
             ->expects($this->any())
             ->method('getBundles')

Original file line number	Diff line number	Diff line change
`@@ -62,16 +62,14 @@ public function getKernel()`
`62`	`62`	`*/`
`63`	`63`	`public function doRun(InputInterface $input, OutputInterface $output)`
`64`	`64`	`{`
`65`		`- $this->kernel->boot();`
`66`		`-`
`67`		`- $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));`
`68`		`-`
`69`	`65`	`$this->registerCommands();`
`70`	`66`
`71`	`67`	`if ($this->registrationErrors) {`
`72`	`68`	`$this->renderRegistrationErrors($input, $output);`
`73`	`69`	`}`
`74`	`70`
	`71`	`+ $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));`
	`72`	`+`
`75`	`73`	`return parent::doRun($input, $output);`
`76`	`74`	`}`
`77`	`75`