[console] Apply PSR-2 code style. (#3161)

hechoendrupal · Feb 5, 2017 · 7b1d370 · 7b1d370
1 parent e03ab42
commit 7b1d370
Show file tree

Hide file tree

Showing 14 changed files with 217 additions and 225 deletions.
diff --git a/src/Command/Config/DeleteCommand.php b/src/Command/Config/DeleteCommand.php
@@ -41,9 +41,9 @@ class DeleteCommand extends Command
     /**
      * DeleteCommand constructor.
      *
-     * @param ConfigFactory     $configFactory
-     * @param CachedStorage     $configStorage
-     * @param StorageInterface  $configStorageSync
+     * @param ConfigFactory    $configFactory
+     * @param CachedStorage    $configStorage
+     * @param StorageInterface $configStorageSync
      */
     public function __construct(
         ConfigFactory $configFactory,

diff --git a/src/Command/Config/ImportCommand.php b/src/Command/Config/ImportCommand.php
@@ -102,8 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($this->configImport($io, $storage_comparer)) {
             $io->success($this->trans('commands.config.import.messages.imported'));
-        }
-        else {
+        } else {
             return 1;
         }
     }
@@ -129,7 +128,7 @@ private function configImport(DrupalStyle $io, StorageComparer $storage_comparer
             try {
                 $io->info($this->trans('commands.config.import.messages.importing'));
                 $config_importer->import();
-                return TRUE;
+                return true;
             } catch (ConfigImporterException $e) {
                 $message = 'The import failed due for the following reasons:' . "\n";
                 $message .= implode("\n", $config_importer->getErrors());

diff --git a/src/Command/Create/NodesCommand.php b/src/Command/Create/NodesCommand.php
@@ -84,12 +84,12 @@ protected function configure()
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.create.nodes.options.time-range')
             )
-          ->addOption(
-            'language',
-            null,
-            InputOption::VALUE_OPTIONAL,
-            $this->trans('commands.create.nodes.options.language')
-          );
+            ->addOption(
+                'language',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.create.nodes.options.language')
+            );
     }
 
     /**
@@ -168,13 +168,12 @@ function ($contentType) use ($bundles) {
             // If no language option or invalid language code in option.
             if (!$language || !array_key_exists($language, $language_list)) {
                 $language = $io->choice(
-                  $this->trans('commands.create.nodes.questions.language'),
-                  $language_list
+                    $this->trans('commands.create.nodes.questions.language'),
+                    $language_list
                 );
             }
             $input->setOption('language', $language);
-        }
-        else {
+        } else {
             // If 'language' module is not enabled.
             $input->setOption('language', LanguageInterface::LANGCODE_NOT_SPECIFIED);
         }

diff --git a/src/Command/Cron/ExecuteCommand.php b/src/Command/Cron/ExecuteCommand.php
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        if ( $modules === NULL || in_array('all', $modules)) {
+        if ($modules === null || in_array('all', $modules)) {
             $modules = $this->moduleHandler->getImplementations('cron');
         }
 

diff --git a/src/Command/Generate/CacheContextCommand.php b/src/Command/Generate/CacheContextCommand.php
@@ -23,148 +23,148 @@
 
 class CacheContextCommand extends Command
 {
-  use ModuleTrait;
-  use ConfirmationTrait;
-  use ContainerAwareCommandTrait;
-  use ServicesTrait;
+    use ModuleTrait;
+    use ConfirmationTrait;
+    use ContainerAwareCommandTrait;
+    use ServicesTrait;
 
-  /**
+    /**
    * @var CacheContextGenerator
    */
-  protected $generator;
+    protected $generator;
 
-  /**
+    /**
    * @var ChainQueue
    */
-  protected $chainQueue;
+    protected $chainQueue;
 
-  /**
+    /**
    * @var Manager
    */
-  protected $extensionManager;
+    protected $extensionManager;
 
-  /**
+    /**
    * @var StringConverter
    */
-  protected $stringConverter;
+    protected $stringConverter;
 
-  /**
+    /**
    * CacheContextCommand constructor.
    *
-   * @param CacheContextGenerator    $generator
-   * @param ChainQueue               $chainQueue
-   * @param Manager                  $extensionManager
-   * @param StringConverter          $stringConverter
+   * @param CacheContextGenerator $generator
+   * @param ChainQueue            $chainQueue
+   * @param Manager               $extensionManager
+   * @param StringConverter       $stringConverter
    */
-  public function __construct(
-    CacheContextGenerator $generator,
-    ChainQueue $chainQueue,
-    Manager $extensionManager,
-    StringConverter $stringConverter
-  ) {
-    $this->generator = $generator;
-    $this->chainQueue = $chainQueue;
-    $this->extensionManager = $extensionManager;
-    $this->stringConverter = $stringConverter;
-    parent::__construct();
-  }
-
-  /**
+    public function __construct(
+        CacheContextGenerator $generator,
+        ChainQueue $chainQueue,
+        Manager $extensionManager,
+        StringConverter $stringConverter
+    ) {
+        $this->generator = $generator;
+        $this->chainQueue = $chainQueue;
+        $this->extensionManager = $extensionManager;
+        $this->stringConverter = $stringConverter;
+        parent::__construct();
+    }
+
+    /**
    * {@inheritdoc}
    */
-  protected function configure()
-  {
-    $this
-      ->setName('generate:cache:context')
-      ->setDescription($this->trans('commands.generate.cache.context.description'))
-      ->setHelp($this->trans('commands.generate.cache.context.description'))
-      ->addOption('module', null, InputOption::VALUE_REQUIRED, $this->trans('commands.common.options.module'))
-      ->addOption(
-        'cache_context',
-        null,
-        InputOption::VALUE_OPTIONAL,
-        $this->trans('commands.generate.cache.context.questions.name')
-      )
-      ->addOption(
-        'class',
-        null,
-        InputOption::VALUE_OPTIONAL,
-        $this->trans('commands.generate.cache.context.questions.class')
-      )
-      ->addOption(
-        'services',
-        null,
-        InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-        $this->trans('commands.common.options.services')
-      );
-  }
-
-  /**
+    protected function configure()
+    {
+        $this
+            ->setName('generate:cache:context')
+            ->setDescription($this->trans('commands.generate.cache.context.description'))
+            ->setHelp($this->trans('commands.generate.cache.context.description'))
+            ->addOption('module', null, InputOption::VALUE_REQUIRED, $this->trans('commands.common.options.module'))
+            ->addOption(
+                'cache_context',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.generate.cache.context.questions.name')
+            )
+            ->addOption(
+                'class',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.generate.cache.context.questions.class')
+            )
+            ->addOption(
+                'services',
+                null,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                $this->trans('commands.common.options.services')
+            );
+    }
+
+    /**
    * {@inheritdoc}
    */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
-    $io = new DrupalStyle($input, $output);
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new DrupalStyle($input, $output);
 
-    // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
-    if (!$this->confirmGeneration($io)) {
-      return;
-    }
+        // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
+        if (!$this->confirmGeneration($io)) {
+            return;
+        }
 
-    $module = $input->getOption('module');
-    $cache_context = $input->getOption('cache_context');
-    $class = $input->getOption('class');
-    $services = $input->getOption('services');
+        $module = $input->getOption('module');
+        $cache_context = $input->getOption('cache_context');
+        $class = $input->getOption('class');
+        $services = $input->getOption('services');
 
-    // @see Drupal\Console\Command\Shared\ServicesTrait::buildServices
-    $buildServices = $this->buildServices($services);
+        // @see Drupal\Console\Command\Shared\ServicesTrait::buildServices
+        $buildServices = $this->buildServices($services);
 
-    $this->generator->generate($module, $cache_context, $class, $buildServices);
+        $this->generator->generate($module, $cache_context, $class, $buildServices);
 
-    $this->chainQueue->addCommand('cache:rebuild', ['cache' => 'all']);
-  }
+        $this->chainQueue->addCommand('cache:rebuild', ['cache' => 'all']);
+    }
 
