From 0c3757b56518413e4749bcabc36f769333cd24f5 Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Mon, 2 Jan 2017 15:39:03 -0800 Subject: [PATCH] [console] Apply PSR-2 code style. --- bin/drupal.php | 14 ++++------ composer.json | 3 +- composer.lock | 11 ++++---- phpqa.yml | 3 -- src/Command/Database/DropCommand.php | 3 +- src/Command/Generate/ProfileCommand.php | 6 ++-- src/Command/Generate/ThemeCommand.php | 6 ++-- src/Command/Shared/FormTrait.php | 3 +- src/Command/Shared/MenuTrait.php | 3 +- src/Command/Shared/PermissionTrait.php | 3 +- src/Command/Shared/ServicesTrait.php | 3 +- src/Command/Shared/ThemeBreakpointTrait.php | 3 +- src/Command/Shared/ThemeRegionTrait.php | 3 +- src/Command/ShellCommand.php | 1 + src/Generator/CommandGenerator.php | 10 +++---- src/Plugin/ScriptHandler.php | 28 +++++++++++++++++++ src/Utils/TranslatorManager.php | 15 ++++++++++ templates/module/src/Command/command.php.twig | 6 ++-- 18 files changed, 87 insertions(+), 37 deletions(-) create mode 100644 src/Plugin/ScriptHandler.php create mode 100644 src/Utils/TranslatorManager.php diff --git a/bin/drupal.php b/bin/drupal.php index b54abd93c..cb0204bde 100644 --- a/bin/drupal.php +++ b/bin/drupal.php @@ -7,11 +7,10 @@ set_time_limit(0); -if(file_exists(__DIR__ . '/../autoload.local.php')) { - require_once __DIR__ . '/../autoload.local.php'; -} -else { - $autoloaders = [ +if (file_exists(__DIR__ . '/../autoload.local.php')) { + include_once __DIR__ . '/../autoload.local.php'; +} else { + $autoloaders = [ __DIR__ . '/../../../autoload.php', __DIR__ . '/../vendor/autoload.php' ]; @@ -25,9 +24,8 @@ } if (isset($autoloader)) { - $autoload = require_once $autoloader; -} -else { + $autoload = include_once $autoloader; +} else { echo ' You must set up the project dependencies using `composer install`' . PHP_EOL; exit(1); } diff --git a/composer.json b/composer.json index 78920b86f..695ee2ce5 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,8 @@ "gabordemooij/redbean": "~4.3", "doctrine/annotations": "1.2.*", "symfony/expression-language": ">=2.7 <3.2", - "symfony/cache": ">=2.7 <3.2" + "symfony/cache": ">=2.7 <3.2", + "psy/psysh": "0.6|0.8" }, "bin": ["bin/drupal"], "config": { diff --git a/composer.lock b/composer.lock index a82cc9105..e7c4cc40d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "032048728f547cac5ee908eb60dfc4b3", + "content-hash": "0b6e2c2ce06250646c128230ac588d40", "packages": [ { "name": "alchemy/zippy", @@ -570,19 +570,18 @@ "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-core.git", - "reference": "99fc36977d967041f43778b8062035bd280242eb" + "reference": "21fa567104b85236287a2c85c2f94b2ac7efb415" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/99fc36977d967041f43778b8062035bd280242eb", - "reference": "99fc36977d967041f43778b8062035bd280242eb", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/21fa567104b85236287a2c85c2f94b2ac7efb415", + "reference": "21fa567104b85236287a2c85c2f94b2ac7efb415", "shasum": "" }, "require": { "dflydev/dot-access-configuration": "dev-master", "drupal/console-en": "dev-master", "php": "^5.5.9 || ^7.0", - "psy/psysh": "0.6|0.8", "stecman/symfony-console-completion": "~0.7", "symfony/config": ">=2.7 <3.2", "symfony/console": ">=2.7 <3.2", @@ -644,7 +643,7 @@ "drupal", "symfony" ], - "time": "2016-12-30 21:23:02" + "time": "2017-01-02 23:11:24" }, { "name": "drupal/console-en", diff --git a/phpqa.yml b/phpqa.yml index f4ac5224f..5998ec92a 100644 --- a/phpqa.yml +++ b/phpqa.yml @@ -17,9 +17,6 @@ application: php-cs-fixer: enabled: true exception: false -# file: -# config-file: .php_cs -# single-execution: false options: level: psr2 arguments: diff --git a/src/Command/Database/DropCommand.php b/src/Command/Database/DropCommand.php index f729395a4..651f5fda4 100644 --- a/src/Command/Database/DropCommand.php +++ b/src/Command/Database/DropCommand.php @@ -77,7 +77,8 @@ protected function execute(InputInterface $input, OutputInterface $output) $databaseConnection['database'] ), true - )) { + ) + ) { return 1; } } diff --git a/src/Command/Generate/ProfileCommand.php b/src/Command/Generate/ProfileCommand.php index 8a29a7be8..f04a3ea09 100644 --- a/src/Command/Generate/ProfileCommand.php +++ b/src/Command/Generate/ProfileCommand.php @@ -293,7 +293,8 @@ function ($machine_name) use ($validators) { if ($io->confirm( $this->trans('commands.generate.profile.questions.dependencies'), true - )) { + ) + ) { $dependencies = $io->ask( $this->trans('commands.generate.profile.options.dependencies'), '' @@ -307,7 +308,8 @@ function ($machine_name) use ($validators) { if ($io->confirm( $this->trans('commands.generate.profile.questions.distribution'), false - )) { + ) + ) { $distribution = $io->ask( $this->trans('commands.generate.profile.options.distribution'), 'My Kick-ass Distribution' diff --git a/src/Command/Generate/ThemeCommand.php b/src/Command/Generate/ThemeCommand.php index 00d20e3a0..e70143574 100644 --- a/src/Command/Generate/ThemeCommand.php +++ b/src/Command/Generate/ThemeCommand.php @@ -332,7 +332,8 @@ function ($theme_path) use ($drupalRoot, $machine_name) { if ($io->confirm( $this->trans('commands.generate.theme.questions.regions'), true - )) { + ) + ) { // @see \Drupal\Console\Command\Shared\ThemeRegionTrait::regionQuestion $regions = $this->regionQuestion($io); $input->setOption('regions', $regions); @@ -345,7 +346,8 @@ function ($theme_path) use ($drupalRoot, $machine_name) { if ($io->confirm( $this->trans('commands.generate.theme.questions.breakpoints'), true - )) { + ) + ) { // @see \Drupal\Console\Command\Shared\ThemeRegionTrait::regionQuestion $breakpoints = $this->breakpointQuestion($io); $input->setOption('breakpoints', $breakpoints); diff --git a/src/Command/Shared/FormTrait.php b/src/Command/Shared/FormTrait.php index 608fa68d1..1f09f5a80 100644 --- a/src/Command/Shared/FormTrait.php +++ b/src/Command/Shared/FormTrait.php @@ -26,7 +26,8 @@ public function formQuestion(DrupalStyle $io) if ($io->confirm( $this->trans('commands.common.questions.inputs.confirm'), true - )) { + ) + ) { $input_types = [ 'fieldset', 'text_format' diff --git a/src/Command/Shared/MenuTrait.php b/src/Command/Shared/MenuTrait.php index dafd48563..ecb510e48 100644 --- a/src/Command/Shared/MenuTrait.php +++ b/src/Command/Shared/MenuTrait.php @@ -28,7 +28,8 @@ public function menuQuestion(DrupalStyle $io, $className) if ($io->confirm( $this->trans('commands.generate.form.questions.menu_link_gen'), true - )) { + ) + ) { // now we need to ask them where to gen the form // get the route $menu_options = [ diff --git a/src/Command/Shared/PermissionTrait.php b/src/Command/Shared/PermissionTrait.php index 0fe6a339b..a3e3f6796 100644 --- a/src/Command/Shared/PermissionTrait.php +++ b/src/Command/Shared/PermissionTrait.php @@ -55,7 +55,8 @@ public function permissionQuestion(DrupalStyle $output) if (!$output->confirm( $this->trans('commands.generate.permission.questions.add'), true - )) { + ) + ) { break; } } diff --git a/src/Command/Shared/ServicesTrait.php b/src/Command/Shared/ServicesTrait.php index 8dbcfda39..7f1b11888 100644 --- a/src/Command/Shared/ServicesTrait.php +++ b/src/Command/Shared/ServicesTrait.php @@ -21,7 +21,8 @@ public function servicesQuestion(DrupalStyle $io) if ($io->confirm( $this->trans('commands.common.questions.services.confirm'), false - )) { + ) + ) { $service_collection = []; $io->writeln($this->trans('commands.common.questions.services.message')); $services = $this->container->getServiceIds(); diff --git a/src/Command/Shared/ThemeBreakpointTrait.php b/src/Command/Shared/ThemeBreakpointTrait.php index df1d30af4..10759e4eb 100644 --- a/src/Command/Shared/ThemeBreakpointTrait.php +++ b/src/Command/Shared/ThemeBreakpointTrait.php @@ -69,7 +69,8 @@ function ($breakPointLabel) use ($validators) { if (!$io->confirm( $this->trans('commands.generate.theme.questions.breakpoint-add'), true - )) { + ) + ) { break; } } diff --git a/src/Command/Shared/ThemeRegionTrait.php b/src/Command/Shared/ThemeRegionTrait.php index 2ed1afe54..cf0e2480e 100644 --- a/src/Command/Shared/ThemeRegionTrait.php +++ b/src/Command/Shared/ThemeRegionTrait.php @@ -46,7 +46,8 @@ function ($regionMachineName) use ($validators) { if (!$io->confirm( $this->trans('commands.generate.theme.questions.region-add'), true - )) { + ) + ) { break; } } diff --git a/src/Command/ShellCommand.php b/src/Command/ShellCommand.php index 81b7321bf..1c9b20c45 100644 --- a/src/Command/ShellCommand.php +++ b/src/Command/ShellCommand.php @@ -11,6 +11,7 @@ /** * Class ShellCommand + * * @package Drupal\Console\Command */ class ShellCommand extends Command diff --git a/src/Generator/CommandGenerator.php b/src/Generator/CommandGenerator.php index 018e857de..18efa06f6 100644 --- a/src/Generator/CommandGenerator.php +++ b/src/Generator/CommandGenerator.php @@ -8,7 +8,7 @@ namespace Drupal\Console\Generator; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Utils\TranslatorManager; +use Drupal\Console\Core\Utils\TranslatorManagerInterface; use Drupal\Console\Core\Generator\Generator; /** @@ -24,19 +24,19 @@ class CommandGenerator extends Generator protected $extensionManager; /** - * @var TranslatorManager + * @var TranslatorManagerInterface */ protected $translatorManager; /** * CommandGenerator constructor. * - * @param Manager $extensionManager - * @param TranslatorManager $translatorManager + * @param Manager $extensionManager + * @param TranslatorManagerInterface $translatorManager */ public function __construct( Manager $extensionManager, - TranslatorManager $translatorManager + TranslatorManagerInterface $translatorManager ) { $this->extensionManager = $extensionManager; $this->translatorManager = $translatorManager; diff --git a/src/Plugin/ScriptHandler.php b/src/Plugin/ScriptHandler.php new file mode 100644 index 000000000..3c13f15ba --- /dev/null +++ b/src/Plugin/ScriptHandler.php @@ -0,0 +1,28 @@ +getComposer()->getPackage()->getRequires()); + if (!$packages) { + return; + } + } +} diff --git a/src/Utils/TranslatorManager.php b/src/Utils/TranslatorManager.php new file mode 100644 index 000000000..fc1af26b3 --- /dev/null +++ b/src/Utils/TranslatorManager.php @@ -0,0 +1,15 @@ +