fix: indexer config loading for resource-layout channels

sitepark · May 15, 2024 · 7b713ed · 7b713ed
1 parent 352666c
commit 7b713ed
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 4 deletions.
diff --git a/src/Service/Indexer/IndexerConfigurationLoader.php b/src/Service/Indexer/IndexerConfigurationLoader.php
@@ -21,7 +21,7 @@ public function __construct(
      */
     public function loadAll(): array
     {
-        $dir = $this->resourceChannel->baseDir . '/indexer';
+        $dir = $this->resourceChannel->configDir . '/indexer';
         if (!is_dir($dir)) {
             return [];
         }
@@ -38,7 +38,7 @@ public function loadAll(): array
 
     private function getFile(string $source): string
     {
-        return $this->resourceChannel->baseDir .
+        return $this->resourceChannel->configDir .
             '/indexer/' . $source . '.php';
     }
 

diff --git a/test/Console/Command/DumpIndexDocumentTest.php b/test/Console/Command/DumpIndexDocumentTest.php
@@ -34,6 +34,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Console/Command/IndexerInternalResourceUpdateTest.php b/test/Console/Command/IndexerInternalResourceUpdateTest.php
@@ -37,6 +37,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Console/Command/IndexerTest.php b/test/Console/Command/IndexerTest.php
@@ -37,6 +37,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Console/Command/MoreLikeThisTest.php b/test/Console/Command/MoreLikeThisTest.php
@@ -41,6 +41,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Console/Command/SearchTest.php b/test/Console/Command/SearchTest.php
@@ -42,6 +42,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Console/Command/SuggestTest.php b/test/Console/Command/SuggestTest.php
@@ -39,6 +39,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             []
         );

diff --git a/test/Service/Indexer/IndexerConfigurationLoaderTest.php b/test/Service/Indexer/IndexerConfigurationLoaderTest.php
@@ -122,7 +122,7 @@ public function testLoadAllWithConfigReturnString(): void
     }
 
     private function createLoader(
-        string $baseDir
+        string $configDir
     ): IndexerConfigurationLoader {
         $resourceChannel = new ResourceChannel(
             '',
@@ -132,9 +132,10 @@ private function createLoader(
             false,
             '',
             '',
-            $baseDir,
             '',
             '',
+            $configDir,
+            '',
             []
         );
         return new IndexerConfigurationLoader($resourceChannel);

diff --git a/test/Service/Indexer/LocationFinderTest.php b/test/Service/Indexer/LocationFinderTest.php
@@ -32,6 +32,7 @@ protected function setUp(): void
             '',
             $resourceDir,
             '',
+            '',
             []
         );
         $this->locationFinder = new LocationFinder($resourceChannel);

diff --git a/test/Service/ResourceChannelBasedIndexNameTest.php b/test/Service/ResourceChannelBasedIndexNameTest.php
@@ -28,6 +28,7 @@ public function setUp(): void
             '',
             '',
             '',
+            '',
             'test',
             ['en_US']
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ public function setUp(): void @@
                 '',
                 '',
                 '',
+                '',
                 'test',
                 []
             );
@@ Expand Down @@