Skip to content

Commit df300b9

Browse files
ondrejmirtesondrejmirtes
committed
Update build-cs
1 parent bf12209 commit df300b9

File tree

78 files changed

+311
-467
lines changed

Some content is hidden

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

78 files changed

+311
-467
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
with:
6464
repository: "phpstan/build-cs"
6565
path: "build-cs"
66-
ref: "1.x"
66+
ref: "2.x"
6767

6868
- name: "Install PHP"
6969
uses: "shivammathur/setup-php@v2"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lint:
1414
.PHONY: cs-install
1515
cs-install:
1616
git clone https://github.com/phpstan/build-cs.git || true
17-
git -C build-cs fetch origin && git -C build-cs reset --hard origin/1.x
17+
git -C build-cs fetch origin && git -C build-cs reset --hard origin/2.x
1818
composer install --working-dir build-cs
1919

2020
.PHONY: cs

‎src/Classes/DoctrineProxyForbiddenClassNamesExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
class DoctrineProxyForbiddenClassNamesExtension implements ForbiddenClassNameExtension
99
{
1010

11-
/** @var ObjectMetadataResolver */
12-
private $objectMetadataResolver;
11+
private ObjectMetadataResolver $objectMetadataResolver;
1312

1413
public function __construct(ObjectMetadataResolver $objectMetadataResolver)
1514
{

‎src/Doctrine/DoctrineDiagnoseExtension.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
class DoctrineDiagnoseExtension implements DiagnoseExtension
1616
{
1717

18-
/** @var ObjectMetadataResolver */
19-
private $objectMetadataResolver;
18+
private ObjectMetadataResolver $objectMetadataResolver;
2019

21-
/** @var DriverDetector */
22-
private $driverDetector;
20+
private DriverDetector $driverDetector;
2321

2422
public function __construct(
2523
ObjectMetadataResolver $objectMetadataResolver,
@@ -34,7 +32,7 @@ public function print(Output $output): void
3432
{
3533
$output->writeLineFormatted(sprintf(
3634
'<info>Doctrine\'s objectManagerLoader:</info> %s',
37-
$this->objectMetadataResolver->hasObjectManagerLoader() ? 'In use' : 'No'
35+
$this->objectMetadataResolver->hasObjectManagerLoader() ? 'In use' : 'No',
3836
));
3937

4038
$objectManager = $this->objectMetadataResolver->getObjectManager();
@@ -44,7 +42,7 @@ public function print(Output $output): void
4442

4543
$output->writeLineFormatted(sprintf(
4644
'<info>Detected driver:</info> %s',
47-
$driver === null ? 'None' : $driver
45+
$driver === null ? 'None' : $driver,
4846
));
4947
}
5048

‎src/Doctrine/Mapping/ClassMetadataFactory.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
class ClassMetadataFactory extends \Doctrine\ORM\Mapping\ClassMetadataFactory
1919
{
2020

21-
/** @var string */
22-
private $tmpDir;
21+
private string $tmpDir;
2322

2423
public function __construct(string $tmpDir)
2524
{

‎src/Doctrine/Mapping/MappingDriverChain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MappingDriverChain implements MappingDriver
1111
{
1212

1313
/** @var MappingDriver[] */
14-
private $drivers;
14+
private array $drivers;
1515

1616
/**
1717
* @param MappingDriver[] $drivers

‎src/PhpDoc/Doctrine/DoctrineLiteralStringTypeNodeResolverExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
class DoctrineLiteralStringTypeNodeResolverExtension implements TypeNodeResolverExtension
1515
{
1616

17-
/** @var bool */
18-
private $enabled;
17+
private bool $enabled;
1918

2019
public function __construct(bool $enabled)
2120
{

‎src/PhpDoc/Doctrine/QueryTypeNodeResolverExtension.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
class QueryTypeNodeResolverExtension implements TypeNodeResolverExtension, TypeNodeResolverAwareExtension
1919
{
2020

21-
/** @var TypeNodeResolver */
22-
private $typeNodeResolver;
21+
private TypeNodeResolver $typeNodeResolver;
2322

2423
public function setTypeNodeResolver(TypeNodeResolver $typeNodeResolver): void
2524
{
@@ -47,7 +46,7 @@ public function resolve(TypeNode $typeNode, NameScope $nameScope): ?Type
4746
[
4847
new NullType(),
4948
$this->typeNodeResolver->resolve($typeNode->genericTypes[0], $nameScope),
50-
]
49+
],
5150
);
5251
}
5352

‎src/Reflection/Doctrine/DoctrineSelectableClassReflectionExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
class DoctrineSelectableClassReflectionExtension implements MethodsClassReflectionExtension
1111
{
1212

13-
/** @var ReflectionProvider */
14-
private $reflectionProvider;
13+
private ReflectionProvider $reflectionProvider;
1514

1615
public function __construct(ReflectionProvider $reflectionProvider)
1716
{

‎src/Reflection/Doctrine/DummyParameter.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,17 @@
99
class DummyParameter implements ParameterReflection
1010
{
1111

12-
/** @var string */
13-
private $name;
12+
private string $name;
1413

15-
/** @var Type */
16-
private $type;
14+
private Type $type;
1715

18-
/** @var bool */
19-
private $optional;
16+
private bool $optional;
2017

21-
/** @var PassedByReference */
22-
private $passedByReference;
18+
private PassedByReference $passedByReference;
2319

24-
/** @var bool */
25-
private $variadic;
20+
private bool $variadic;
2621

27-
/** @var Type|null */
28-
private $defaultValue;
22+
private ?Type $defaultValue = null;
2923

3024
public function __construct(string $name, Type $type, bool $optional, ?PassedByReference $passedByReference, bool $variadic, ?Type $defaultValue)
3125
{

‎src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
class EntityRepositoryClassReflectionExtension implements MethodsClassReflectionExtension
2323
{
2424

25-
/** @var ObjectMetadataResolver */
26-
private $objectMetadataResolver;
25+
private ObjectMetadataResolver $objectMetadataResolver;
2726

2827
public function __construct(ObjectMetadataResolver $objectMetadataResolver)
2928
{

‎src/Reflection/Doctrine/MagicRepositoryMethodReflection.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121
class MagicRepositoryMethodReflection implements MethodReflection
2222
{
2323

24-
/** @var ClassReflection */
25-
private $declaringClass;
24+
private ClassReflection $declaringClass;
2625

27-
/** @var string */
28-
private $name;
26+
private string $name;
2927

30-
/** @var Type */
31-
private $type;
28+
private Type $type;
3229

3330
public function __construct(
3431
ClassReflection $declaringClass,
@@ -104,7 +101,7 @@ public function getVariants(): array
104101
null,
105102
$arguments,
106103
false,
107-
$this->type
104+
$this->type,
108105
),
109106
];
110107
}

‎src/Rules/Doctrine/ORM/DqlRule.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
class DqlRule implements Rule
2222
{
2323

24-
/** @var ObjectMetadataResolver */
25-
private $objectMetadataResolver;
24+
private ObjectMetadataResolver $objectMetadataResolver;
2625

2726
public function __construct(ObjectMetadataResolver $objectMetadataResolver)
2827
{

‎src/Rules/Doctrine/ORM/EntityColumnRule.php

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,17 @@
3434
class EntityColumnRule implements Rule
3535
{
3636

37-
/** @var ObjectMetadataResolver */
38-
private $objectMetadataResolver;
37+
private ObjectMetadataResolver $objectMetadataResolver;
3938

40-
/** @var DescriptorRegistry */
41-
private $descriptorRegistry;
39+
private DescriptorRegistry $descriptorRegistry;
4240

43-
/** @var ReflectionProvider */
44-
private $reflectionProvider;
41+
private ReflectionProvider $reflectionProvider;
4542

46-
/** @var bool */
47-
private $reportUnknownTypes;
43+
private bool $reportUnknownTypes;
4844

49-
/** @var bool */
50-
private $allowNullablePropertyForRequiredField;
45+
private bool $allowNullablePropertyForRequiredField;
5146

52-
/** @var bool */
53-
private $bleedingEdge;
47+
private bool $bleedingEdge;
5448

5549
public function __construct(
5650
ObjectMetadataResolver $objectMetadataResolver,
@@ -106,7 +100,7 @@ public function processNode(Node $node, Scope $scope): array
106100
'Property %s::$%s: Doctrine type "%s" does not have any registered descriptor.',
107101
$className,
108102
$propertyName,
109-
$fieldMapping['type']
103+
$fieldMapping['type'],
110104
))->identifier('doctrine.descriptorNotFound')->build(),
111105
] : [];
112106
}
@@ -128,7 +122,7 @@ public function processNode(Node $node, Scope $scope): array
128122
$propertyName,
129123
$backedEnumType->describe(VerbosityLevel::typeOnly()),
130124
$enumReflection->getDisplayName(),
131-
$writableToDatabaseType->describe(VerbosityLevel::typeOnly())
125+
$writableToDatabaseType->describe(VerbosityLevel::typeOnly()),
132126
))->identifier('doctrine.enumType')->build();
133127
}
134128
}
@@ -151,20 +145,20 @@ public function processNode(Node $node, Scope $scope): array
151145
$backedEnumType->describe(VerbosityLevel::typeOnly()),
152146
$enumReflection->getDisplayName(),
153147
$writableToDatabaseType->getIterableValueType()->describe(VerbosityLevel::typeOnly()),
154-
$writableToDatabaseType->describe(VerbosityLevel::typeOnly())
155-
)
148+
$writableToDatabaseType->describe(VerbosityLevel::typeOnly()),
149+
),
156150
)->identifier('doctrine.enumType')->build();
157151
}
158152
}
159153
}
160154

161155
$writableToPropertyType = TypeCombinator::intersect(new ArrayType(
162156
$writableToPropertyType->getIterableKeyType(),
163-
$enumType
157+
$enumType,
164158
), ...TypeUtils::getAccessoryTypes($writableToPropertyType));
165159
$writableToDatabaseType = TypeCombinator::intersect(new ArrayType(
166160
$writableToDatabaseType->getIterableKeyType(),
167-
$enumType
161+
$enumType,
168162
), ...TypeUtils::getAccessoryTypes($writableToDatabaseType));
169163

170164
}
@@ -211,23 +205,23 @@ public function processNode(Node $node, Scope $scope): array
211205
$className,
212206
$propertyName,
213207
$writableToPropertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType)),
214-
$propertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType))
208+
$propertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType)),
215209
))->identifier('doctrine.columnType')->build();
216210
}
217211

