Skip to content

Commit da35631

Browse files
committed
Merge branch '2.13.x' into 2.14.x
* 2.13.x: Remove fragile assertions (#10239)
2 parents 1ce806f + a5a6cc6 commit da35631

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

psalm-baseline.xml

+1-8
Original file line numberDiff line numberDiff line change
@@ -806,9 +806,6 @@
806806
<code>getColumns</code>
807807
<code>getIndexes</code>
808808
</PossiblyNullReference>
809-
<PropertyTypeCoercion occurrences="1">
810-
<code>$metadata-&gt;table</code>
811-
</PropertyTypeCoercion>
812809
</file>
813810
<file src="lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php">
814811
<PropertyNotSetInConstructor occurrences="1">
@@ -1788,9 +1785,6 @@
17881785
<ParamNameMismatch occurrences="1">
17891786
<code>$sqlWalker</code>
17901787
</ParamNameMismatch>
1791-
<PossiblyNullPropertyAssignmentValue occurrences="1">
1792-
<code>null</code>
1793-
</PossiblyNullPropertyAssignmentValue>
17941788
<UndefinedMethod occurrences="1">
17951789
<code>walkWhenClauseExpression</code>
17961790
</UndefinedMethod>
@@ -2021,10 +2015,9 @@
20212015
<code>$this-&gt;SimpleArithmeticExpression()</code>
20222016
<code>$value</code>
20232017
</PossiblyInvalidPropertyAssignmentValue>
2024-
<PossiblyNullArgument occurrences="6">
2018+
<PossiblyNullArgument occurrences="5">
20252019
<code>$aliasIdentVariable</code>
20262020
<code>$dql</code>
2027-
<code>$fromClassName</code>
20282021
<code>$resultVariable</code>
20292022
<code>$this-&gt;query-&gt;getDQL()</code>
20302023
<code>$token['value']</code>

tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
use Doctrine\ORM\Mapping\MappingException;
2020
use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty;
2121
use Doctrine\ORM\Query\QueryException;
22-
use Doctrine\Persistence\Reflection\RuntimePublicReflectionProperty;
2322
use Doctrine\Tests\OrmFunctionalTestCase;
23+
use ReflectionProperty;
2424

2525
use function class_exists;
2626
use function sprintf;
@@ -53,7 +53,7 @@ public function testMetadataHasReflectionEmbeddablesAccessible(): void
5353
);
5454
} else {
5555
self::assertInstanceOf(
56-
RuntimePublicReflectionProperty::class,
56+
ReflectionProperty::class,
5757
$classMetadata->getReflectionProperty('address')
5858
);
5959
}

0 commit comments

Comments
 (0)