Merge pull request #11727 from doctrine/3.3.x

Merge 3.3.x up into 3.4.x

Author: greg0ire

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

@@ -887,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')]