Merge branch '2.13.x' into 2.14.x

* 2.13.x: Remove fragile assertions (doctrine#10239)
derrabus · Nov 20, 2022 · da35631 · da35631
2 parents 1ce806f + a5a6cc6
commit da35631
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -806,9 +806,6 @@
       <code>getColumns</code>
       <code>getIndexes</code>
     </PossiblyNullReference>
-    <PropertyTypeCoercion occurrences="1">
-      <code>$metadata-&gt;table</code>
-    </PropertyTypeCoercion>
   </file>
   <file src="lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php">
     <PropertyNotSetInConstructor occurrences="1">
@@ -1788,9 +1785,6 @@
     <ParamNameMismatch occurrences="1">
       <code>$sqlWalker</code>
     </ParamNameMismatch>
-    <PossiblyNullPropertyAssignmentValue occurrences="1">
-      <code>null</code>
-    </PossiblyNullPropertyAssignmentValue>
     <UndefinedMethod occurrences="1">
       <code>walkWhenClauseExpression</code>
     </UndefinedMethod>
@@ -2021,10 +2015,9 @@
       <code>$this-&gt;SimpleArithmeticExpression()</code>
       <code>$value</code>
     </PossiblyInvalidPropertyAssignmentValue>
-    <PossiblyNullArgument occurrences="6">
+    <PossiblyNullArgument occurrences="5">
       <code>$aliasIdentVariable</code>
       <code>$dql</code>
-      <code>$fromClassName</code>
       <code>$resultVariable</code>
       <code>$this-&gt;query-&gt;getDQL()</code>
       <code>$token['value']</code>

diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
@@ -19,8 +19,8 @@
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty;
 use Doctrine\ORM\Query\QueryException;
-use Doctrine\Persistence\Reflection\RuntimePublicReflectionProperty;
 use Doctrine\Tests\OrmFunctionalTestCase;
+use ReflectionProperty;
 
 use function class_exists;
 use function sprintf;
@@ -53,7 +53,7 @@ public function testMetadataHasReflectionEmbeddablesAccessible(): void
             );
         } else {
             self::assertInstanceOf(
-                RuntimePublicReflectionProperty::class,
+                ReflectionProperty::class,
                 $classMetadata->getReflectionProperty('address')
             );
         }