Skip to content

Commit 90e8976

Browse files
ondrejmirtesondrejmirtes
committed
Update build-cs
1 parent 2f736a6 commit 90e8976

File tree

55 files changed

+107
-174
lines changed

Some content is hidden

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

55 files changed

+107
-174
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
repository: "phpstan/build-cs"
5858
path: "build-cs"
59-
ref: "1.x"
59+
ref: "2.x"
6060

6161
- name: "Install PHP"
6262
uses: "shivammathur/setup-php@v2"

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ lint:
1313
.PHONY: cs-install
1414
cs-install:
1515
git clone https://github.com/phpstan/build-cs.git || true
16-
git -C build-cs fetch origin && git -C build-cs reset --hard origin/1.x
16+
git -C build-cs fetch origin && git -C build-cs reset --hard origin/2.x
1717
composer install --working-dir build-cs
1818

1919
.PHONY: cs

‎src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
final class ContainerInterfacePrivateServiceRule implements Rule
2020
{
2121

22-
/** @var ServiceMap */
23-
private $serviceMap;
22+
private ServiceMap $serviceMap;
2423

2524
public function __construct(ServiceMap $symfonyServiceMap)
2625
{

‎src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
final class ContainerInterfaceUnknownServiceRule implements Rule
2020
{
2121

22-
/** @var ServiceMap */
23-
private $serviceMap;
22+
private ServiceMap $serviceMap;
2423

25-
/** @var Standard */
26-
private $printer;
24+
private Standard $printer;
2725

2826
public function __construct(ServiceMap $symfonyServiceMap, Standard $printer)
2927
{

‎src/Rules/Symfony/InvalidArgumentDefaultValueRule.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function processNode(Node $node, Scope $scope): array
6262
return [
6363
RuleErrorBuilder::message(sprintf(
6464
'Parameter #4 $default of method Symfony\Component\Console\Command\Command::addArgument() expects string|null, %s given.',
65-
$defaultType->describe(VerbosityLevel::typeOnly())
65+
$defaultType->describe(VerbosityLevel::typeOnly()),
6666
))->identifier('argument.type')->build(),
6767
];
6868
}
@@ -72,7 +72,7 @@ public function processNode(Node $node, Scope $scope): array
7272
return [
7373
RuleErrorBuilder::message(sprintf(
7474
'Parameter #4 $default of method Symfony\Component\Console\Command\Command::addArgument() expects array<int, string>|null, %s given.',
75-
$defaultType->describe(VerbosityLevel::typeOnly())
75+
$defaultType->describe(VerbosityLevel::typeOnly()),
7676
))->identifier('argument.type')->build(),
7777
];
7878
}

‎src/Rules/Symfony/InvalidOptionDefaultValueRule.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function processNode(Node $node, Scope $scope): array
6767
RuleErrorBuilder::message(sprintf(
6868
'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects %s, %s given.',
6969
$checkType->describe(VerbosityLevel::typeOnly()),
70-
$defaultType->describe(VerbosityLevel::typeOnly())
70+
$defaultType->describe(VerbosityLevel::typeOnly()),
7171
))->identifier('argument.type')->build(),
7272
];
7373
}
@@ -78,7 +78,7 @@ public function processNode(Node $node, Scope $scope): array
7878
return [
7979
RuleErrorBuilder::message(sprintf(
8080
'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<string>|null, %s given.',
81-
$defaultType->describe(VerbosityLevel::typeOnly())
81+
$defaultType->describe(VerbosityLevel::typeOnly()),
8282
))->identifier('argument.type')->build(),
8383
];
8484
}

