Skip to content

Commit e5442ed

Browse files
ondrejmirtesondrejmirtes
committed
Merge remote-tracking branch 'origin/1.3.x' into 1.4.x
2 parents 0b14d67 + 30cf38d commit e5442ed

15 files changed

+84
-16
lines changed

‎.github/workflows/build.yml

+4
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ jobs:
127127
if: ${{ matrix.dependencies == 'lowest' }}
128128
run: "composer update --prefer-lowest --no-interaction --no-progress"
129129

130+
- name: "Update Doctrine DBAl to ^3"
131+
if: matrix.php-version != '7.2' && matrix.dependencies == 'lowest'
132+
run: "composer require --dev doctrine/dbal:^3.3.8 --no-interaction --no-progress"
133+
130134
- name: "Install highest dependencies"
131135
if: ${{ matrix.dependencies == 'highest' }}
132136
run: "composer update --no-interaction --no-progress"

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"php-parallel-lint/php-parallel-lint": "^1.2",
3434
"phpstan/phpstan-phpunit": "^1.3.13",
3535
"phpstan/phpstan-strict-rules": "^1.5.1",
36-
"phpunit/phpunit": "^9.5.10",
36+
"phpunit/phpunit": "^9.6.16",
3737
"ramsey/uuid": "^4.2",
3838
"symfony/cache": "^5.4"
3939
},

‎extension.neon

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ parameters:
4141
- stubs/ORM/Id/AbstractIdGenerator.stub
4242
- stubs/ORM/Mapping/ClassMetadata.stub
4343
- stubs/ORM/Mapping/ClassMetadataInfo.stub
44+
- stubs/ORM/Mapping/ManyToManyInverseSideMapping.stub
45+
- stubs/ORM/Mapping/ManyToManyOwningSideMapping.stub
46+
- stubs/ORM/Mapping/ManyToOneAssociationMapping.stub
47+
- stubs/ORM/Mapping/OneToManyAssociationMapping.stub
48+
- stubs/ORM/Mapping/OneToOneInverseSideMapping.stub
49+
- stubs/ORM/Mapping/OneToOneOwningSideMapping.stub
4450
- stubs/ORM/NonUniqueResultException.stub
4551
- stubs/ORM/NoResultException.stub
4652
- stubs/ORM/ORMException.stub

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function processNode(Node $node, Scope $scope): array
137137
}
138138

