Migrate ClassMetadata to PHP 8 syntax

Author: greg0ire

lib/Doctrine/ORM/Mapping/ClassMetadata.php

@@ -766,7 +766,7 @@ class ClassMetadata implements PersistenceClassMetadata, Stringable
 
     private InstantiatorInterface|null $instantiator = null;
 
-    private TypedFieldMapper $typedFieldMapper;
+    private readonly TypedFieldMapper $typedFieldMapper;
 
     /**
      * Initializes a new ClassMetadata instance that will hold the object-relational mapping
@@ -1162,7 +1162,7 @@ public function validateLifecycleCallbacks(ReflectionService $reflService): void
      *
      * Can return null when using static reflection, in violation of the LSP
      */
-    public function getReflectionClass()
+    public function getReflectionClass(): ReflectionClass|null
     {
         return $this->reflClass;
     }
@@ -1486,7 +1486,7 @@ protected function validateAndCompleteFieldMapping(array $mapping): array
      *
      * @throws MappingException If something is wrong with the mapping.
      */
-    protected function _validateAndCompleteAssociationMapping(array $mapping)
+    protected function _validateAndCompleteAssociationMapping(array $mapping): array
     {
         if (! isset($mapping['mappedBy'])) {
             $mapping['mappedBy'] = null;
@@ -1640,7 +1640,7 @@ protected function _validateAndCompleteAssociationMapping(array $mapping)
      * @throws RuntimeException
      * @throws MappingException
      */
-    protected function _validateAndCompleteOneToOneMapping(array $mapping)
+    protected function _validateAndCompleteOneToOneMapping(array $mapping): array
     {
         $mapping = $this->_validateAndCompleteAssociationMapping($mapping);
 
@@ -1745,7 +1745,7 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
      * @throws MappingException
      * @throws InvalidArgumentException
      */
-    protected function _validateAndCompleteOneToManyMapping(array $mapping)
+    protected function _validateAndCompleteOneToManyMapping(array $mapping): array
     {
         $mapping = $this->_validateAndCompleteAssociationMapping($mapping);
 
@@ -1795,7 +1795,7 @@ protected function _validateAndCompleteOneToManyMapping(array $mapping)
      *
      * @throws InvalidArgumentException
      */
-    protected function _validateAndCompleteManyToManyMapping(array $mapping)
+    protected function _validateAndCompleteManyToManyMapping(array $mapping): array
     {
         $mapping = $this->_validateAndCompleteAssociationMapping($mapping);
 
@@ -1970,7 +1970,7 @@ public function getColumnNames(array|null $fieldNames = null): array
             return array_keys($this->fieldNames);
         }
 
-        return array_values(array_map([$this, 'getColumnName'], $fieldNames));
+        return array_values(array_map($this->getColumnName(...), $fieldNames));
     }
 
     /**

phpstan-baseline.neon

@@ -145,11 +145,6 @@ parameters:
 			count: 2
 			path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
 
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
-
 		-
 			message: "#^Empty array passed to foreach\\.$#"
 			count: 1

psalm-baseline.xml

@@ -331,7 +331,7 @@
       <code>$overrideMapping</code>
     </InvalidArgument>
     <InvalidNullableReturnType>
-      <code>getReflectionClass</code>
+      <code>ReflectionClass|null</code>
       <code>string</code>
     </InvalidNullableReturnType>
     <InvalidPropertyAssignmentValue>