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

greg0ire · Nov 23, 2024 · 567d167 · 567d167
2 parents a7406cc + 50d7a0f
commit 567d167
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 61 deletions.
diff --git a/phpstan-dbal3.neon b/phpstan-dbal3.neon
diff --git a/phpstan.neon b/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
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -437,6 +437,9 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Mapping/Driver/LoadMappingFileImplementation.php">
+    <LessSpecificImplementedReturnType>
+      <code><![CDATA[array]]></code>
+    </LessSpecificImplementedReturnType>
     <MissingParamType>
       <code><![CDATA[$file]]></code>
     </MissingParamType>
@@ -495,8 +498,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 +969,6 @@
     </PossiblyNullArrayOffset>
     <PossiblyNullReference>
       <code><![CDATA[dispatch]]></code>
-      <code><![CDATA[isSubclassOf]]></code>
     </PossiblyNullReference>
   </file>
   <file src="src/QueryBuilder.php">

diff --git a/src/Mapping/ClassMetadata.php b/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);
     }

diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php
@@ -76,11 +76,7 @@ public function isTransient(string $className): bool
      */
     public function loadMetadataForClass(string $className, PersistenceClassMetadata $metadata): void
     {
-        $reflectionClass = $metadata->getReflectionClass()
-            // this happens when running attribute driver in combination with
-            // static reflection services. This is not the nicest fix
-            ?? new ReflectionClass($metadata->name);
-
+        $reflectionClass = $metadata->getReflectionClass();
         $classAttributes = $this->reader->getClassAttributes($reflectionClass);
 
         // Evaluate Entity attribute

diff --git a/src/PersistentCollection.php b/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;

diff --git a/tests/Tests/ORM/Functional/Ticket/SwitchContextWithFilter/CompanySQLFilter.php b/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 '';

diff --git a/tests/Tests/ORM/Mapping/ClassMetadataTest.php b/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')]