218212
if (
219213
!$writableToDatabaseType->isSuperTypeOf(
220214
$this->allowNullablePropertyForRequiredField || (in_array($propertyName, $identifiers, true) && !$nullable)
221215
? TypeCombinator::removeNull($propertyType)
222-
: $propertyType
216+
: $propertyType,
223217
)->yes()
224218
) {
225219
$errors[] = RuleErrorBuilder::message(sprintf(
226220
'Property %s::$%s type mapping mismatch: property can contain %s but database expects %s.',
227221
$className,
228222
$propertyName,
229223
$propertyTransformedType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType)),
230-
$writableToDatabaseType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType))
224+
$writableToDatabaseType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType)),
231225
))->identifier('doctrine.columnType')->build();
232226
}
233227
return $errors;

‎src/Rules/Doctrine/ORM/EntityConstructorNotFinalRule.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
class EntityConstructorNotFinalRule implements Rule
1818
{
1919

20-
/** @var ObjectMetadataResolver */
21-
private $objectMetadataResolver;
20+
private ObjectMetadataResolver $objectMetadataResolver;
2221

2322
public function __construct(ObjectMetadataResolver $objectMetadataResolver)
2423
{
@@ -57,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
5756
return [
5857
RuleErrorBuilder::message(sprintf(
5958
'Constructor of class %s is final which can cause problems with proxies.',
60-
$classReflection->getDisplayName()
59+
$classReflection->getDisplayName(),
6160
))->identifier('doctrine.finalConstructor')->build(),
6261
];
6362
}

‎src/Rules/Doctrine/ORM/EntityMappingExceptionRule.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
class EntityMappingExceptionRule implements Rule
1919
{
2020

21-
/** @var ObjectMetadataResolver */
22-
private $objectMetadataResolver;
21+
private ObjectMetadataResolver $objectMetadataResolver;
2322

2423
public function __construct(
2524
ObjectMetadataResolver $objectMetadataResolver

‎src/Rules/Doctrine/ORM/EntityNotFinalRule.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
class EntityNotFinalRule implements Rule
1818
{
1919

20-
/** @var ObjectMetadataResolver */
21-
private $objectMetadataResolver;
20+
private ObjectMetadataResolver $objectMetadataResolver;
2221

2322
public function __construct(ObjectMetadataResolver $objectMetadataResolver)
2423
{
@@ -52,7 +51,7 @@ public function processNode(Node $node, Scope $scope): array
5251
return [
5352
RuleErrorBuilder::message(sprintf(
5453
'Entity class %s is final which can cause problems with proxies.',
55-
$classReflection->getDisplayName()
54+
$classReflection->getDisplayName(),
5655
))->identifier('doctrine.finalEntity')->build(),
5756
];
5857
}

0 commit comments

Comments
 (0)