Fixed searching words with underscore.

parpalak · Apr 5, 2024 · d0f5a50 · d0f5a50
1 parent 19976f4
commit d0f5a50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/S2/Rose/Entity/Query.php b/src/S2/Rose/Entity/Query.php
@@ -117,7 +117,7 @@ public function valueToArray()
         $content = str_replace(['«', '»', '“', '”', '‘', '’'], '"', $content);
         $content = str_replace(['---', '--', '–', '−'], '—', $content);
         $content = preg_replace('#,\\s+,#u', ',,', $content);
-        $content = preg_replace('#[^\\-\\p{L}0-9\\^\\.,\\(\\)";?!…:—]+#iu', ' ', $content);
+        $content = preg_replace('#[^\\-\\p{L}0-9^_.,()";?!…:—]+#iu', ' ', $content);
         $content = preg_replace('#\\n+#', ' ', $content);
         $content = preg_replace('#\\s+#u', ' ', $content);
         $content = mb_strtolower($content);

diff --git a/tests/unit/Rose/IntegrationTest.php b/tests/unit/Rose/IntegrationTest.php
@@ -265,6 +265,11 @@ public function testFeatures(
         $this->assertEquals('25', $img1->getHeight());
         $this->assertEquals('Alternative text', $img1->getAlt());
 
+        // Query 12
+        $resultSet12 = $finder->find(new Query('long_word_with_underscores'));
+        $this->assertCount(1, $resultSet12->getItems());
+        $this->assertEquals('Some sentence with <b>long_word_with_underscores</b>.', $resultSet12->getItems()[0]->getSnippet());
+
         // Empty result
         $this->assertCount(0, $finder->find(new Query('..'))->getItems());
         $this->assertCount(0, $finder->find(new Query('...'))->getItems());
@@ -424,7 +429,7 @@ public function indexableProvider()
             ,
             (new Indexable('id_1', 'Another instance', 'The same id but another instance. Word "content" is present here. Twice: content. Delimiters must be $...$ or  \[...\]', 20))
             ,
-            (new Indexable('id_4', 'Another instance', 'Nothing is here but images: <img src="1.jpg" width="10" height="15"> <img src="2%203.jpg" width="20" height="25" alt="Alternative text" />', 20))
+            (new Indexable('id_4', 'Another instance', 'Some sentence with long_word_with_underscores. Nothing is here but images: <img src="1.jpg" width="10" height="15"> <img src="2%203.jpg" width="20" height="25" alt="Alternative text" />', 20))
             ,
         ];