Update to Doctrine ORM 3.2 #10257

PowerKiKi · PowerKiKi · commit 37d9cc09c9c3 · 2024-07-11T16:09:29.000+09:00
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
     },
     "require": {
         "php": "^8.2",
-        "doctrine/orm": "^2.15",
+        "doctrine/orm": "^3.2",
         "psr/container": "^1.1 || ^2.0",
         "webonyx/graphql-php": "^15.7"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,5 +1,25 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Cannot call method getMethods\\(\\) on ReflectionClass\\<object\\>\\|null\\.$#"
+			count: 1
+			path: src/Factory/AbstractFieldsConfigurationFactory.php
+
+		-
+			message: "#^Parameter \\#1 \\$property of method GraphQL\\\\Doctrine\\\\Factory\\\\AbstractFactory\\:\\:isPropertyExcluded\\(\\) expects ReflectionProperty, ReflectionProperty\\|null given\\.$#"
+			count: 1
+			path: src/Factory/Type/FilterGroupConditionTypeFactory.php
+
+		-
+			message: "#^Parameter \\#1 \\$property of method GraphQL\\\\Doctrine\\\\Factory\\\\Type\\\\FilterGroupConditionTypeFactory\\:\\:getLeafType\\(\\) expects ReflectionProperty, ReflectionProperty\\|null given\\.$#"
+			count: 1
+			path: src/Factory/Type/FilterGroupConditionTypeFactory.php
+
+		-
+			message: "#^Parameter \\#1 \\$property of method GraphQL\\\\Doctrine\\\\Factory\\\\AbstractFactory\\:\\:isPropertyExcluded\\(\\) expects ReflectionProperty, ReflectionProperty\\|null given\\.$#"
+			count: 1
+			path: src/Factory/Type/SortingTypeFactory.php
+
 		-
 			message: "#^Method GraphQL\\\\Doctrine\\\\Types\\:\\:getOperator\\(\\) should return GraphQL\\\\Doctrine\\\\Definition\\\\Operator\\\\AbstractOperator but returns GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
 			count: 1
diff --git a/src/Definition/Operator/HaveOperatorType.php b/src/Definition/Operator/HaveOperatorType.php
@@ -5,7 +5,7 @@
 namespace GraphQL\Doctrine\Definition\Operator;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\OneToManyAssociationMapping;
 use Doctrine\ORM\QueryBuilder;
 use GraphQL\Doctrine\Factory\UniqueNameFactory;
 use GraphQL\Type\Definition\LeafType;
@@ -48,12 +48,12 @@ protected function getCollectionValuedDqlCondition(UniqueNameFactory $uniqueName
         // use `=`, and not `IN()`). So we simulate an approximation of MEMBER OF that support multiple values. But it
         // does **not** support composite identifiers. And that is fine because it is an official limitation of this
         // library anyway.
-        if ($association['type'] === ClassMetadataInfo::ONE_TO_MANY) {
+        if ($association instanceof OneToManyAssociationMapping) {
             $id = $metadata->identifier[0];
 
-            $otherClassName = $association['targetEntity'];
+            $otherClassName = $association->targetEntity;
             $otherAlias = $uniqueNameFactory->createAliasName($otherClassName);
-            $otherField = $association['mappedBy'];
+            $otherField = $association->mappedBy;
             $otherMetadata = $queryBuilder->getEntityManager()->getClassMetadata($otherClassName);
             $otherId = $otherMetadata->identifier[0];
 
diff --git a/src/Factory/AbstractFieldsConfigurationFactory.php b/src/Factory/AbstractFieldsConfigurationFactory.php
@@ -147,8 +147,8 @@ private function findIdentityField(string $className): void
     {
         $this->metadata = $this->entityManager->getClassMetadata($className);
         foreach ($this->metadata->fieldMappings as $meta) {
-            if ($meta['id'] ?? false) {
-                $this->identityField = $meta['fieldName'];
+            if ($meta->id ?? false) {
+                $this->identityField = $meta->fieldName;
             }
         }
     }
@@ -184,7 +184,7 @@ final protected function isIdentityField(string $fieldName): bool
      */
     private function getTargetEntity(string $fieldName): ?string
     {
-        return $this->metadata->associationMappings[$fieldName]['targetEntity'] ?? null;
+        return $this->metadata->associationMappings[$fieldName]->targetEntity ?? null;
     }
 
     /**
diff --git a/src/Factory/FilteredQueryBuilderFactory.php b/src/Factory/FilteredQueryBuilderFactory.php
@@ -127,7 +127,7 @@ private function applyJoins(ClassMetadata $metadata, array $joins, string $alias
             $joinedAlias = $this->createJoin($alias, $field, $join['type']);
 
             if (isset($join['joins']) || isset($join['conditions'])) {
-                $targetClassName = $metadata->getAssociationMapping($field)['targetEntity'];
+                $targetClassName = $metadata->getAssociationMapping($field)->targetEntity;
                 $targetMetadata = $this->entityManager->getClassMetadata($targetClassName);
                 $type = $this->types->getFilterGroupCondition($targetClassName);
                 $this->applyJoinsAndFilters($targetMetadata, $joinedAlias, $type, $join['joins'] ?? [], $join['conditions'] ?? []);
diff --git a/src/Factory/Type/FilterGroupConditionTypeFactory.php b/src/Factory/Type/FilterGroupConditionTypeFactory.php
@@ -4,6 +4,7 @@
 
 namespace GraphQL\Doctrine\Factory\Type;
 
+use Doctrine\ORM\Mapping\FieldMapping;
 use GraphQL\Doctrine\Attribute\Filter;
 use GraphQL\Doctrine\Attribute\FilterGroupCondition;
 use GraphQL\Doctrine\Definition\Operator\AbstractOperator;
@@ -60,7 +61,7 @@ public function create(string $className, string $typeName): InputObjectType
 
                 // Get all scalar fields
                 foreach ($metadata->fieldMappings as $mapping) {
-                    $fieldName = $mapping['fieldName'];
+                    $fieldName = $mapping->fieldName;
                     $property = $metadata->getReflectionProperty($fieldName);
 
                     // Skip exclusion specified by user
@@ -76,7 +77,7 @@ public function create(string $className, string $typeName): InputObjectType
 
                 // Get all collection fields
                 foreach ($metadata->associationMappings as $mapping) {
-                    $fieldName = $mapping['fieldName'];
+                    $fieldName = $mapping->fieldName;
                     $operators = $this->getOperators($fieldName, Type::id(), true, $metadata->isCollectionValuedAssociation($fieldName));
 
                     $filters[] = $this->getFieldConfiguration($typeName, $fieldName, $operators);
@@ -105,9 +106,9 @@ public function create(string $className, string $typeName): InputObjectType
     /**
      * Read the type of the filterGroupCondition, either from Doctrine mapping type, or the override via attribute.
      */
-    private function getLeafType(ReflectionProperty $property, array $mapping): LeafType
+    private function getLeafType(ReflectionProperty $property, FieldMapping $mapping): LeafType
     {
-        if ($mapping['id'] ?? false) {
+        if ($mapping->id ?? false) {
             return Type::id();
         }
 
@@ -127,7 +128,7 @@ private function getLeafType(ReflectionProperty $property, array $mapping): Leaf
         }
 
         /** @var LeafType $leafType */
-        $leafType = $this->types->get($mapping['type']);
+        $leafType = $this->types->get($mapping->type);
 
         return $leafType;
     }
diff --git a/src/Factory/Type/FilterGroupJoinTypeFactory.php b/src/Factory/Type/FilterGroupJoinTypeFactory.php
@@ -60,8 +60,8 @@ private function getJoinsFields(string $className): array
         $associations = $this->entityManager->getClassMetadata($className)->associationMappings;
         foreach ($associations as $association) {
             $field = [
-                'name' => $association['fieldName'],
-                'type' => $this->types->getJoinOn($association['targetEntity']),
+                'name' => $association->fieldName,
+                'type' => $this->types->getJoinOn($association->targetEntity),
             ];
 
             $fields[] = $field;
diff --git a/tests/Blog/Filtering/SearchOperatorType.php b/tests/Blog/Filtering/SearchOperatorType.php
@@ -65,8 +65,8 @@ private function getSearchableFields(ClassMetadata $metadata, string $alias): ar
         $fields = [];
         $textType = ['string', 'text'];
         foreach ($metadata->fieldMappings as $g) {
-            if (in_array($g['type'], $textType, true)) {
-                $fields[] = $alias . '.' . $g['fieldName'];
+            if (in_array($g->type, $textType, true)) {
+                $fields[] = $alias . '.' . $g->fieldName;
             }
         }
 
diff --git a/tests/EntityManagerTrait.php b/tests/EntityManagerTrait.php
@@ -18,7 +18,10 @@ trait EntityManagerTrait
     private function setUpEntityManager(): void
     {
         $config = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/Blog/Model'], true);
-        $connection = DriverManager::getConnection(['url' => 'sqlite:///:memory:']);
+        $connection = DriverManager::getConnection([
+            'driver' => 'sqlite3',
+            'memory' => true,
+        ]);
 
         $this->entityManager = new EntityManager($connection, $config);
     }
diff --git a/tests/data/PostFilter.graphqls b/tests/data/PostFilter.graphqls
diff --git a/tests/data/PostSorting.graphqls b/tests/data/PostSorting.graphqls
diff --git a/tests/data/UserSorting.graphqls b/tests/data/UserSorting.graphqls

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ private function findIdentityField(string $className): void`
`147`	`147`	`{`
`148`	`148`	`$this->metadata = $this->entityManager->getClassMetadata($className);`
`149`	`149`	`foreach ($this->metadata->fieldMappings as $meta) {`
`150`		`- if ($meta['id'] ?? false) {`
`151`		`- $this->identityField = $meta['fieldName'];`
	`150`	`+ if ($meta->id ?? false) {`
	`151`	`+ $this->identityField = $meta->fieldName;`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
`@@ -184,7 +184,7 @@ final protected function isIdentityField(string $fieldName): bool`
`184`	`184`	`*/`
`185`	`185`	`private function getTargetEntity(string $fieldName): ?string`
`186`	`186`	`{`
`187`		`- return $this->metadata->associationMappings[$fieldName]['targetEntity'] ?? null;`
	`187`	`+ return $this->metadata->associationMappings[$fieldName]->targetEntity ?? null;`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ private function getSearchableFields(ClassMetadata $metadata, string $alias): ar`
`65`	`65`	`$fields = [];`
`66`	`66`	`$textType = ['string', 'text'];`
`67`	`67`	`foreach ($metadata->fieldMappings as $g) {`
`68`		`- if (in_array($g['type'], $textType, true)) {`
`69`		`- $fields[] = $alias . '.' . $g['fieldName'];`
	`68`	`+ if (in_array($g->type, $textType, true)) {`
	`69`	`+ $fields[] = $alias . '.' . $g->fieldName;`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ trait EntityManagerTrait`
`18`	`18`	`private function setUpEntityManager(): void`
`19`	`19`	`{`
`20`	`20`	`$config = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/Blog/Model'], true);`
`21`		`- $connection = DriverManager::getConnection(['url' => 'sqlite:///:memory:']);`
	`21`	`+ $connection = DriverManager::getConnection([`
	`22`	`+ 'driver' => 'sqlite3',`
	`23`	`+ 'memory' => true,`
	`24`	`+ ]);`
`22`	`25`
`23`	`26`	`$this->entityManager = new EntityManager($connection, $config);`
`24`	`27`	`}`