Catch Doctrine\Persistence\Mapping\MappingException too

Author: ondrejmirtes

src/Doctrine/Mapping/MappingDriverChain.php

@@ -30,7 +30,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata): void
 			try {
 				$driver->loadMetadataForClass($className, $metadata);
 				return;
-			} catch (MappingException | AnnotationException $e) {
+			} catch (\Doctrine\Persistence\Mapping\MappingException | MappingException | AnnotationException $e) {
 				// pass
 			}
 		}
@@ -60,7 +60,7 @@ public function isTransient($className)
 				}
 
 				return false;
-			} catch (MappingException | AnnotationException $e) {
+			} catch (\Doctrine\Persistence\Mapping\MappingException | MappingException | AnnotationException $e) {
 				// pass
 			}
 		}

src/Rules/Doctrine/ORM/EntityMappingExceptionRule.php

@@ -55,7 +55,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		try {
 			$objectManager->getClassMetadata($className);
-		} catch (MappingException | AnnotationException $e) {
+		} catch (\Doctrine\Persistence\Mapping\MappingException | MappingException | AnnotationException $e) {
 			return [$e->getMessage()];
 		}
 

src/Type/Doctrine/GetRepositoryDynamicReturnTypeExtension.php

@@ -110,7 +110,7 @@ public function getTypeFromMethodCall(
 
 		try {
 			$repositoryClass = $this->getRepositoryClass($objectName, $defaultRepositoryClass);
-		} catch (MappingException | AnnotationException $e) {
+		} catch (\Doctrine\Persistence\Mapping\MappingException | MappingException | AnnotationException $e) {
 			return $this->getDefaultReturnType($scope, $methodCall->getArgs(), $methodReflection, $defaultRepositoryClass);
 		}
 

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -111,7 +111,7 @@ public function getClassMetadata(string $className): ?ClassMetadataInfo
 			} else {
 				$metadata = $objectManager->getClassMetadata($className);
 			}
-		} catch (MappingException | AnnotationException $e) {
+		} catch (\Doctrine\Persistence\Mapping\MappingException | MappingException | AnnotationException $e) {
 			return null;
 		}