Merge remote-tracking branch 'origin/3.4.x' into 4.0.x

phpstan-baseline.neon

@@ -125,6 +125,11 @@ parameters:
 			count: 1
 			path: src/Mapping/ClassMetadataFactory.php
 
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/Mapping/Driver/AttributeDriver.php
+
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\ToOneOwningSideMapping\\:\\:fromMappingArray\\(\\) should return static\\(Doctrine\\\\ORM\\\\Mapping\\\\ToOneOwningSideMapping\\) but returns Doctrine\\\\ORM\\\\Mapping\\\\ManyToOneAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToOneOwningSideMapping\\.$#"
 			count: 1

phpstan.neon

@@ -16,8 +16,3 @@ parameters:
             message: '#Negated boolean expression is always false\.#'
             paths:
                 - src/Mapping/Driver/AttributeDriver.php
-
-        # Compatibility with Persistence 3
-        -
-            message: '#Expression on left side of \?\? is not nullable.#'
-            path: src/Mapping/Driver/AttributeDriver.php

psalm-baseline.xml

@@ -429,14 +429,23 @@
      *                   columnDefinition?: string
      *               }]]></code>
     </MoreSpecificReturnType>
+    <RedundantCondition>
+      <code><![CDATA[$metadata->getReflectionClass()]]></code>
+    </RedundantCondition>
     <RedundantConditionGivenDocblockType>
       <code><![CDATA[assert($cacheAttribute instanceof Mapping\Cache)]]></code>
       <code><![CDATA[assert($method instanceof ReflectionMethod)]]></code>
       <code><![CDATA[assert($method instanceof ReflectionMethod)]]></code>
       <code><![CDATA[assert($property instanceof ReflectionProperty)]]></code>
     </RedundantConditionGivenDocblockType>
+    <TypeDoesNotContainNull>
+      <code><![CDATA[new ReflectionClass($metadata->name)]]></code>
+    </TypeDoesNotContainNull>
   </file>
   <file src="src/Mapping/Driver/LoadMappingFileImplementation.php">
+    <LessSpecificImplementedReturnType>
+      <code><![CDATA[array]]></code>
+    </LessSpecificImplementedReturnType>
     <MissingParamType>
       <code><![CDATA[$file]]></code>
     </MissingParamType>
@@ -495,8 +504,11 @@
   </file>
   <file src="src/Mapping/GetReflectionClassImplementation.php">
     <ImplementedReturnTypeMismatch>
-      <code><![CDATA[ReflectionClass|null]]></code>
+      <code><![CDATA[ReflectionClass]]></code>
     </ImplementedReturnTypeMismatch>
+    <InvalidNullableReturnType>
+      <code><![CDATA[ReflectionClass]]></code>
+    </InvalidNullableReturnType>
   </file>
   <file src="src/Mapping/ManyToManyInverseSideMapping.php">
     <PropertyNotSetInConstructor>
@@ -963,7 +975,6 @@
     </PossiblyNullArrayOffset>
     <PossiblyNullReference>
       <code><![CDATA[dispatch]]></code>
-      <code><![CDATA[isSubclassOf]]></code>
     </PossiblyNullReference>
   </file>
   <file src="src/QueryBuilder.php">

src/Mapping/ClassMetadata.php

@@ -874,10 +874,7 @@ public function initializeReflection(ReflectionService $reflService): void
     {
         $this->reflClass = $reflService->getClass($this->name);
         $this->namespace = $reflService->getClassNamespace($this->name);
-
-        if ($this->reflClass) {
-            $this->name = $this->rootEntityName = $this->reflClass->name;
-        }
+        $this->name      = $this->rootEntityName = $this->reflClass->name;
 
         $this->table['name'] = $this->namingStrategy->classToTableName($this->name);
     }

src/PersistentCollection.php

@@ -509,7 +509,7 @@ public function __wakeup(): void
      */
     public function first()
     {
-        if (! $this->initialized && ! $this->isDirty && $this->getMapping()['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
+        if (! $this->initialized && ! $this->isDirty && $this->getMapping()->fetch === ClassMetadata::FETCH_EXTRA_LAZY) {
             $persister = $this->getUnitOfWork()->getCollectionPersister($this->getMapping());
 
             return array_values($persister->slice($this, 0, 1))[0] ?? false;

tests/Tests/ORM/Functional/Ticket/SwitchContextWithFilter/CompanySQLFilter.php

@@ -14,11 +14,11 @@ class CompanySQLFilter extends SQLFilter
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias): string
     {
         if ($targetEntity->getName() === User::class) {
-            return sprintf('%s.%s = %s', $targetTableAlias, $targetEntity->fieldMappings['company']['fieldName'], $this->getParameter('company'));
+            return sprintf('%s.%s = %s', $targetTableAlias, $targetEntity->fieldMappings['company']->fieldName, $this->getParameter('company'));
         }
 
         if ($targetEntity->getName() === Order::class) {
-            return sprintf('%s.%s = %s', $targetTableAlias, $targetEntity->fieldMappings['company']['fieldName'], $this->getParameter('company'));
+            return sprintf('%s.%s = %s', $targetTableAlias, $targetEntity->fieldMappings['company']->fieldName, $this->getParameter('company'));
         }
 
         return '';

tests/Tests/ORM/Mapping/ClassMetadataTest.php

@@ -6,6 +6,7 @@
 
 use ArrayObject;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ChainTypedFieldMapper;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -70,6 +71,8 @@
 
 class ClassMetadataTest extends OrmTestCase
 {
+    use VerifyDeprecations;
+
     public function testClassMetadataInstanceSerialization(): void
     {
         $cm = new ClassMetadata(CmsUser::class);
@@ -884,7 +887,7 @@ public function testAssociationOverrideCanOverrideCascade(): void
         $cm->setAssociationOverride('parentDirectory', ['cascade' => ['all']]);
 
         $mapping = $cm->getAssociationMapping('parentDirectory');
-        self::assertSame(['remove', 'persist', 'refresh', 'detach'], $mapping['cascade']);
+        self::assertSame(['remove', 'persist', 'refresh', 'detach'], $mapping->cascade);
     }
 
     #[TestGroup('DDC-1955')]