Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Generator/ControllerGenerator.php b/vendor/drupal/console/src/Generator/ControllerGenerator.php
index bb95974d89943b1233039c73de7b009e0f0cff7f..49d51e510eff5dd76f997f1702dea953d03f91fa 100644 (file)
--- a/vendor/drupal/console/src/Generator/ControllerGenerator.php
+++ b/vendor/drupal/console/src/Generator/ControllerGenerator.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 ControllerGenerator extends Generator
 {
@@ -28,25 +28,25 @@ class ControllerGenerator extends Generator
         $this->extensionManager = $extensionManager;
     }
 
-    public function generate($module, $class, $routes, $test, $services)
+    /**
+     * {@inheritdoc}
+     */
+    public function generate(array $parameters)
     {
-        $parameters = [
-          'class_name' => $class,
-          'services' => $services,
-          'module' => $module,
-          'routes' => $routes,
-          //'learning' => $this->isLearning(),
-        ];
+        $class = $parameters['class_name'];
+        $test = $parameters['test'];
+        $module = $parameters['module'];
+        $moduleInstance = $this->extensionManager->getModule($module);
 
         $this->renderFile(
             'module/src/Controller/controller.php.twig',
-            $this->extensionManager->getModule($module)->getControllerPath().'/'.$class.'.php',
+            $moduleInstance->getControllerPath() . '/' . $class . '.php',
             $parameters
         );
 
         $this->renderFile(
             'module/routing-controller.yml.twig',
-            $this->extensionManager->getModule($module)->getPath().'/'.$module.'.routing.yml',
+            $moduleInstance->getPath() . '/' . $module . '.routing.yml',
             $parameters,
             FILE_APPEND
         );
@@ -54,7 +54,7 @@ class ControllerGenerator extends Generator
         if ($test) {
             $this->renderFile(
                 'module/Tests/Controller/controller.php.twig',
-                $this->extensionManager->getModule($module)->getTestPath('Controller').'/'.$class.'Test.php',
+                $moduleInstance->getTestPath('Controller') . '/' . $class . 'Test.php',
                 $parameters
             );
         }