139139
$identifiers = [];
140-
if ($metadata->generatorType !== 5) { // ClassMetadataInfo::GENERATOR_TYPE_NONE
140+
if ($metadata->generatorType !== 5) { // ClassMetadata::GENERATOR_TYPE_NONE
141141
try {
142142
$identifiers = $metadata->getIdentifierFieldNames();
143143
} catch (Throwable $e) {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function processNode(Node $node, Scope $scope): array
8787

8888
$columnType = null;
8989
$toMany = false;
90-
if ((bool) ($associationMapping['type'] & 3)) { // ClassMetadataInfo::TO_ONE
90+
if ((bool) ($associationMapping['type'] & 3)) { // ClassMetadata::TO_ONE
9191
$columnType = new ObjectType($associationMapping['targetEntity']);
9292
if (in_array($propertyName, $identifiers, true)) {
9393
$nullable = false;
@@ -98,7 +98,7 @@ public function processNode(Node $node, Scope $scope): array
9898
if ($nullable) {
9999
$columnType = TypeCombinator::addNull($columnType);
100100
}
101-
} elseif ((bool) ($associationMapping['type'] & 12)) { // ClassMetadataInfo::TO_MANY
101+
} elseif ((bool) ($associationMapping['type'] & 12)) { // ClassMetadata::TO_MANY
102102
$toMany = true;
103103
$columnType = TypeCombinator::intersect(
104104
new ObjectType('Doctrine\Common\Collections\Collection'),

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PHPStan\Rules\Doctrine\ORM;
44

5-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
5+
use Doctrine\ORM\Mapping\ClassMetadata;
66
use PHPStan\Reflection\PropertyReflection;
77
use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
88
use PHPStan\Type\Doctrine\ObjectMetadataResolver;
@@ -47,7 +47,7 @@ public function isAlwaysWritten(PropertyReflection $property, string $propertyNa
4747

4848
if (isset($metadata->fieldMappings[$propertyName])) {
4949
$mapping = $metadata->fieldMappings[$propertyName];
50-
if (array_key_exists('generated', $mapping) && $mapping['generated'] !== ClassMetadataInfo::GENERATED_NEVER) {
50+
if (array_key_exists('generated', $mapping) && $mapping['generated'] !== ClassMetadata::GENERATED_NEVER) {
5151
return true;
5252
}
5353
}
@@ -84,9 +84,9 @@ public function isInitialized(PropertyReflection $property, string $propertyName
8484
}
8585

8686
/**
87-
* @param ClassMetadataInfo<object> $metadata
87+
* @param ClassMetadata<object> $metadata
8888
*/
89-
private function isGeneratedIdentifier(ClassMetadataInfo $metadata, string $propertyName): bool
89+
private function isGeneratedIdentifier(ClassMetadata $metadata, string $propertyName): bool
9090
{
9191
if ($metadata->isIdentifierNatural()) {
9292
return false;

‎src/Type/Doctrine/ObjectMetadataResolver.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace PHPStan\Type\Doctrine;
44

55
use Doctrine\Common\Annotations\AnnotationException;
6-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
6+
use Doctrine\ORM\Mapping\ClassMetadata;
77
use Doctrine\ORM\Mapping\MappingException;
88
use Doctrine\Persistence\ObjectManager;
99
use PHPStan\Doctrine\Mapping\ClassMetadataFactory;
@@ -108,9 +108,9 @@ private function getMetadataFactory(): ?ClassMetadataFactory
108108
/**
109109
* @template T of object
110110
* @param class-string<T> $className
111-
* @return ClassMetadataInfo<T>|null
111+
* @return ClassMetadata<T>|null
112112
*/
113-
public function getClassMetadata(string $className): ?ClassMetadataInfo
113+
public function getClassMetadata(string $className): ?ClassMetadata
114114
{
115115
if ($this->isTransient($className)) {
116116
return null;
@@ -135,11 +135,11 @@ public function getClassMetadata(string $className): ?ClassMetadataInfo
135135
return null;
136136
}
137137

138-
if (!$metadata instanceof ClassMetadataInfo) {
138+
if (!$metadata instanceof ClassMetadata) {
139139
return null;
140140
}
141141

142-
/** @var ClassMetadataInfo<T> $ormMetadata */
142+
/** @var ClassMetadata<T> $ormMetadata */
143143
$ormMetadata = $metadata;
144144

145145
return $ormMetadata;

‎src/Type/Doctrine/Query/QueryResultTypeWalker.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use BackedEnum;
66
use Doctrine\ORM\EntityManagerInterface;
7-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
7+
use Doctrine\ORM\Mapping\ClassMetadata;
88
use Doctrine\ORM\Query;
99
use Doctrine\ORM\Query\AST;
1010
use Doctrine\ORM\Query\AST\TypedExpression;
@@ -1285,10 +1285,10 @@ private function isQueryComponentNullable(string $dqlAlias): bool
12851285
}
12861286

12871287
/**
1288-
* @param ClassMetadataInfo<object> $class
1288+
* @param ClassMetadata<object> $class
12891289
* @return array{string, ?class-string<BackedEnum>} Doctrine type name and enum type of field
12901290
*/
1291-
private function getTypeOfField(ClassMetadataInfo $class, string $fieldName): array
1291+
private function getTypeOfField(ClassMetadata $class, string $fieldName): array
12921292
{
12931293
assert(isset($class->fieldMappings[$fieldName]));
12941294

‎stubs/ORM/Mapping/ClassMetadata.stub

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ namespace Doctrine\ORM\Mapping;
9393
* inherited?: class-string,
9494
* declared?: class-string,
9595
* }
96+
* @phpstan-type ConcreteAssociationMapping = OneToOneOwningSideMapping|OneToOneInverseSideMapping|ManyToOneAssociationMapping|OneToManyAssociationMapping|ManyToManyOwningSideMapping|ManyToManyInverseSideMapping
9697
*/
9798
class ClassMetadata extends ClassMetadataInfo
9899
{

‎stubs/ORM/Mapping/ManyToManyInverseSideMapping.stub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
final class ManyToManyInverseSideMapping
8+
{
9+
}

‎stubs/ORM/Mapping/ManyToManyOwningSideMapping.stub

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
use function strtolower;
8+
use function trim;
9+
10+
final class ManyToManyOwningSideMapping
11+
{
12+
}

‎stubs/ORM/Mapping/ManyToOneAssociationMapping.stub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
final class ManyToOneAssociationMapping
8+
{
9+
}

‎stubs/ORM/Mapping/OneToManyAssociationMapping.stub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
final class OneToManyAssociationMapping
8+
{
9+
}

‎stubs/ORM/Mapping/OneToOneInverseSideMapping.stub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
final class OneToOneInverseSideMapping
8+
{
9+
}

‎stubs/ORM/Mapping/OneToOneOwningSideMapping.stub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Mapping;
6+
7+
final class OneToOneOwningSideMapping
8+
{
9+
}

0 commit comments

Comments
 (0)