Merge pull request #602 from jmolivas/validate-helper-objects-in-appl…

…ication Validate helper objects in Application class
hechoendrupal · Apr 17, 2015 · 5bb3f3e · 5bb3f3e
2 parents bfee7c1 + e823edf
commit 5bb3f3e
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -238,8 +238,10 @@ protected function doKernelConfiguration()
     public function bootstrap()
     {
         $kernelHelper = $this->getHelperSet()->get('kernel');
-        $kernelHelper->bootKernel();
-        $kernelHelper->initCommands($this->all());
+        if ($kernelHelper){
+            $kernelHelper->bootKernel();
+            $kernelHelper->initCommands($this->all());
+        }
 
         if (!$this->commandsRegistered) {
             $this->commandsRegistered = $this->registerCommands();
@@ -252,9 +254,10 @@ public function bootstrap()
     protected function registerCommands()
     {
         /** @var \Drupal\AppConsole\Command\Helper\RegisterCommandsHelper $rc */
-        $rc = $this->getHelperSet()->get('register_commands');
-
-        $rc->register();
+        $registerCommands = $this->getHelperSet()->get('register_commands');
+        if ($registerCommands){
+            $registerCommands->register();
+        }
     }
 
     /**