Silence AssertionError coming from doctrine/orm DQL parser

phpstan · Jan 6, 2023 · be3808f · be3808f
1 parent 4967ebb
commit be3808f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/Rules/Doctrine/ORM/DqlRule.php b/src/Rules/Doctrine/ORM/DqlRule.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
+use AssertionError;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\QueryException;
 use PhpParser\Node;
@@ -76,6 +77,8 @@ public function processNode(Node $node, Scope $scope): array
 				$query->getAST();
 			} catch (QueryException $e) {
 				$messages[] = sprintf('DQL: %s', $e->getMessage());
+			} catch (AssertionError $e) {
+				continue;
 			}
 		}
 

diff --git a/src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php b/src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
+use AssertionError;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\QueryException;
 use PhpParser\Node;
@@ -107,6 +108,8 @@ public function processNode(Node $node, Scope $scope): array
 				}
 
 				$messages[] = $message;
+			} catch (AssertionError $e) {
+				continue;
 			}
 		}
 

diff --git a/src/Type/Doctrine/CreateQueryDynamicReturnTypeExtension.php b/src/Type/Doctrine/CreateQueryDynamicReturnTypeExtension.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Doctrine;
 
+use AssertionError;
 use Doctrine\Common\CommonException;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Exception as NewDBALException;
@@ -88,6 +89,8 @@ public function getTypeFromMethodCall(
 					QueryResultTypeWalker::walk($query, $typeBuilder, $this->descriptorRegistry);
 				} catch (ORMException | DBALException | NewDBALException | CommonException $e) {
 					return new QueryType($queryString, null, null);
+				} catch (AssertionError $e) {
+					return new QueryType($queryString, null, null);
 				}
 
 				return new QueryType($queryString, $typeBuilder->getIndexType(), $typeBuilder->getResultType());

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Doctrine\QueryBuilder;
 
+use AssertionError;
 use Doctrine\Common\CommonException;
 use Doctrine\DBAL\DBALException;
 use Doctrine\ORM\EntityManagerInterface;
@@ -163,6 +164,8 @@ private function getQueryType(string $dql): Type
 			QueryResultTypeWalker::walk($query, $typeBuilder, $this->descriptorRegistry);
 		} catch (ORMException | DBALException | CommonException $e) {
 			return new QueryType($dql, null);
+		} catch (AssertionError $e) {
+			return new QueryType($dql, null);
 		}
 
 		return new QueryType($dql, $typeBuilder->getIndexType(), $typeBuilder->getResultType());