Security update for Core, with self-updated composer

[yaffs-website] / vendor / drupal / console / src / Generator / EntityBundleGenerator.php

diff --git a/vendor/drupal/console/src/Generator/EntityBundleGenerator.php b/vendor/drupal/console/src/Generator/EntityBundleGenerator.php
index 18e6ac6c58aa06314c4beddc229d9fa3a6a120b3..dcee1ec874e3d7d9dfa74e084150b1a0573be381 100644 (file)
--- a/vendor/drupal/console/src/Generator/EntityBundleGenerator.php
+++ b/vendor/drupal/console/src/Generator/EntityBundleGenerator.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Console\Generator;
 
-use Drupal\Console\Core\Generator\Generator;
 use Drupal\Console\Extension\Manager;
+use Drupal\Console\Core\Generator\Generator;
 
 class EntityBundleGenerator extends Generator
 {
@@ -28,22 +28,21 @@ class EntityBundleGenerator extends Generator
         $this->extensionManager = $extensionManager;
     }
 
-    public function generate($module, $bundleName, $bundleTitle)
+    /**
+     * {@inheritdoc}
+     */
+    public function generate(array $parameters)
     {
-        $parameters = [
-            'module' => $module,
-            'bundle_name' => $bundleName,
-            'bundle_title' => $bundleTitle,
-            //TODO:
-            //'learning' => $this->isLearning(),
-        ];
+        $module = $parameters['module'];
+        $bundleName = $parameters['bundle_name'];
+        $moduleDir = $this->extensionManager->getModule($module)->getPath();
 
         /**
          * Generate core.entity_form_display.node.{ bundle_name }.default.yml
          */
         $this->renderFile(
             'module/src/Entity/Bundle/core.entity_form_display.node.default.yml.twig',
-            $this->extensionManager->getModule($module)->getPath() . '/config/install/core.entity_form_display.node.' . $bundleName . '.default.yml',
+            $moduleDir . '/config/install/core.entity_form_display.node.' . $bundleName . '.default.yml',
             $parameters
         );
 
@@ -52,7 +51,7 @@ class EntityBundleGenerator extends Generator
          */
         $this->renderFile(
             'module/src/Entity/Bundle/core.entity_view_display.node.default.yml.twig',
-            $this->extensionManager->getModule($module)->getPath()  . '/config/install/core.entity_view_display.node.' . $bundleName . '.default.yml',
+            $moduleDir . '/config/install/core.entity_view_display.node.' . $bundleName . '.default.yml',
             $parameters
         );
 
@@ -61,7 +60,7 @@ class EntityBundleGenerator extends Generator
          */
         $this->renderFile(
             'module/src/Entity/Bundle/core.entity_view_display.node.teaser.yml.twig',
-            $this->extensionManager->getModule($module)->getPath()  . '/config/install/core.entity_view_display.node.' . $bundleName . '.teaser.yml',
+            $moduleDir . '/config/install/core.entity_view_display.node.' . $bundleName . '.teaser.yml',
             $parameters
         );
 
@@ -70,7 +69,7 @@ class EntityBundleGenerator extends Generator
          */
         $this->renderFile(
             'module/src/Entity/Bundle/field.field.node.body.yml.twig',
-            $this->extensionManager->getModule($module)->getPath()  . '/config/install/field.field.node.' . $bundleName . '.body.yml',
+            $moduleDir . '/config/install/field.field.node.' . $bundleName . '.body.yml',
             $parameters
         );
 
@@ -79,7 +78,7 @@ class EntityBundleGenerator extends Generator
          */
         $this->renderFile(
             'module/src/Entity/Bundle/node.type.yml.twig',
-            $this->extensionManager->getModule($module)->getPath()  . '/config/install/node.type.' . $bundleName . '.yml',
+            $moduleDir  . '/config/install/node.type.' . $bundleName . '.yml',
             $parameters
         );
     }