Replaced deprecated FieldNameResolver::getFieldNames method with Fiel…

…dNameResolver::getFieldTypes (#507)
ibexa · Mar 7, 2025 · 4dfa29f · 4dfa29f
1 parent a874f98
commit 4dfa29f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 46 deletions.
diff --git a/src/lib/Search/Common/FieldNameResolver.php b/src/lib/Search/Common/FieldNameResolver.php
@@ -83,35 +83,6 @@ protected function getSearchableFieldMap()
         return $this->contentTypeHandler->getSearchableFieldMap();
     }
 
-    /**
-     * For the given parameters returns a set of search backend field names to search on.
-     *
-     * The method will check for custom fields if given $criterion implements
-     * CustomFieldInterface. With optional parameters $fieldTypeIdentifier and
-     * $name specific field type and field from its Indexable implementation
-     * can be targeted.
-     *
-     * @deprecated since 6.2, use getFieldTypes instead
-     * @see \Ibexa\Contracts\Core\Repository\Values\Content\Query\CustomFieldInterface
-     * @see \Ibexa\Contracts\Core\FieldType\Indexable
-     *
-     * @param string $fieldDefinitionIdentifier
-     * @param string|null $fieldTypeIdentifier
-     * @param string|null $name
-     *
-     * @return string[]
-     */
-    public function getFieldNames(
-        CriterionInterface $criterion,
-        $fieldDefinitionIdentifier,
-        $fieldTypeIdentifier = null,
-        $name = null
-    ): array {
-        $fieldTypeNameMap = $this->getFieldTypes($criterion, $fieldDefinitionIdentifier, $fieldTypeIdentifier, $name);
-
-        return array_keys($fieldTypeNameMap);
-    }
-
     /**
      * For the given parameters returns a set of search backend field names/types to search on.
      *

diff --git a/tests/integration/Core/Repository/FieldType/SearchBaseIntegrationTest.php b/tests/integration/Core/Repository/FieldType/SearchBaseIntegrationTest.php
@@ -1184,11 +1184,13 @@ protected function modifyFieldCriterion(Query\CriterionInterface $criterion, str
 
         /** @var \Ibexa\Core\Search\Common\FieldNameResolver $fieldNameResolver */
         $fieldNameResolver = $container->get(FieldNameResolver::class);
-        $resolvedFieldNames = $fieldNameResolver->getFieldNames(
-            $criterion,
-            'data',
-            $this->getTypeName(),
-            $fieldName
+        $resolvedFieldNames = array_keys(
+            $fieldNameResolver->getFieldTypes(
+                $criterion,
+                'data',
+                $this->getTypeName(),
+                $fieldName
+            )
         );
         $resolvedFieldName = reset($resolvedFieldNames);
         $criterion = [$criterion];

diff --git a/tests/lib/Search/FieldNameResolverTest.php b/tests/lib/Search/FieldNameResolverTest.php
@@ -50,7 +50,7 @@ public function testGetFieldNamesReturnsEmptyArray()
                 )
             );
 
-        $fieldNames = $mockedFieldNameResolver->getFieldNames(
+        $fieldNames = $mockedFieldNameResolver->getFieldTypes(
             $criterionMock,
             'field_definition_identifier_1',
             'field_type_identifier_2',
@@ -120,16 +120,16 @@ public function testGetFieldNames()
             )
             ->will(self::returnValue(['index_field_name_2' => null]));
 
-        $fieldNames = $mockedFieldNameResolver->getFieldNames(
+        $fieldNames = $mockedFieldNameResolver->getFieldTypes(
             $criterionMock,
             'field_definition_identifier_1'
         );
 
         self::assertIsArray($fieldNames);
         self::assertEquals(
             [
-                'index_field_name_1',
-                'index_field_name_2',
+                'index_field_name_1' => null,
+                'index_field_name_2' => null,
             ],
             $fieldNames
         );
@@ -194,7 +194,7 @@ public function testGetFieldNamesWithNamedField()
             )
             ->will(self::returnValue(['index_field_name_2' => null]));
 
-        $fieldNames = $mockedFieldNameResolver->getFieldNames(
+        $fieldNames = $mockedFieldNameResolver->getFieldTypes(
             $criterionMock,
             'field_definition_identifier_1',
             null,
@@ -204,8 +204,8 @@ public function testGetFieldNamesWithNamedField()
         self::assertIsArray($fieldNames);
         self::assertEquals(
             [
-                'index_field_name_1',
-                'index_field_name_2',
+                'index_field_name_1' => null,
+                'index_field_name_2' => null,
             ],
             $fieldNames
         );
@@ -256,7 +256,7 @@ public function testGetFieldNamesWithTypedField()
             )
             ->will(self::returnValue(['index_field_name_1' => null]));
 
-        $fieldNames = $mockedFieldNameResolver->getFieldNames(
+        $fieldNames = $mockedFieldNameResolver->getFieldTypes(
             $criterionMock,
             'field_definition_identifier_1',
             'field_type_identifier_2',
@@ -266,7 +266,7 @@ public function testGetFieldNamesWithTypedField()
         self::assertIsArray($fieldNames);
         self::assertEquals(
             [
-                'index_field_name_1',
+                'index_field_name_1' => null,
             ],
             $fieldNames
         );
@@ -317,7 +317,7 @@ public function testGetFieldNamesWithTypedAndNamedField()
             )
             ->will(self::returnValue(['index_field_name_1' => null]));
 
-        $fieldNames = $mockedFieldNameResolver->getFieldNames(
+        $fieldNames = $mockedFieldNameResolver->getFieldTypes(
             $criterionMock,
             'field_definition_identifier_1',
             'field_type_identifier_2',
@@ -327,7 +327,7 @@ public function testGetFieldNamesWithTypedAndNamedField()
         self::assertIsArray($fieldNames);
         self::assertEquals(
             [
-                'index_field_name_1',
+                'index_field_name_1' => null,
             ],
             $fieldNames
         );
@@ -726,7 +726,7 @@ public function testGetIndexFieldNameNamedFieldThrowsRuntimeException()
         $this->expectException(\RuntimeException::class);
 
         $mockedFieldNameResolver = $this->getMockedFieldNameResolver(
-            ['getSortFieldName', 'getSearchableFieldMap', 'getFieldNames', 'getFieldTypes']
+            ['getSortFieldName', 'getSearchableFieldMap', 'getFieldTypes']
         );
         $indexFieldType = $this->getIndexFieldTypeMock();
         $searchFieldTypeMock = $this->getSearchFieldTypeMock();