From 0ee42c620f874a4d38116b307b5e381cdf08f8b0 Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Mon, 22 Jan 2018 22:06:34 -0800 Subject: [PATCH] [console] Apply PSR-2 code style. (#3732) --- src/Generator/BreakPointGenerator.php | 6 +++--- src/Generator/CacheContextGenerator.php | 18 ++++++++++-------- src/Generator/DatabaseSettingsGenerator.php | 5 +---- src/Generator/EntityContentGenerator.php | 4 ++-- src/Generator/HelpGenerator.php | 9 +++------ src/Generator/ModuleFileGenerator.php | 7 ++++--- src/Generator/ModuleGenerator.php | 7 ++++--- src/Generator/PluginFieldTypeGenerator.php | 6 ++++++ src/Generator/PluginFieldWidgetGenerator.php | 6 ++++++ src/Generator/PluginImageEffectGenerator.php | 6 ++++++ .../PluginImageFormatterGenerator.php | 6 ++++++ src/Generator/PluginMailGenerator.php | 6 ++++++ src/Generator/TwigExtensionGenerator.php | 14 +++++++------- 13 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/Generator/BreakPointGenerator.php b/src/Generator/BreakPointGenerator.php index eaa4dc0fe..5676712ed 100644 --- a/src/Generator/BreakPointGenerator.php +++ b/src/Generator/BreakPointGenerator.php @@ -28,11 +28,11 @@ class BreakPointGenerator extends Generator implements GeneratorInterface * * @param Manager $extensionManager */ - public function __construct(Manager $extensionManager) { + public function __construct(Manager $extensionManager) + { $this->extensionManager = $extensionManager; } - /** * {@inheritdoc} */ @@ -43,7 +43,7 @@ public function generate(array $parameters) $this->renderFile( 'theme/breakpoints.yml.twig', $theme_path . '/' . $parameters['machine_name'] . '.breakpoints.yml', - $parameters, + $parameters, FILE_APPEND ); } diff --git a/src/Generator/CacheContextGenerator.php b/src/Generator/CacheContextGenerator.php index 1bc5f48fb..6072377cc 100644 --- a/src/Generator/CacheContextGenerator.php +++ b/src/Generator/CacheContextGenerator.php @@ -14,15 +14,15 @@ class CacheContextGenerator extends Generator implements GeneratorInterface { /** - * @var Manager - */ + * @var Manager + */ protected $extensionManager; /** - * CacheContextGenerator constructor. - * - * @param Manager $extensionManager - */ + * CacheContextGenerator constructor. + * + * @param Manager $extensionManager + */ public function __construct( Manager $extensionManager ) { @@ -42,12 +42,14 @@ public function generate(array $parameters) $moduleInstance = $this->extensionManager->getModule($module); $modulePath = $moduleInstance->getPath() . '/' . $module; - $parameters = array_merge($parameters, [ + $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', diff --git a/src/Generator/DatabaseSettingsGenerator.php b/src/Generator/DatabaseSettingsGenerator.php index 716137d4a..513cb2c76 100644 --- a/src/Generator/DatabaseSettingsGenerator.php +++ b/src/Generator/DatabaseSettingsGenerator.php @@ -28,11 +28,8 @@ public function __construct( $this->kernel = $kernel; } - /** - * Generator Plugin Block. - * - * @param $parameters + * {@inheritdoc} */ public function generate(array $parameters) { diff --git a/src/Generator/EntityContentGenerator.php b/src/Generator/EntityContentGenerator.php index 2510f202f..28321b798 100644 --- a/src/Generator/EntityContentGenerator.php +++ b/src/Generator/EntityContentGenerator.php @@ -26,8 +26,8 @@ class EntityContentGenerator extends Generator implements GeneratorInterface protected $site; /** - * @var TwigRenderer -*/ + * @var TwigRenderer + */ protected $twigrenderer; protected $io; diff --git a/src/Generator/HelpGenerator.php b/src/Generator/HelpGenerator.php index 59e857f89..bd0283053 100644 --- a/src/Generator/HelpGenerator.php +++ b/src/Generator/HelpGenerator.php @@ -10,7 +10,7 @@ use Drupal\Console\Core\Generator\Generator; use Drupal\Console\Extension\Manager; -class HelpGenerator extends Generator +class HelpGenerator extends Generator implements Gener { /** * @var Manager @@ -29,13 +29,10 @@ public function __construct( } /** - * Generator Post Update Name function. - * - * @param $parameters + * {@inheritdoc} */ - public function generate($parameters = []) + public function generate(array $parameters) { - $module = $parameters['module']; $description = $parameters['description']; diff --git a/src/Generator/ModuleFileGenerator.php b/src/Generator/ModuleFileGenerator.php index c25510f83..e8994cf5c 100644 --- a/src/Generator/ModuleFileGenerator.php +++ b/src/Generator/ModuleFileGenerator.php @@ -17,11 +17,12 @@ */ class ModuleFileGenerator extends Generator implements GeneratorInterface { + /** - * @param $parameters + * {@inheritdoc} */ - public function generate(array $parameters) { - + public function generate(array $parameters) + { $machine_name = $parameters['machine_name']; $file_path = $parameters['file_path']; diff --git a/src/Generator/ModuleGenerator.php b/src/Generator/ModuleGenerator.php index 6436179ae..c6ceddb35 100644 --- a/src/Generator/ModuleGenerator.php +++ b/src/Generator/ModuleGenerator.php @@ -17,11 +17,12 @@ */ class ModuleGenerator extends Generator implements GeneratorInterface { + /** - * @param $parameters + * {@inheritdoc} */ - public function generate(array $parameters) { - + public function generate(array $parameters) + { $machineName = $parameters['machine_name']; $dir = $parameters['dir']; $moduleFile = $parameters['module_file']; diff --git a/src/Generator/PluginFieldTypeGenerator.php b/src/Generator/PluginFieldTypeGenerator.php index 75f832a9d..c225276d6 100644 --- a/src/Generator/PluginFieldTypeGenerator.php +++ b/src/Generator/PluginFieldTypeGenerator.php @@ -12,6 +12,12 @@ class PluginFieldTypeGenerator extends Generator { + + /** + * @var Manager + */ + protected $extensionManager; + /** * PluginFieldTypeGenerator constructor. * diff --git a/src/Generator/PluginFieldWidgetGenerator.php b/src/Generator/PluginFieldWidgetGenerator.php index 3e252e296..093cdd26a 100644 --- a/src/Generator/PluginFieldWidgetGenerator.php +++ b/src/Generator/PluginFieldWidgetGenerator.php @@ -12,6 +12,12 @@ class PluginFieldWidgetGenerator extends Generator { + + /** + * @var Manager + */ + protected $extensionManager; + /** * PluginFieldWidgetGenerator constructor. * diff --git a/src/Generator/PluginImageEffectGenerator.php b/src/Generator/PluginImageEffectGenerator.php index fa56ef27b..fe83e4eb0 100644 --- a/src/Generator/PluginImageEffectGenerator.php +++ b/src/Generator/PluginImageEffectGenerator.php @@ -12,6 +12,12 @@ class PluginImageEffectGenerator extends Generator { + + /** + * @var Manager + */ + protected $extensionManager; + /** * PluginImageEffectGenerator constructor. * diff --git a/src/Generator/PluginImageFormatterGenerator.php b/src/Generator/PluginImageFormatterGenerator.php index e71e739eb..a5db1d78c 100644 --- a/src/Generator/PluginImageFormatterGenerator.php +++ b/src/Generator/PluginImageFormatterGenerator.php @@ -12,6 +12,12 @@ class PluginImageFormatterGenerator extends Generator { + + /** + * @var Manager + */ + protected $extensionManager; + /** * PluginImageFormatterGenerator constructor. * diff --git a/src/Generator/PluginMailGenerator.php b/src/Generator/PluginMailGenerator.php index 0c053b5d8..6d38c742d 100644 --- a/src/Generator/PluginMailGenerator.php +++ b/src/Generator/PluginMailGenerator.php @@ -12,6 +12,12 @@ class PluginMailGenerator extends Generator { + /** + * @var Manager + */ + protected $extensionManager; + + /** * PluginMailGenerator constructor. * diff --git a/src/Generator/TwigExtensionGenerator.php b/src/Generator/TwigExtensionGenerator.php index 91c522023..4d3c723bc 100644 --- a/src/Generator/TwigExtensionGenerator.php +++ b/src/Generator/TwigExtensionGenerator.php @@ -44,13 +44,13 @@ public function __construct( public function generate($module, $name, $class, $services) { $parameters = [ - 'module' => $module, - 'name' => $name, - 'class' => $class, - 'class_path' => sprintf('Drupal\%s\TwigExtension\%s', $module, $class), - 'services' => $services, - 'tags' => ['name' => 'twig.extension'], - 'file_exists' => file_exists($this->extensionManager->getModule($module)->getPath() .'/'.$module.'.services.yml'), + 'module' => $module, + 'name' => $name, + 'class' => $class, + 'class_path' => sprintf('Drupal\%s\TwigExtension\%s', $module, $class), + 'services' => $services, + 'tags' => ['name' => 'twig.extension'], + 'file_exists' => file_exists($this->extensionManager->getModule($module)->getPath() .'/'.$module.'.services.yml'), ]; $this->renderFile(