Skip to content

Commit df300b9

Browse files
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
{

0 commit comments

Comments
 (0)