From 1866466f5ea9825bd26370e6c08727e3c2c2540e Mon Sep 17 00:00:00 2001 From: Alpha Date: Thu, 8 Oct 2020 15:35:14 +0200 Subject: [PATCH 1/2] handle multi-line expression in unchecked OrderBy --- src/OrderByAnalyzer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrderByAnalyzer.php b/src/OrderByAnalyzer.php index 6055baec..ea675184 100644 --- a/src/OrderByAnalyzer.php +++ b/src/OrderByAnalyzer.php @@ -131,7 +131,7 @@ private function analyzeOrderByNoCache(string $orderBy) : array */ private function trimDirection(string $sql) : string { - preg_match('/^(.*)(\s+(DESC|ASC|))*$/Ui', $sql, $matches); + preg_match('/^((.|\n)*)(\s+(DESC|ASC|))$/Ui', $sql, $matches); return $matches[1]; } From 03f0872200e50d5bf361cd1013189afdefda91be Mon Sep 17 00:00:00 2001 From: Alpha Date: Fri, 9 Oct 2020 10:45:56 +0200 Subject: [PATCH 2/2] fix pipeline faillure on break lines handling --- src/OrderByAnalyzer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrderByAnalyzer.php b/src/OrderByAnalyzer.php index ea675184..7e499c5c 100644 --- a/src/OrderByAnalyzer.php +++ b/src/OrderByAnalyzer.php @@ -131,7 +131,7 @@ private function analyzeOrderByNoCache(string $orderBy) : array */ private function trimDirection(string $sql) : string { - preg_match('/^((.|\n)*)(\s+(DESC|ASC|))$/Ui', $sql, $matches); + preg_match('/^((.|\n)*)(\s+(DESC|ASC))?$/Ui', $sql, $matches); return $matches[1]; }