Security update for Core, with self-updated composer

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

diff --git a/vendor/drupal/console/src/Generator/CacheContextGenerator.php b/vendor/drupal/console/src/Generator/CacheContextGenerator.php
index da87ee97456bc139cc52a8f80a777d7202075c90..4c936ab6bb78659cc96aec7a246f9e0fdb3eeb42 100644 (file)
--- a/vendor/drupal/console/src/Generator/CacheContextGenerator.php
+++ b/vendor/drupal/console/src/Generator/CacheContextGenerator.php
@@ -7,21 +7,21 @@
 
 namespace Drupal\Console\Generator;
 
-use Drupal\Console\Core\Generator\Generator;
 use Drupal\Console\Extension\Manager;
+use Drupal\Console\Core\Generator\Generator;
 
 class CacheContextGenerator extends Generator
 {
     /**
-   * @var Manager
-   */
+     * @var Manager
+     */
     protected $extensionManager;
 
     /**
-   * CacheContextGenerator constructor.
-   *
-   * @param Manager $extensionManager
-   */
+     * CacheContextGenerator constructor.
+     *
+     * @param Manager $extensionManager
+     */
     public function __construct(
         Manager $extensionManager
     ) {
@@ -29,34 +29,33 @@ class CacheContextGenerator extends Generator
     }
 
     /**
-   * Generator Service.
-   *
-   * @param string $module        Module name
-   * @param string $cache_context Cache context name
-   * @param string $class         Class name
-   * @param array  $services      List of services
-   */
-    public function generate($module, $cache_context, $class, $services)
+     * {@inheritdoc}
+     */
+    public function generate(array $parameters)
     {
-        $parameters = [
-        'module' => $module,
-        'name' => 'cache_context.' . $cache_context,
-        'class' => $class,
-        'services' => $services,
-        'class_path' => sprintf('Drupal\%s\CacheContext\%s', $module, $class),
-        'tags' => ['name' => 'cache.context'],
-        'file_exists' => file_exists($this->extensionManager->getModule($module)->getPath() .'/'.$module.'.services.yml'),
-        ];
+        $module = $parameters['module'];
+        $cache_context = $parameters['ache_context'];
+        $class = $parameters['class'];
+
+        $moduleInstance = $this->extensionManager->getModule($module);
+        $modulePath = $moduleInstance->getPath() . '/' . $module;
+
+        $parameters = array_merge($parameters, [
+            'name' => 'cache_context.' . $cache_context,
+            'class_path' => sprintf('Drupal\%s\CacheContext\%s', $module, $class),
+            'tags' => ['name' => 'cache.context'],
+            'file_exists' => file_exists($modulePath . '.services.yml'),
+        ]);
 
         $this->renderFile(
             'module/src/cache-context.php.twig',
-            $this->extensionManager->getModule($module)->getSourcePath().'/CacheContext/'.$class.'.php',
+            $moduleInstance->getSourcePath() . '/CacheContext/' . $class . '.php',
             $parameters
         );
 
         $this->renderFile(
             'module/services.yml.twig',
-            $this->extensionManager->getModule($module)->getPath() .'/'.$module.'.services.yml',
+            $modulePath . '.services.yml',
             $parameters,
             FILE_APPEND
         );