Visitar URL original
Fix coding standard spacing issues · phpmyadmin/phpmyadmin@556594b · GitHub
Skip to content

Commit 556594b

Browse files
MauricioFauthMauricioFauth
committed
Fix coding standard spacing issues
- Fixes one line doc comments - Fixes parent call spacing - Fixes constant spacing Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 77957a6 commit 556594b

578 files changed

Lines changed: 1712 additions & 3447 deletions

File tree

Some content is hidden

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

‎libraries/classes/Advisory/Advisor.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,13 @@ private function setRules(): void
156156
$this->rules = array_merge($genericRules, $extraRules);
157157
}
158158

159-
/**
160-
* @return array{fired: array, notfired: array, unchecked: array, errors: array}
161-
*/
159+
/** @return array{fired: array, notfired: array, unchecked: array, errors: array} */
162160
public function getRunResult(): array
163161
{
164162
return $this->runResult;
165163
}
166164

167-
/**
168-
* @psalm-return array{fired:array, notfired:array, unchecked:array, errors:array}
169-
*/
165+
/** @psalm-return array{fired:array, notfired:array, unchecked:array, errors:array} */
170166
public function run(): array
171167
{
172168
$this->setVariables();

‎libraries/classes/Bookmark.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,7 @@ public static function createBookmark(
210210
return $bookmark;
211211
}
212212

213-
/**
214-
* @param array $row Resource used to build the bookmark
215-
*/
213+
/** @param array $row Resource used to build the bookmark */
216214
protected static function createFromRow(DatabaseInterface $dbi, array $row): Bookmark
217215
{
218216
$bookmark = new Bookmark($dbi, new Relation($dbi));

‎libraries/classes/Charsets/Collation.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ private function __construct(
8686
$this->description = $this->buildDescription();
8787
}
8888

89-
/**
90-
* @param string[] $state State obtained from the database server
91-
*/
89+
/** @param string[] $state State obtained from the database server */
9290
public static function fromServer(array $state): self
9391
{
9492
return new self(
@@ -233,9 +231,7 @@ private function buildDescription(): string
233231
return $this->buildName($name, $variant, $suffixes);
234232
}
235233

236-
/**
237-
* @param string[] $suffixes
238-
*/
234+
/** @param string[] $suffixes */
239235
private function buildName(string $result, string|null $variant, array $suffixes): string
240236
{
241237
if ($variant !== null) {

‎libraries/classes/Config.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,9 +598,7 @@ public function setSource(string $source): void
598598
$this->source = trim($source);
599599
}
600600

601-
/**
602-
* @throws ConfigException
603-
*/
601+
/** @throws ConfigException */
604602
public function checkConfigSource(): bool
605603
{
606604
if (! $this->getSource()) {

‎libraries/classes/Config/Descriptions.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public static function get($path, $type = 'name'): string
5151
return Sanitize::sanitizeMessage($value);
5252
}
5353

54-
/**
55-
* @return array<string, string>
56-
*/
54+
/** @return array<string, string> */
5755
private static function getComments(): array
5856
{
5957
/** @var array<string, string> $commentsMap */
@@ -70,9 +68,7 @@ private static function getComments(): array
7068
];
7169
}
7270

73-
/**
74-
* @return array<string, string>
75-
*/
71+
/** @return array<string, string> */
7672
private static function getDescriptions(): array
7773
{
7874
/** @var array<string, string> $descriptionsMap */
@@ -599,9 +595,7 @@ private static function getDescriptions(): array
599595
];
600596
}
601597

602-
/**
603-
* @return array<string, string>
604-
*/
598+
/** @return array<string, string> */
605599
private static function getNames(): array
606600
{
607601
/** @var array<string, string> $namesMap */

‎libraries/classes/Config/FormDisplay.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ class FormDisplay
105105

106106
private FormDisplayTemplate $formDisplayTemplate;
107107

108-
/**
109-
* @param ConfigFile $cf Config file instance
110-
*/
108+
/** @param ConfigFile $cf Config file instance */
111109
public function __construct(ConfigFile $cf)
112110
{
113111
$this->formDisplayTemplate = new FormDisplayTemplate($GLOBALS['config']);

‎libraries/classes/Config/Forms/BaseForm.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ abstract class BaseForm extends FormDisplay
2424
final public function __construct(ConfigFile $cf, $serverId = null)
2525
{
2626
parent::__construct($cf);
27+
2728
foreach (static::getForms() as $formName => $form) {
2829
$this->registerForm($formName, $form, $serverId);
2930
}

‎libraries/classes/Config/Forms/BaseFormList.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@ class BaseFormList
2525
/** @var BaseForm[] */
2626
private $forms;
2727

28-
/**
29-
* @return string[]
30-
*/
28+
/** @return string[] */
3129
public static function getAllFormNames(): array
3230
{
3331
return array_keys(static::$all);
3432
}
3533

36-
/**
37-
* @param string $name Name
38-
*/
34+
/** @param string $name Name */
3935
public static function isValid(string $name): bool
4036
{
4137
return array_key_exists($name, static::$all);
@@ -55,9 +51,7 @@ public static function get(string $name): string|null
5551
return null;
5652
}
5753

58-
/**
59-
* @param ConfigFile $cf Config file instance
60-
*/
54+
/** @param ConfigFile $cf Config file instance */
6155
final public function __construct(ConfigFile $cf)
6256
{
6357
$this->forms = [];

‎libraries/classes/Config/Forms/Page/BrowseForm.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
class BrowseForm extends BaseForm
1414
{
15-
/**
16-
* @return array
17-
*/
15+
/** @return array */
1816
public static function getForms(): array
1917
{
2018
return [

‎libraries/classes/Config/Forms/Page/DbStructureForm.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
class DbStructureForm extends BaseForm
1414
{
15-
/**
16-
* @return array
17-
*/
15+
/** @return array */
1816
public static function getForms(): array
1917
{
2018
return [

0 commit comments

Comments
 (0)