-  /**
+    /**
    * {@inheritdoc}
    */
-  protected function interact(InputInterface $input, OutputInterface $output)
-  {
-    $io = new DrupalStyle($input, $output);
-
-    // --module option
-    $module = $input->getOption('module');
-    if (!$module) {
-      // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
-      $module = $this->moduleQuestion($io);
-      $input->setOption('module', $module);
-    }
-
-    // --cache_context option
-    $cache_context = $input->getOption('cache_context');
-    if (!$cache_context) {
-      $cache_context = $io->ask(
-        $this->trans('commands.generate.cache.context.questions.name'),
-        sprintf('%s', $module)
-      );
-      $input->setOption('cache_context', $cache_context);
-    }
-
-    // --class option
-    $class = $input->getOption('class');
-    if (!$class) {
-      $class = $io->ask(
-        $this->trans('commands.generate.cache.context.questions.class'),
-        'DefaultCacheContext'
-      );
-      $input->setOption('class', $class);
-    }
-
-    // --services option
-    $services = $input->getOption('services');
-    if (!$services) {
-      // @see Drupal\Console\Command\Shared\ServicesTrait::servicesQuestion
-      $services = $this->servicesQuestion($io);
-      $input->setOption('services', $services);
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $io = new DrupalStyle($input, $output);
+
+        // --module option
+        $module = $input->getOption('module');
+        if (!$module) {
+            // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
+            $module = $this->moduleQuestion($io);
+            $input->setOption('module', $module);
+        }
+
+        // --cache_context option
+        $cache_context = $input->getOption('cache_context');
+        if (!$cache_context) {
+            $cache_context = $io->ask(
+                $this->trans('commands.generate.cache.context.questions.name'),
+                sprintf('%s', $module)
+            );
+            $input->setOption('cache_context', $cache_context);
+        }
+
+        // --class option
+        $class = $input->getOption('class');
+        if (!$class) {
+            $class = $io->ask(
+                $this->trans('commands.generate.cache.context.questions.class'),
+                'DefaultCacheContext'
+            );
+            $input->setOption('class', $class);
+        }
+
+        // --services option
+        $services = $input->getOption('services');
+        if (!$services) {
+            // @see Drupal\Console\Command\Shared\ServicesTrait::servicesQuestion
+            $services = $this->servicesQuestion($io);
+            $input->setOption('services', $services);
+        }
     }
-  }
 }
diff --git a/src/Command/Generate/PluginMigrateProcessCommand.php b/src/Command/Generate/PluginMigrateProcessCommand.php
@@ -49,10 +49,10 @@ class PluginMigrateProcessCommand extends Command
     /**
      * PluginBlockCommand constructor.
      *
-     * @param PluginMigrateProcessGenerator        $generator
-     * @param ChainQueue                           $chainQueue
-     * @param Manager                              $extensionManager
-     * @param StringConverter                      $stringConverter
+     * @param PluginMigrateProcessGenerator $generator
+     * @param ChainQueue                    $chainQueue
+     * @param Manager                       $extensionManager
+     * @param StringConverter               $stringConverter
      */
     public function __construct(
         PluginMigrateProcessGenerator $generator,

diff --git a/src/Command/Generate/UpdateCommand.php b/src/Command/Generate/UpdateCommand.php
@@ -57,7 +57,7 @@ class UpdateCommand extends Command
      *
      * @param Manager         $extensionManager
      * @param UpdateGenerator $generator
-     * @param Site $site
+     * @param Site            $site
      * @param ChainQueue      $chainQueue
      */
     public function __construct(