‎src/Rules/Symfony/UndefinedArgumentRule.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
final class UndefinedArgumentRule implements Rule
2323
{
2424

25-
/** @var ConsoleApplicationResolver */
26-
private $consoleApplicationResolver;
25+
private ConsoleApplicationResolver $consoleApplicationResolver;
2726

28-
/** @var Standard */
29-
private $printer;
27+
private Standard $printer;
3028

3129
public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Standard $printer)
3230
{

‎src/Rules/Symfony/UndefinedOptionRule.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
final class UndefinedOptionRule implements Rule
2323
{
2424

25-
/** @var ConsoleApplicationResolver */
26-
private $consoleApplicationResolver;
25+
private ConsoleApplicationResolver $consoleApplicationResolver;
2726

28-
/** @var Standard */
29-
private $printer;
27+
private Standard $printer;
3028

3129
public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Standard $printer)
3230
{

‎src/Symfony/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ final class Configuration
66
{
77

88
/** @var array<string, mixed> */
9-
private $parameters;
9+
private array $parameters;
1010

1111
/**
1212
* @param array<string, mixed> $parameters

‎src/Symfony/ConsoleApplicationResolver.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
final class ConsoleApplicationResolver
1717
{
1818

19-
/** @var string|null */
20-
private $consoleApplicationLoader;
19+
private ?string $consoleApplicationLoader = null;
2120

22-
/** @var Application|null */
23-
private $consoleApplication;
21+
private ?Application $consoleApplication = null;
2422

2523
public function __construct(Configuration $configuration)
2624
{

‎src/Symfony/DefaultParameterMap.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class DefaultParameterMap implements ParameterMap
1212
{
1313

1414
/** @var ParameterDefinition[] */
15-
private $parameters;
15+
private array $parameters;
1616

1717
/**
1818
* @param ParameterDefinition[] $parameters
@@ -39,9 +39,7 @@ public static function getParameterKeysFromNode(Expr $node, Scope $scope): array
3939
{
4040
$strings = TypeUtils::getConstantStrings($scope->getType($node));
4141

42-
return array_map(static function (Type $type) {
43-
return $type->getValue();
44-
}, $strings);
42+
return array_map(static fn (Type $type) => $type->getValue(), $strings);
4543
}
4644

4745
}

‎src/Symfony/DefaultServiceMap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ final class DefaultServiceMap implements ServiceMap
1111
{
1212

1313
/** @var ServiceDefinition[] */
14-
private $services;
14+
private array $services;
1515

1616
/**
1717
* @param ServiceDefinition[] $services

‎src/Symfony/InputBagStubFilesExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
class InputBagStubFilesExtension implements StubFilesExtension
1010
{
1111

12-
/** @var Reflector */
13-
private $reflector;
12+
private Reflector $reflector;
1413

1514
public function __construct(
1615
Reflector $reflector

‎src/Symfony/Parameter.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
final class Parameter implements ParameterDefinition
66
{
77

8-
/** @var string */
9-
private $key;
8+
private string $key;
109

1110
/** @var array<mixed>|bool|float|int|string */
1211
private $value;

‎src/Symfony/PasswordAuthenticatedUserStubFilesExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
class PasswordAuthenticatedUserStubFilesExtension implements StubFilesExtension
1010
{
1111

12-
/** @var Reflector */
13-
private $reflector;
12+
private Reflector $reflector;
1413

1514
public function __construct(
1615
Reflector $reflector

‎src/Symfony/RequiredAutowiringExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
class RequiredAutowiringExtension implements ReadWritePropertiesExtension, AdditionalConstructorsExtension
1414
{
1515

16-
/** @var FileTypeMapper */
17-
private $fileTypeMapper;
16+
private FileTypeMapper $fileTypeMapper;
1817

1918
public function __construct(FileTypeMapper $fileTypeMapper)
2019
{

‎src/Symfony/Service.php

+5-10
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@
55
final class Service implements ServiceDefinition
66
{
77

8-
/** @var string */
9-
private $id;
8+
private string $id;
109

11-
/** @var string|null */
12-
private $class;
10+
private ?string $class = null;
1311

14-
/** @var bool */
15-
private $public;
12+
private bool $public;
1613

17-
/** @var bool */
18-
private $synthetic;
14+
private bool $synthetic;
1915

20-
/** @var string|null */
21-
private $alias;
16+
private ?string $alias = null;
2217

2318
public function __construct(
2419
string $id,

‎src/Symfony/SymfonyDiagnoseExtension.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
class SymfonyDiagnoseExtension implements DiagnoseExtension
1010
{
1111

12-
/** @var ConsoleApplicationResolver */
13-
private $consoleApplicationResolver;
12+
private ConsoleApplicationResolver $consoleApplicationResolver;
1413

1514
public function __construct(ConsoleApplicationResolver $consoleApplicationResolver)
1615
{
@@ -21,7 +20,7 @@ public function print(Output $output): void
2120
{
2221
$output->writeLineFormatted(sprintf(
2322
'<info>Symfony\'s consoleApplicationLoader:</info> %s',
24-
$this->consoleApplicationResolver->hasConsoleApplicationLoader() ? 'In use' : 'No'
23+
$this->consoleApplicationResolver->hasConsoleApplicationLoader() ? 'In use' : 'No',
2524
));
2625
$output->writeLineFormatted('');
2726
}

‎src/Symfony/XmlParameterMapFactory.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
final class XmlParameterMapFactory implements ParameterMapFactory
1616
{
1717

18-
/** @var string|null */
19-
private $containerXml;
18+
private ?string $containerXml = null;
2019

2120
public function __construct(Configuration $configuration)
2221
{
@@ -47,7 +46,7 @@ public function create(): ParameterMap
4746

4847
$parameter = new Parameter(
4948
(string) $attrs->key,
50-
$this->getNodeValue($def)
49+
$this->getNodeValue($def),
5150
);
5251

5352
$parameters[$parameter->getKey()] = $parameter;

‎src/Symfony/XmlServiceMapFactory.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
final class XmlServiceMapFactory implements ServiceMapFactory
1313
{
1414

15-
/** @var string|null */
16-
private $containerXml;
15+
private ?string $containerXml = null;
1716

1817
public function __construct(Configuration $configuration)
1918
{
@@ -52,7 +51,7 @@ public function create(): ServiceMap
5251
isset($attrs->class) ? (string) $attrs->class : null,
5352
isset($attrs->public) && (string) $attrs->public === 'true',
5453
isset($attrs->synthetic) && (string) $attrs->synthetic === 'true',
55-
isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null
54+
isset($attrs->alias) ? $this->cleanServiceId((string) $attrs->alias) : null,
5655
);
5756

5857
if ($service->getAlias() !== null) {
@@ -72,7 +71,7 @@ public function create(): ServiceMap
7271
$services[$alias]->getClass(),
7372
$service->isPublic(),
7473
$service->isSynthetic(),
75-
$alias
74+
$alias,
7675
);
7776
}
7877

‎src/Type/Symfony/ArgumentTypeSpecifyingExtension.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
final class ArgumentTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
1616
{
1717

18-
/** @var Standard */
19-
private $printer;
18+
private Standard $printer;
2019

21-
/** @var TypeSpecifier */
22-
private $typeSpecifier;
20+
private TypeSpecifier $typeSpecifier;
2321

2422
public function __construct(Standard $printer)
2523
{
@@ -45,7 +43,7 @@ public function specifyTypes(MethodReflection $methodReflection, MethodCall $nod
4543
return $this->typeSpecifier->create(
4644
Helper::createMarkerNode($node->var, $argType, $this->printer),
4745
$argType,
48-
$context
46+
$context,
4947
);
5048
}
5149

‎src/Type/Symfony/CacheInterfaceGetDynamicReturnTypeExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
3434
$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
3535
$scope,
3636
$methodCall->getArgs(),
37-
$callbackReturnType->getCallableParametersAcceptors($scope)
37+
$callbackReturnType->getCallableParametersAcceptors($scope),
3838
);
3939
$returnType = $parametersAcceptor->getReturnType();
4040

‎src/Type/Symfony/CommandGetHelperDynamicReturnTypeExtension.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
final class CommandGetHelperDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
1919
{
2020

21-
/** @var ConsoleApplicationResolver */
22-
private $consoleApplicationResolver;
21+
private ConsoleApplicationResolver $consoleApplicationResolver;
2322

2423
public function __construct(ConsoleApplicationResolver $consoleApplicationResolver)
2524
{

‎src/Type/Symfony/Config/ArrayNodeDefinitionPrototypeDynamicReturnTypeExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function getTypeFromMethodCall(
7272

7373
return new ParentObjectType(
7474
$defaultType->describe(VerbosityLevel::typeOnly()),
75-
$calledOnType
75+
$calledOnType,
7676
);
7777
}
7878

‎src/Type/Symfony/Config/PassParentObjectDynamicReturnTypeExtension.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
final class PassParentObjectDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
1616
{
1717

18-
/** @var string */
19-
private $className;
18+
private string $className;
2019

2120
/** @var string[] */
22-
private $methods;
21+
private array $methods;
2322

2423
/**
2524
* @param string[] $methods

‎src/Type/Symfony/Config/ReturnParentDynamicReturnTypeExtension.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
final class ReturnParentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
1515
{
1616

17-
/** @var string */
18-
private $className;
17+
private string $className;
1918

2019
/** @var string[] */
21-
private $methods;
20+
private array $methods;
2221

2322
/**
2423
* @param string[] $methods

‎src/Type/Symfony/Config/TreeBuilderGetRootNodeDynamicReturnTypeExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function getTypeFromMethodCall(
3737
if ($calledOnType instanceof TreeBuilderType) {
3838
return new ParentObjectType(
3939
$calledOnType->getRootNodeClassName(),
40-
$calledOnType
40+
$calledOnType,
4141
);
4242
}
4343

‎src/Type/Symfony/Config/ValueObject/ParentObjectType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
class ParentObjectType extends ObjectType
1010
{
1111

12-
/** @var Type */
13-
private $parent;
12+
private Type $parent;
1413

1514
public function __construct(string $className, Type $parent)
1615
{

‎src/Type/Symfony/Config/ValueObject/TreeBuilderType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
class TreeBuilderType extends ObjectType
88
{
99

10-
/** @var string */
11-
private $rootNodeClassName;
10+
private string $rootNodeClassName;
1211

1312
public function __construct(string $className, string $rootNodeClassName)
1413
{

0 commit comments

Comments
 (0)