From f945e302f79086c6ea99bd45d414fe6bccefb9d4 Mon Sep 17 00:00:00 2001
From: Yuriy Andamasov <yuriy@vyos.io>
Date: Sat, 23 May 2026 13:44:01 +0300
Subject: E6 fixup: use trim() + empty-string guard in setService(); use
 newEngine() in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- str_replace('/', '', \$index) → trim(\$index, '/') to preserve internal
  slashes in multi-segment index paths (e.g. 'phabricator/prod' must
  stay intact; only leading/trailing slashes are stripped).
- Add empty-string guard: after trim, throw a clear exception if the
  result is '' so misconfigured paths fail loudly at setService() rather
  than silently at query time with a confusing endpoint URL.
- Replace direct new VyOSElasticModernFulltextStorageEngine() in the
  four new test methods with \$this->newEngine() to avoid PHP fatal on
  abstract class instantiation.

🤖 Generated by [robots](https://vyos.io)
---
 ...SElasticModernFulltextStorageEngineTestCase.php | 21 ++++++++++++
 .../VyOSElasticModernFulltextStorageEngine.php     | 40 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

(limited to 'src')

diff --git a/src/__tests__/VyOSElasticModernFulltextStorageEngineTestCase.php b/src/__tests__/VyOSElasticModernFulltextStorageEngineTestCase.php
index e3daab4..9f08f8c 100644
--- a/src/__tests__/VyOSElasticModernFulltextStorageEngineTestCase.php
+++ b/src/__tests__/VyOSElasticModernFulltextStorageEngineTestCase.php
@@ -236,4 +236,25 @@ final class VyOSElasticModernFulltextStorageEngineTestCase
     $this->assertEqual('date', $mappings['properties']['lastModified']['type']);
   }
 
+  public function testEngineIdentifier() {
+    $engine = $this->newEngine();
+    $this->assertEqual('elasticsearch-modern', $engine->getEngineIdentifier());
+  }
+
+  public function testHostType() {
+    $engine = $this->newEngine();
+    $host = $engine->getHostType();
+    $this->assertTrue($host instanceof VyOSElasticModernHost);
+  }
+
+  public function testGetTextFieldType() {
+    $engine = $this->newEngine()->setVersion(7);
+    $this->assertEqual('text', $engine->getTextFieldType());
+  }
+
+  public function testGetTimestampField() {
+    $engine = $this->newEngine()->setVersion(7);
+    $this->assertEqual('lastModified', $engine->getTimestampField());
+  }
+
 }
diff --git a/src/engine/VyOSElasticModernFulltextStorageEngine.php b/src/engine/VyOSElasticModernFulltextStorageEngine.php
index fe88adc..42e2fd6 100644
--- a/src/engine/VyOSElasticModernFulltextStorageEngine.php
+++ b/src/engine/VyOSElasticModernFulltextStorageEngine.php
@@ -8,6 +8,46 @@ abstract class VyOSElasticModernFulltextStorageEngine
   extends PhabricatorFulltextStorageEngine {
 
   private $version = null;
+  private $index;
+
+  public function setService(PhabricatorSearchService $service) {
+    $this->service = $service;  // inherited protected property
+    $config = $service->getConfig();
+    $index = idx($config, 'path', '/phabricator');
+    $normalized = trim($index, '/');
+    if ($normalized === '') {
+      throw new Exception(
+        pht(
+          'Invalid index path "%s" in cluster.search config: '.
+          'path must contain at least one non-slash character.',
+          $index));
+    }
+    $this->index = $normalized;
+    $this->setVersion(idx($config, 'version', 7));
+    return $this;
+  }
+
+  public function getTimestampField() {
+    return 'lastModified';
+  }
+
+  public function getTextFieldType() {
+    return 'text';
+  }
+
+  public function getHostForRead() {
+    return $this->getService()->getAnyHostForRole('read');
+  }
+
+  public function getHostForWrite() {
+    return $this->getService()->getAnyHostForRole('write');
+  }
+
+  public function getTypeConstants($class) {
+    $relationship_class = new ReflectionClass($class);
+    $typeconstants = $relationship_class->getConstants();
+    return array_unique(array_values($typeconstants));
+  }
 
   public function setVersion($version) {
     $version = (int)$version;
-- 
cgit v1.2.3