Merge branch 'release-15.35.3'

oat-sa · Jan 16, 2024 · 50b0b1b · 50b0b1b
2 parents 626038c + 49282ba
commit 50b0b1b
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 0 deletions.
diff --git a/core/kernel/persistence/starsql/search/Command/RegexCommand.php b/core/kernel/persistence/starsql/search/Command/RegexCommand.php
@@ -73,6 +73,17 @@ public function escapeString($values): string
             trim($values, '%'),
             [
                 '.' => '\\.',
+                '+' => '\\+',
+                '?' => '\\?',
+                '[' => '\\[',
+                ']' => '\\]',
+                '(' => '\\(',
+                ')' => '\\)',
+                '{' => '\\{',
+                '}' => '\\}',
+                '^' => '\\^',
+                '$' => '\\$',
+                '|' => '\\|',
                 '\\_' => '_',
                 '\\%' => '%',
                 '*' => '.*',

diff --git a/test/integration/model/persistence/starsql/ClassTest.php b/test/integration/model/persistence/starsql/ClassTest.php
@@ -345,6 +345,54 @@ public function dataProviderSearchInstancesWithRegularExpressions(): iterable
             'incorrectLabel' => 'test case instance with special ymbols',
             'searchCriterion' => 'w\_th \%pecial \%ymbols',
         ];
+
+        yield 'regexp plus symbols' => [
+            'correctLabel' => 'application/qti+xml',
+            'incorrectLabel' => 'application/qtiiiiixml',
+            'searchCriterion' => 'application/qti+xml',
+        ];
+
+        yield 'regexp question mark symbols' => [
+            'correctLabel' => 'test case instance with question?',
+            'incorrectLabel' => 'test case instance with question!',
+            'searchCriterion' => '*question?*',
+        ];
+
+        yield 'regexp square brackets symbols' => [
+            'correctLabel' => 'test case instance with [abc]',
+            'incorrectLabel' => 'test case instance with c',
+            'searchCriterion' => '*with [abc]*',
+        ];
+
+        yield 'regexp round brackets symbols' => [
+            'correctLabel' => 'test case instance with (brackets)',
+            'incorrectLabel' => 'test case instance with brackets',
+            'searchCriterion' => '*with (brackets)*',
+        ];
+
+        yield 'regexp curly brackets symbols' => [
+            'correctLabel' => 'test case instance with{1,2}',
+            'incorrectLabel' => 'test case instance withh',
+            'searchCriterion' => '*with{1,2}*',
+        ];
+
+        yield 'regexp dollar symbols' => [
+            'correctLabel' => 'test case instance with$',
+            'incorrectLabel' => 'test case instance with',
+            'searchCriterion' => '*with$',
+        ];
+
+        yield 'regexp caret symbols' => [
+            'correctLabel' => '^test case instance with',
+            'incorrectLabel' => 'test case instance with',
+            'searchCriterion' => '^test*',
+        ];
+
+        yield 'regexp pipe symbols' => [
+            'correctLabel' => 'test case instance with|pipe',
+            'incorrectLabel' => 'test case instance with',
+            'searchCriterion' => '*with|pipe*',
+        ];
     }
 
     /**