Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / drupal / console / src / Bootstrap / Drupal.php

diff --git a/vendor/drupal/console/src/Bootstrap/Drupal.php b/vendor/drupal/console/src/Bootstrap/Drupal.php
index 8786b273d1e58e8e34c12b345e13c8eaa3777631..a9d773346b01ecfc97aadb8cd5292f1b86be7c57 100644 (file)
--- a/vendor/drupal/console/src/Bootstrap/Drupal.php
+++ b/vendor/drupal/console/src/Bootstrap/Drupal.php
@@ -140,11 +140,14 @@ class Drupal implements DrupalInterface
                 $io->writeln('➤ Registering dynamic services');
             }
 
+            $configuration = $this->configurationManager->getConfiguration();
+
             $drupalKernel->addServiceModifier(
                 new DrupalServiceModifier(
                     $this->drupalFinder->getComposerRoot(),
                     'drupal.command',
-                    'drupal.generator'
+                    'drupal.generator',
+                    $configuration
                 )
             );
 
@@ -193,8 +196,6 @@ class Drupal implements DrupalInterface
                 $this->configurationManager
             );
 
-            $configuration = $this->configurationManager->getConfiguration();
-
             $container->get('console.translator_manager')
                 ->loadCoreLanguage(
                     $configuration->get('application.language'),
@@ -224,6 +225,14 @@ class Drupal implements DrupalInterface
             $container = $this->bootDrupalConsoleCore();
             $container->set('class_loader', $this->autoload);
 
+            $container->get('console.renderer')
+                ->setSkeletonDirs(
+                    [
+                        $this->drupalFinder->getComposerRoot().DRUPAL_CONSOLE.'/templates/',
+                        $this->drupalFinder->getComposerRoot().DRUPAL_CONSOLE_CORE.'/templates/'
+                    ]
+                );
+
             $notifyErrorCodes = [
                 0,
                 1045,