Skip to content

Commit 28012e9

Browse files
greg0iregreg0ire
committed
Remove last references to ClassMetadataInfo
That class has been deprecated for a long, long time
1 parent 7137206 commit 28012e9

19 files changed

+195
-220
lines changed

‎lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44

55
namespace Doctrine\ORM\Mapping\Builder;
66

7-
use Doctrine\Deprecations\Deprecation;
87
use Doctrine\ORM\Mapping\ClassMetadata;
9-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
10-
11-
use function get_class;
128

139
/**
1410
* Builder Object for ClassMetadata
@@ -17,29 +13,15 @@
1713
*/
1814
class ClassMetadataBuilder
1915
{
20-
/** @var ClassMetadataInfo */
16+
/** @var ClassMetadata */
2117
private $cm;
2218

23-
public function __construct(ClassMetadataInfo $cm)
19+
public function __construct(ClassMetadata $cm)
2420
{
25-
if (! $cm instanceof ClassMetadata) {
26-
Deprecation::trigger(
27-
'doctrine/orm',
28-
'https://github.com/doctrine/orm/pull/249',
29-
'Passing an instance of %s to %s is deprecated, please pass a ClassMetadata instance instead.',
30-
get_class($cm),
31-
__METHOD__,
32-
ClassMetadata::class
33-
);
34-
}
35-
3621
$this->cm = $cm;
3722
}
3823

39-
/**
40-
* @return ClassMetadataInfo
41-
*/
42-
public function getClassMetadata()
24+
public function getClassMetadata(): ClassMetadata
4325
{
4426
return $this->cm;
4527
}

‎lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ protected function validateRuntimeMetadata(ClassMetadata $class, ?ClassMetadataI
249249
}
250250
}
251251
} else {
252-
assert($parent instanceof ClassMetadataInfo); // https://github.com/doctrine/orm/issues/8746
252+
assert($parent instanceof ClassMetadata); // https://github.com/doctrine/orm/issues/8746
253253
if (
254254
! $class->reflClass->isAbstract()
255255
&& ! in_array($class->name, $class->discriminatorMap, true)
@@ -477,7 +477,7 @@ private function addInheritedSqlResultSetMappings(ClassMetadata $subClass, Class
477477
*
478478
* @throws ORMException
479479
*/
480-
private function completeIdGeneratorMapping(ClassMetadataInfo $class): void
480+
private function completeIdGeneratorMapping(ClassMetadata $class): void
481481
{
482482
$idGenType = $class->generatorType;
483483
if ($idGenType === ClassMetadata::GENERATOR_TYPE_AUTO) {
@@ -612,7 +612,7 @@ private function truncateSequenceName(string $schemaElementName): string
612612
/**
613613
* Inherits the ID generator mapping from a parent class.
614614
*/
615-
private function inheritIdGeneratorMapping(ClassMetadataInfo $class, ClassMetadataInfo $parent): void
615+
private function inheritIdGeneratorMapping(ClassMetadata $class, ClassMetadata $parent): void
616616
{
617617
if ($parent->isIdGeneratorSequence()) {
618618
$class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition);

‎lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Doctrine\Inflector\Inflector;
1515
use Doctrine\Inflector\InflectorFactory;
1616
use Doctrine\ORM\Mapping\ClassMetadata;
17-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
1817
use Doctrine\ORM\Mapping\MappingException;
1918
use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
2019
use Doctrine\Persistence\Mapping\Driver\MappingDriver;
@@ -319,7 +318,7 @@ private function reverseEngineerMappingFromDatabase(): void
319318
/**
320319
* Build indexes from a class metadata.
321320
*/
322-
private function buildIndexes(ClassMetadataInfo $metadata): void
321+
private function buildIndexes(ClassMetadata $metadata): void
323322
{
324323
$tableName = $metadata->table['name'];
325324
$indexes = $this->tables[$tableName]->getIndexes();
@@ -342,7 +341,7 @@ private function buildIndexes(ClassMetadataInfo $metadata): void
342341
/**
343342
* Build field mapping from class metadata.
344343
*/
345-
private function buildFieldMappings(ClassMetadataInfo $metadata): void
344+
private function buildFieldMappings(ClassMetadata $metadata): void
346345
{
347346
$tableName = $metadata->table['name'];
348347
$columns = $this->tables[$tableName]->getColumns();
@@ -457,7 +456,7 @@ private function buildFieldMapping(string $tableName, Column $column): array
457456
*
458457
* @return void
459458
*/
460-
private function buildToOneAssociationMappings(ClassMetadataInfo $metadata)
459+
private function buildToOneAssociationMappings(ClassMetadata $metadata)
461460
{
462461
$tableName = $metadata->table['name'];
463462
$primaryKeys = $this->getTablePrimaryKeys($this->tables[$tableName]);

‎lib/Doctrine/ORM/PersistentCollection.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,7 @@ public function getOwner()
131131
return $this->owner;
132132
}
133133

134-
/**
135-
* @return Mapping\ClassMetadata
136-
*/
137-
public function getTypeClass(): Mapping\ClassMetadataInfo
134+
public function getTypeClass(): Mapping\ClassMetadata
138135
{
139136
return $this->typeClass;
140137
}

‎lib/Doctrine/ORM/Tools/SchemaValidator.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
namespace Doctrine\ORM\Tools;
66

77
use Doctrine\DBAL\Types\Type;
8-
use Doctrine\Deprecations\Deprecation;
98
use Doctrine\ORM\EntityManagerInterface;
109
use Doctrine\ORM\Mapping\ClassMetadata;
11-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
1210

1311
use function array_diff;
1412
use function array_key_exists;
@@ -17,7 +15,6 @@
1715
use function class_exists;
1816
use function class_parents;
1917
use function count;
20-
use function get_class;
2118
use function implode;
2219
use function in_array;
2320

@@ -70,19 +67,8 @@ public function validateMapping()
7067
* @return string[]
7168
* @psalm-return list<string>
7269
*/
73-
public function validateClass(ClassMetadataInfo $class)
70+
public function validateClass(ClassMetadata $class)
7471
{
75-
if (! $class instanceof ClassMetadata) {
76-
Deprecation::trigger(
77-
'doctrine/orm',
78-
'https://github.com/doctrine/orm/pull/249',
79-
'Passing an instance of %s to %s is deprecated, please pass a ClassMetadata instance instead.',
80-
get_class($class),
81-
__METHOD__,
82-
ClassMetadata::class
83-
);
84-
}
85-
8672
$ce = [];
8773
$cmf = $this->em->getMetadataFactory();
8874

‎phpcs.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201

202202
<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
203203
<exclude-pattern>lib/Doctrine/ORM/AbstractQuery.php</exclude-pattern>
204-
<exclude-pattern>lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php</exclude-pattern>
204+
<exclude-pattern>lib/Doctrine/ORM/Mapping/ClassMetadata.php</exclude-pattern>
205205
<exclude-pattern>lib/Doctrine/ORM/NativeQuery.php</exclude-pattern>
206206
<exclude-pattern>lib/Doctrine/ORM/Query.php</exclude-pattern>
207207
<exclude-pattern>lib/Doctrine/ORM/Query/TreeWalkerAdapter.php</exclude-pattern>

‎phpstan-baseline.neon

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,20 +140,15 @@ parameters:
140140
count: 1
141141
path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
142142

143-
-
144-
message: "#^Parameter \\#2 \\$class of method Doctrine\\\\ORM\\\\Mapping\\\\QuoteStrategy\\:\\:getSequenceName\\(\\) expects Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo given\\.$#"
145-
count: 2
146-
path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
147-
148143
-
149144
message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\NamingStrategy\\:\\:joinColumnName\\(\\) invoked with 2 parameters, 1 required\\.$#"
150145
count: 2
151-
path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
146+
path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
152147

153148
-
154149
message: "#^Negated boolean expression is always false\\.$#"
155150
count: 1
156-
path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
151+
path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
157152

158153
-
159154
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapEmbedded\\(\\)\\.$#"

‎psalm-baseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
<code>$parent-&gt;idGenerator</code>
383383
</RedundantConditionGivenDocblockType>
384384
</file>
385-
<file src="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php">
385+
<file src="lib/Doctrine/ORM/Mapping/ClassMetadata.php">
386386
<DeprecatedProperty occurrences="4">
387387
<code>$this-&gt;columnNames</code>
388388
<code>$this-&gt;columnNames</code>

‎psalm.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<!-- Persistence 2 compatibility -->
7272
<file name="lib/Doctrine/ORM/EntityManager.php"/>
7373
<file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
74-
<file name="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php"/>
74+
<file name="lib/Doctrine/ORM/Mapping/ClassMetadata.php"/>
7575
</errorLevel>
7676
</MissingParamType>
7777
<RedundantCastGivenDocblockType>
@@ -105,7 +105,7 @@
105105
<!-- DBAL 3.2 forward compatibility -->
106106
<referencedClass name="Doctrine\DBAL\Platforms\PostgreSQLPlatform"/>
107107
<referencedClass name="Doctrine\DBAL\Platforms\SQLServerPlatform"/>
108-
108+
109109
<!-- Persistence 2 compatibility -->
110110
<referencedClass name="Doctrine\Persistence\ObjectManagerAware"/>
111111
</errorLevel>

‎tests/Doctrine/Performance/EntityManagerFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Doctrine\Performance;
66

77
use Doctrine\Common\EventManager;
8-
use Doctrine\DBAL\Cache\ArrayResult;
98
use Doctrine\DBAL\Cache\QueryCacheProfile;
109
use Doctrine\DBAL\Connection;
1110
use Doctrine\DBAL\Driver\PDO\SQLite\Driver;
@@ -16,6 +15,7 @@
1615
use Doctrine\ORM\ORMSetup;
1716
use Doctrine\ORM\Proxy\ProxyFactory;
1817
use Doctrine\ORM\Tools\SchemaTool;
18+
use Doctrine\Tests\Mocks\DriverResultMock;
1919

2020
use function array_map;
2121
use function realpath;
@@ -67,7 +67,7 @@ public static function makeEntityManagerWithNoResultsConnection(): EntityManager
6767
/** {@inheritdoc} */
6868
public function executeQuery(string $sql, array $params = [], $types = [], ?QueryCacheProfile $qcp = null): Result
6969
{
70-
return new Result(new ArrayResult([]), $this);
70+
return new Result(new DriverResultMock(), $this);
7171
}
7272
};
7373

0 commit comments

Comments
 (0)