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

hechoendrupal · Dec 18, 2016 · 0f388ef · 0f388ef
1 parent 370a57d
commit 0f388ef
Show file tree

Hide file tree

Showing 148 changed files with 1,780 additions and 1,554 deletions.
diff --git a/src/Annotations/DrupalCommand.php b/src/Annotations/DrupalCommand.php
@@ -29,5 +29,4 @@ class DrupalCommand
      * @var array
      */
     public $dependencies;
-
 }
diff --git a/src/Annotations/DrupalCommandAnnotationReader.php b/src/Annotations/DrupalCommandAnnotationReader.php
@@ -8,8 +8,8 @@
  * Class DrupalCommandReader
  * @package Drupal\Console\Annotations
  */
-class DrupalCommandAnnotationReader {
-
+class DrupalCommandAnnotationReader
+{
     /**
      * @param $class
      * @return array
@@ -22,7 +22,7 @@ public function readAnnotation($class)
             new \ReflectionClass($class),
             'Drupal\\Console\\Annotations\\DrupalCommand'
         );
-        if($drupalCommandAnnotation) {
+        if ($drupalCommandAnnotation) {
             $annotation['extension'] = $drupalCommandAnnotation->extension?:'';
             $annotation['extensionType'] = $drupalCommandAnnotation->extensionType?:'';
             $annotation['dependencies'] = $drupalCommandAnnotation->dependencies?:[];

diff --git a/src/Application.php b/src/Application.php
@@ -344,7 +344,8 @@ private function commandData($commandName)
         return $data;
     }
 
-    public function setContainer($container) {
+    public function setContainer($container)
+    {
         $this->container = $container;
         $this->registerGenerators();
         $this->registerCommands();

diff --git a/src/Bootstrap/Drupal.php b/src/Bootstrap/Drupal.php
@@ -42,18 +42,17 @@ public function boot()
 
             $argvInputReader = new ArgvInputReader();
             if ($argvInputReader->get('uri')) {
-              $uri = $argvInputReader->get('uri');
-              if (substr($uri, -1) != '/') {
-                $uri .= '/';
-              }
-              $uri .= 'index.php';
-              $request = Request::create($uri, 'GET', array()  , array(), array(), array('SCRIPT_NAME' => $this->appRoot . '/index.php'));
-            }
-            else {
-              $request = Request::createFromGlobals();
+                $uri = $argvInputReader->get('uri');
+                if (substr($uri, -1) != '/') {
+                    $uri .= '/';
+                }
+                $uri .= 'index.php';
+                $request = Request::create($uri, 'GET', array(), array(), array(), array('SCRIPT_NAME' => $this->appRoot . '/index.php'));
+            } else {
+                $request = Request::createFromGlobals();
             }
 
-            $drupalKernel = DrupalKernel::createFromRequest  (
+            $drupalKernel = DrupalKernel::createFromRequest(
                 $request,
                 $this->autoload,
                 'prod',

diff --git a/src/Command/Config/DebugCommand.php b/src/Command/Config/DebugCommand.php
@@ -21,10 +21,14 @@ class DebugCommand extends Command
 {
     use CommandTrait;
 
-    /** @var ConfigFactory  */
+    /**
+     * @var ConfigFactory
+     */
     protected $configFactory;
 
-    /** @var CachedStorage  */
+    /**
+     * @var CachedStorage
+     */
     protected $configStorage;
 
     /**

diff --git a/src/Command/Config/DeleteCommand.php b/src/Command/Config/DeleteCommand.php
@@ -23,13 +23,19 @@ class DeleteCommand extends Command
 
     protected $allConfig = [];
 
-    /** @var ConfigFactory  */
+    /**
+     * @var ConfigFactory
+     */
     protected $configFactory;
 
-    /** @var CachedStorage  */
+    /**
+     * @var CachedStorage
+     */
     protected $configStorage;
 
-    /** @var FileStorage  */
+    /**
+     * @var FileStorage
+     */
     protected $configStorageSync;
 
     /**
@@ -39,7 +45,7 @@ class DeleteCommand extends Command
      * @param FileStorage   $configStorageSync
      */
     public function __construct(
-        ConfigFactory $configFactory ,
+        ConfigFactory $configFactory,
         CachedStorage $configStorage,
         FileStorage $configStorageSync
     ) {

diff --git a/src/Command/Config/DiffCommand.php b/src/Command/Config/DiffCommand.php
@@ -22,10 +22,14 @@ class DiffCommand extends Command
 {
     use CommandTrait;
 
-    /** @var CachedStorage  */
+    /**
+     * @var CachedStorage
+     */
     protected $configStorage;
 
-    /** @var ConfigManager  */
+    /**
+     * @var ConfigManager
+     */
     protected $configManager;
 
     /**

diff --git a/src/Command/Config/EditCommand.php b/src/Command/Config/EditCommand.php
@@ -26,23 +26,29 @@ class EditCommand extends Command
 {
     use CommandTrait;
 
-    /** @var ConfigFactory  */
+    /**
+     * @var ConfigFactory
+     */
     protected $configFactory;
 
-    /** @var CachedStorage  */
+    /**
+     * @var CachedStorage
+     */
     protected $configStorage;
 
-    /** @var ConfigurationManager  */
+    /**
+     * @var ConfigurationManager
+     */
     protected $configurationManager;
 
     /**
      * EditCommand constructor.
-     * @param ConfigFactory         $configFactory
-     * @param CachedStorage         $configStorage
-     * @param ConfigurationManager  $configurationManager
+     * @param ConfigFactory        $configFactory
+     * @param CachedStorage        $configStorage
+     * @param ConfigurationManager $configurationManager
      */
     public function __construct(
-        ConfigFactory $configFactory ,
+        ConfigFactory $configFactory,
         CachedStorage $configStorage,
         ConfigurationManager $configurationManager
     ) {

diff --git a/src/Command/Config/ExportCommand.php b/src/Command/Config/ExportCommand.php
@@ -18,19 +18,21 @@
 use Drupal\Console\Style\DrupalStyle;
 use Drupal\Core\Config\ConfigManager;
 
-
 class ExportCommand extends Command
 {
     use CommandTrait;
 
-    /** @var ConfigManager  */
+    /**
+     * @var ConfigManager
+     */
     protected $configManager;
 
     /**
      * ExportCommand constructor.
      * @param ConfigManager $configManager
      */
-    public function __construct(ConfigManager $configManager ) {
+    public function __construct(ConfigManager $configManager)
+    {
         $this->configManager = $configManager;
         parent::__construct();
     }
@@ -142,9 +144,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->info(
-          sprintf(
-            $this->trans('commands.config.export.messages.directory'),
-              $directory
+            sprintf(
+                $this->trans('commands.config.export.messages.directory'),
+                $directory
             )
         );
     }

diff --git a/src/Command/Config/ExportContentTypeCommand.php b/src/Command/Config/ExportContentTypeCommand.php
@@ -26,22 +26,28 @@ class ExportContentTypeCommand extends Command
     use ModuleTrait;
     use ExportTrait;
 
-    /** @var EntityTypeManager  */
+    /**
+     * @var EntityTypeManagerInterface
+     */
     protected $entityTypeManager;
 
-    /** @var CachedStorage  */
+    /**
+     * @var CachedStorage
+     */
     protected $configStorage;
 
-    /** @var Manager  */
+    /**
+     * @var Manager
+     */
     protected $extensionManager;
 
     protected $configExport;
 
     /**
      * ExportContentTypeCommand constructor.
      * @param EntityTypeManagerInterface $entityTypeManager
-     * @param CachedStorage     $configStorage
-     * @param Manager           $extensionManager
+     * @param CachedStorage              $configStorage
+     * @param Manager                    $extensionManager
      */
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
@@ -199,4 +205,4 @@ protected function getViewDisplays($contentType, $optional = false)
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,4 @@ class DrupalCommand @@
          * @var array
          */
         public $dependencies;
     }