Fix "Using ArrayAccess is deprecated"

Seb33300 · Seb33300 · commit a8bd62b233be · 2024-08-27T22:08:31.000+07:00
diff --git a/src/Mapping/Driver/AbstractAnnotationDriver.php b/src/Mapping/Driver/AbstractAnnotationDriver.php
@@ -11,6 +11,7 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Deprecations\Deprecation;
+use Doctrine\ORM\Mapping\FieldMapping;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 
@@ -131,7 +132,9 @@ protected function isValidField($meta, $field)
     {
         $mapping = $meta->getFieldMapping($field);
 
-        return $mapping && in_array($mapping['type'], $this->validTypes, true);
+        $type = $mapping instanceof FieldMapping ? $mapping->type : $mapping['type'];
+
+        return $mapping && in_array($type, $this->validTypes, true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`use Doctrine\Common\Annotations\Reader;`
`13`	`13`	`use Doctrine\Deprecations\Deprecation;`
	`14`	`+use Doctrine\ORM\Mapping\FieldMapping;`
`14`	`15`	`use Doctrine\Persistence\Mapping\ClassMetadata;`
`15`	`16`	`use Doctrine\Persistence\Mapping\Driver\MappingDriver;`
`16`	`17`
`@@ -131,7 +132,9 @@ protected function isValidField($meta, $field)`
`131`	`132`	`{`
`132`	`133`	`$mapping = $meta->getFieldMapping($field);`
`133`	`134`
`134`		`- return $mapping && in_array($mapping['type'], $this->validTypes, true);`
	`135`	`+ $type = $mapping instanceof FieldMapping ? $mapping->type : $mapping['type'];`
	`136`	`+`
	`137`	`+ return $mapping && in_array($type, $this->validTypes, true);`
`135`	`138`	`}`
`136`	`139`
`137`	`140`	`/**`