Skip to content

Commit 0f388ef

Browse files
authored
[console] Apply PSR-2 code style. (#3024)
1 parent 370a57d commit 0f388ef

File tree

148 files changed

+1780
-1554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1780
-1554
lines changed

src/Annotations/DrupalCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ class DrupalCommand
2929
* @var array
3030
*/
3131
public $dependencies;
32-
3332
}

src/Annotations/DrupalCommandAnnotationReader.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* Class DrupalCommandReader
99
* @package Drupal\Console\Annotations
1010
*/
11-
class DrupalCommandAnnotationReader {
12-
11+
class DrupalCommandAnnotationReader
12+
{
1313
/**
1414
* @param $class
1515
* @return array
@@ -22,7 +22,7 @@ public function readAnnotation($class)
2222
new \ReflectionClass($class),
2323
'Drupal\\Console\\Annotations\\DrupalCommand'
2424
);
25-
if($drupalCommandAnnotation) {
25+
if ($drupalCommandAnnotation) {
2626
$annotation['extension'] = $drupalCommandAnnotation->extension?:'';
2727
$annotation['extensionType'] = $drupalCommandAnnotation->extensionType?:'';
2828
$annotation['dependencies'] = $drupalCommandAnnotation->dependencies?:[];

src/Application.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ private function commandData($commandName)
344344
return $data;
345345
}
346346

347-
public function setContainer($container) {
347+
public function setContainer($container)
348+
{
348349
$this->container = $container;
349350
$this->registerGenerators();
350351
$this->registerCommands();

src/Bootstrap/Drupal.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,17 @@ public function boot()
4242

4343
$argvInputReader = new ArgvInputReader();
4444
if ($argvInputReader->get('uri')) {
45-
$uri = $argvInputReader->get('uri');
46-
if (substr($uri, -1) != '/') {
47-
$uri .= '/';
48-
}
49-
$uri .= 'index.php';
50-
$request = Request::create($uri, 'GET', array() , array(), array(), array('SCRIPT_NAME' => $this->appRoot . '/index.php'));
51-
}
52-
else {
53-
$request = Request::createFromGlobals();
45+
$uri = $argvInputReader->get('uri');
46+
if (substr($uri, -1) != '/') {
47+
$uri .= '/';
48+
}
49+
$uri .= 'index.php';
50+
$request = Request::create($uri, 'GET', array(), array(), array(), array('SCRIPT_NAME' => $this->appRoot . '/index.php'));
51+
} else {
52+
$request = Request::createFromGlobals();
5453
}
5554

56-
$drupalKernel = DrupalKernel::createFromRequest (
55+
$drupalKernel = DrupalKernel::createFromRequest(
5756
$request,
5857
$this->autoload,
5958
'prod',

src/Command/Config/DebugCommand.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@ class DebugCommand extends Command
2121
{
2222
use CommandTrait;
2323

24-
/** @var ConfigFactory */
24+
/**
25+
* @var ConfigFactory
26+
*/
2527
protected $configFactory;
2628

27-
/** @var CachedStorage */
29+
/**
30+
* @var CachedStorage
31+
*/
2832
protected $configStorage;
2933

3034
/**

src/Command/Config/DeleteCommand.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,19 @@ class DeleteCommand extends Command
2323

2424
protected $allConfig = [];
2525

26-
/** @var ConfigFactory */
26+
/**
27+
* @var ConfigFactory
28+
*/
2729
protected $configFactory;
2830

29-
/** @var CachedStorage */
31+
/**
32+
* @var CachedStorage
33+
*/
3034
protected $configStorage;
3135

32-
/** @var FileStorage */
36+
/**
37+
* @var FileStorage
38+
*/
3339
protected $configStorageSync;
3440

3541
/**
@@ -39,7 +45,7 @@ class DeleteCommand extends Command
3945
* @param FileStorage $configStorageSync
4046
*/
4147
public function __construct(
42-
ConfigFactory $configFactory ,
48+
ConfigFactory $configFactory,
4349
CachedStorage $configStorage,
4450
FileStorage $configStorageSync
4551
) {

src/Command/Config/DiffCommand.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ class DiffCommand extends Command
2222
{
2323
use CommandTrait;
2424

25-
/** @var CachedStorage */
25+
/**
26+
* @var CachedStorage
27+
*/
2628
protected $configStorage;
2729

28-
/** @var ConfigManager */
30+
/**
31+
* @var ConfigManager
32+
*/
2933
protected $configManager;
3034

3135
/**

src/Command/Config/EditCommand.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,29 @@ class EditCommand extends Command
2626
{
2727
use CommandTrait;
2828

29-
/** @var ConfigFactory */
29+
/**
30+
* @var ConfigFactory
31+
*/
3032
protected $configFactory;
3133

32-
/** @var CachedStorage */
34+
/**
35+
* @var CachedStorage
36+
*/
3337
protected $configStorage;
3438

35-
/** @var ConfigurationManager */
39+
/**
40+
* @var ConfigurationManager
41+
*/
3642
protected $configurationManager;
3743

3844
/**
3945
* EditCommand constructor.
40-
* @param ConfigFactory $configFactory
41-
* @param CachedStorage $configStorage
42-
* @param ConfigurationManager $configurationManager
46+
* @param ConfigFactory $configFactory
47+
* @param CachedStorage $configStorage
48+
* @param ConfigurationManager $configurationManager
4349
*/
4450
public function __construct(
45-
ConfigFactory $configFactory ,
51+
ConfigFactory $configFactory,
4652
CachedStorage $configStorage,
4753
ConfigurationManager $configurationManager
4854
) {

src/Command/Config/ExportCommand.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@
1818
use Drupal\Console\Style\DrupalStyle;
1919
use Drupal\Core\Config\ConfigManager;
2020

21-
2221
class ExportCommand extends Command
2322
{
2423
use CommandTrait;
2524

26-
/** @var ConfigManager */
25+
/**
26+
* @var ConfigManager
27+
*/
2728
protected $configManager;
2829

2930
/**
3031
* ExportCommand constructor.
3132
* @param ConfigManager $configManager
3233
*/
33-
public function __construct(ConfigManager $configManager ) {
34+
public function __construct(ConfigManager $configManager)
35+
{
3436
$this->configManager = $configManager;
3537
parent::__construct();
3638
}
@@ -142,9 +144,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
142144
}
143145

144146
$io->info(
145-
sprintf(
146-
$this->trans('commands.config.export.messages.directory'),
147-
$directory
147+
sprintf(
148+
$this->trans('commands.config.export.messages.directory'),
149+
$directory
148150
)
149151
);
150152
}

src/Command/Config/ExportContentTypeCommand.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,28 @@ class ExportContentTypeCommand extends Command
2626
use ModuleTrait;
2727
use ExportTrait;
2828

29-
/** @var EntityTypeManager */
29+
/**
30+
* @var EntityTypeManagerInterface
31+
*/
3032
protected $entityTypeManager;
3133

32-
/** @var CachedStorage */
34+
/**
35+
* @var CachedStorage
36+
*/
3337
protected $configStorage;
3438

35-
/** @var Manager */
39+
/**
40+
* @var Manager
41+
*/
3642
protected $extensionManager;
3743

3844
protected $configExport;
3945

4046
/**
4147
* ExportContentTypeCommand constructor.
4248
* @param EntityTypeManagerInterface $entityTypeManager
43-
* @param CachedStorage $configStorage
44-
* @param Manager $extensionManager
49+
* @param CachedStorage $configStorage
50+
* @param Manager $extensionManager
4551
*/
4652
public function __construct(
4753
EntityTypeManagerInterface $entityTypeManager,
@@ -199,4 +205,4 @@ protected function getViewDisplays($contentType, $optional = false)
199205
}
200206
}
201207
}
202-
}
208+
}

0 commit comments

Comments
 (0)