Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Generator/PluginTypeYamlGenerator.php b/vendor/drupal/console/src/Generator/PluginTypeYamlGenerator.php
index 8dd2807fb2380b284573593bf76acc5f652ba1d4..8d61185c58090b3953513a86fdd3e71b0cdc85ca 100644 (file)
--- a/vendor/drupal/console/src/Generator/PluginTypeYamlGenerator.php
+++ b/vendor/drupal/console/src/Generator/PluginTypeYamlGenerator.php
@@ -29,45 +29,42 @@ class PluginTypeYamlGenerator extends Generator
     }
 
     /**
-     * Generator for Plugin type with Yaml discovery.
-     *
-     * @param $module
-     * @param $plugin_class
-     * @param $plugin_name
-     * @param $plugin_file_name
+     * {@inheritdoc}
      */
-    public function generate($module, $plugin_class, $plugin_name, $plugin_file_name)
+    public function generate(array $parameters)
     {
-        $parameters = [
-            'module' => $module,
-            'plugin_class' => $plugin_class,
-            'plugin_name' => $plugin_name,
-            'plugin_file_name' => $plugin_file_name,
-            'file_exists' => file_exists($this->extensionManager->getModule($module)->getPath()  . '/' . $module . '.services.yml'),
-        ];
+        $module = $parameters['module'];
+        $class_name = $parameters['class_name'];
+        $plugin_file_name = $parameters['plugin_file_name'];
+
+        $moduleInstance = $this->extensionManager->getModule($module);
+        $modulePath = $moduleInstance->getPath() . '/' . $module;
+        $moduleSourcePlugin = $moduleInstance->getSourcePath() . '/' . $class_name;
+        $moduleServiceYaml = $modulePath . '.services.yml';
+        $parameters['file_exists'] = file_exists($moduleServiceYaml);
 
         $this->renderFile(
             'module/src/yaml-plugin-manager.php.twig',
-            $this->extensionManager->getModule($module)->getSourcePath() . '/' . $plugin_class . 'Manager.php',
+            $moduleSourcePlugin . 'Manager.php',
             $parameters
         );
 
         $this->renderFile(
             'module/src/yaml-plugin-manager-interface.php.twig',
-            $this->extensionManager->getModule($module)->getSourcePath() . '/' . $plugin_class . 'ManagerInterface.php',
+            $moduleSourcePlugin . 'ManagerInterface.php',
             $parameters
         );
 
         $this->renderFile(
             'module/plugin-yaml-services.yml.twig',
-            $this->extensionManager->getModule($module)->getPath() . '/' . $module . '.services.yml',
+            $moduleServiceYaml,
             $parameters,
             FILE_APPEND
         );
 
         $this->renderFile(
             'module/plugin.yml.twig',
-            $this->extensionManager->getModule($module)->getPath() . '/' . $module . '.' . $plugin_file_name . '.yml',
+            $modulePath . '.' . $plugin_file_name . '.yml',
             $parameters
         );
     }