Skip to content

Commit 894ef83

Browse files
minor symfony#53352 CS: trailing commas (keradus)
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- CS: trailing commas | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | CS <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT kind-of requested in symfony#53230 (comment) cc `@OskarStark` The diff may be bigger and tricky. I put each part of standalone change as separated commit, easy to revert if you don't like particular change. This PR is more demonstration what we can do with Fixer, you decides which way to go Commits ------- 0cda041 CS: trailing commas
2 parents 7269a3d + 0cda041 commit 894ef83

File tree

51 files changed

+53
-52
lines changed

Some content is hidden

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

51 files changed

+53
-52
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'modernize_strpos' => true,
3939
'get_class_to_class_keyword' => true,
4040
'nullable_type_declaration' => true,
41+
'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
4142
])
4243
->setRiskyAllowed(true)
4344
->setFinder(

src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
final class UlidGenerator extends AbstractIdGenerator
2121
{
2222
public function __construct(
23-
private readonly ?UlidFactory $factory = null
23+
private readonly ?UlidFactory $factory = null,
2424
) {
2525
}
2626

src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function __construct(
5151
bool|string|array $ignoreNull = null,
5252
array $groups = null,
5353
$payload = null,
54-
array $options = []
54+
array $options = [],
5555
) {
5656
if (\is_array($fields) && \is_string(key($fields))) {
5757
$options = array_merge($fields, $options);

src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class NotFoundActivationStrategy implements ActivationStrategyInterface
3030
public function __construct(
3131
private RequestStack $requestStack,
3232
array $excludedUrls,
33-
private ActivationStrategyInterface $inner
33+
private ActivationStrategyInterface $inner,
3434
) {
3535
$this->exclude = '{('.implode('|', $excludedUrls).')}i';
3636
}

src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(
2929
private readonly ?string $accessDeniedUrl = null,
3030
private readonly array $authenticators = [],
3131
private readonly ?array $switchUser = null,
32-
private readonly ?array $logout = null
32+
private readonly ?array $logout = null,
3333
) {
3434
}
3535

src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function testToolbarConfigUsingInterceptRedirects(
158158
bool $toolbarEnabled,
159159
bool $interceptRedirects,
160160
bool $listenerInjected,
161-
bool $listenerEnabled
161+
bool $listenerEnabled,
162162
) {
163163
$extension = new WebProfilerExtension();
164164
$extension->load(

src/Symfony/Component/AssetMapper/ImportMap/PackageVersionProblem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct(
1717
public readonly string $packageName,
1818
public readonly string $dependencyPackageName,
1919
public readonly string $requiredVersionConstraint,
20-
public readonly ?string $installedVersion
20+
public readonly ?string $installedVersion,
2121
) {
2222
}
2323
}

src/Symfony/Component/Console/Completion/Suggestion.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Suggestion implements \Stringable
2020
{
2121
public function __construct(
2222
private readonly string $value,
23-
private readonly string $description = ''
23+
private readonly string $description = '',
2424
) {
2525
}
2626

src/Symfony/Component/Console/Helper/OutputWrapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ final class OutputWrapper
4949
private const URL_PATTERN = 'https?://\S+';
5050

5151
public function __construct(
52-
private bool $allowCutUrls = false
52+
private bool $allowCutUrls = false,
5353
) {
5454
}
5555

src/Symfony/Component/Console/Output/AnsiColorMode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function convertFromHexToAnsiColorCode(string $hexColor): string
6363
return match ($this) {
6464
self::Ansi4 => (string) $this->convertFromRGB($r, $g, $b),
6565
self::Ansi8 => '8;5;'.((string) $this->convertFromRGB($r, $g, $b)),
66-
self::Ansi24 => sprintf('8;2;%d;%d;%d', $r, $g, $b)
66+
self::Ansi24 => sprintf('8;2;%d;%d;%d', $r, $g, $b),
6767
};
6868
}
6969

@@ -72,7 +72,7 @@ private function convertFromRGB(int $r, int $g, int $b): int
7272
return match ($this) {
7373
self::Ansi4 => $this->degradeHexColorToAnsi4($r, $g, $b),
7474
self::Ansi8 => $this->degradeHexColorToAnsi8($r, $g, $b),
75-
default => throw new InvalidArgumentException("RGB cannot be converted to {$this->name}.")
75+
default => throw new InvalidArgumentException("RGB cannot be converted to {$this->name}."),
7676
};
7777
}
7878

0 commit comments

Comments
 (0)