diff --git a/modules/search_api_db/search_api_db.info.yml b/modules/search_api_db/search_api_db.info.yml index f23f610c..eac60c01 100644 --- a/modules/search_api_db/search_api_db.info.yml +++ b/modules/search_api_db/search_api_db.info.yml @@ -2,6 +2,6 @@ type: module name: Database Search description: Offers an implementation of the Search API that uses database tables for indexing content. package: Search -core: 8.x +core_version_requirement: ^8.8 || ^9 dependencies: - search_api:search_api diff --git a/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml b/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml index 6d1f8052..fb0c1727 100644 --- a/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml +++ b/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml @@ -2,7 +2,7 @@ type: module name: Database Search Defaults description: Enable this module for a best-practice default setup of Search API with the Database backend. After installation it is recommended to uninstall this module again for performance reasons. The provided configuration will not be removed. package: Search -core: 8.x +core_version_requirement: ^8.8 || ^9 dependencies: - drupal:comment - drupal:field diff --git a/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml b/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml index 311539a6..5266cf1b 100644 --- a/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml +++ b/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml @@ -5,5 +5,5 @@ package: Testing dependencies: - search_api:search_api_test_views - search_api_autocomplete:search_api_autocomplete -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/search_api.info.yml b/search_api.info.yml index 2cfb9aab..dc4a7c4c 100644 --- a/search_api.info.yml +++ b/search_api.info.yml @@ -2,7 +2,5 @@ type: module name: 'Search API' description: 'Provides a generic framework for modules offering search capabilities.' package: Search -core: 8.x +core_version_requirement: ^8.8 || ^9 configure: search_api.overview -dependencies: - - drupal:system (>=8.7.4) diff --git a/src/Plugin/PluginFormTrait.php b/src/Plugin/PluginFormTrait.php index 7ccd7a23..e9bb8ec8 100644 --- a/src/Plugin/PluginFormTrait.php +++ b/src/Plugin/PluginFormTrait.php @@ -3,6 +3,7 @@ namespace Drupal\search_api\Plugin; use Drupal\Component\Plugin\ConfigurableInterface; +use Drupal\Component\Plugin\ConfigurablePluginInterface as DrupalConfigurablePluginInterface; use Drupal\Core\Form\FormStateInterface; /** @@ -38,7 +39,8 @@ trait PluginFormTrait { * @see \Drupal\Core\Plugin\PluginFormInterface::submitConfigurationForm() */ public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { - if ($this instanceof ConfigurableInterface) { + // @todo Clean this up once we depend on Drupal 9.0+. + if ($this instanceof ConfigurableInterface || $this instanceof DrupalConfigurablePluginInterface) { $this->setConfiguration($form_state->getValues()); } } diff --git a/src/Plugin/views/field/SearchApiEntity.php b/src/Plugin/views/field/SearchApiEntity.php index 84b0bcee..812b2b4d 100644 --- a/src/Plugin/views/field/SearchApiEntity.php +++ b/src/Plugin/views/field/SearchApiEntity.php @@ -230,7 +230,7 @@ class SearchApiEntity extends SearchApiStandard { return; } - $entities = $this->getEntityManager() + $entities = $this->getEntityTypeManager() ->getStorage($this->getTargetEntityTypeId()) ->loadMultiple(array_keys($to_load)); $account = $this->getQuery()->getAccessAccount(); @@ -316,7 +316,7 @@ class SearchApiEntity extends SearchApiStandard { } $view_mode = $this->options['display_methods'][$bundle]['view_mode']; - $build = $this->getEntityManager() + $build = $this->getEntityFieldManager() ->getViewBuilder($entity->getEntityTypeId()) ->view($entity, $view_mode); return [ diff --git a/src/Processor/FieldsProcessorPluginBase.php b/src/Processor/FieldsProcessorPluginBase.php index eb857fab..b06c1f7c 100644 --- a/src/Processor/FieldsProcessorPluginBase.php +++ b/src/Processor/FieldsProcessorPluginBase.php @@ -7,6 +7,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\PluginFormInterface; use Drupal\Core\Render\Element; use Drupal\Core\Render\ElementInfoManagerInterface; +use Drupal\Core\Security\TrustedCallbackInterface; use Drupal\search_api\Item\FieldInterface; use Drupal\search_api\Utility\DataTypeHelperInterface; use Drupal\search_api\Plugin\PluginFormTrait; @@ -41,7 +42,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * - preprocess_index * - preprocess_query */ -abstract class FieldsProcessorPluginBase extends ProcessorPluginBase implements PluginFormInterface { +abstract class FieldsProcessorPluginBase extends ProcessorPluginBase implements PluginFormInterface, TrustedCallbackInterface { use PluginFormTrait; @@ -118,6 +119,13 @@ abstract class FieldsProcessorPluginBase extends ProcessorPluginBase implements return $this; } + /** + * {@inheritdoc} + */ + public static function trustedCallbacks() { + return ['preRenderFieldsCheckboxes']; + } + /** * {@inheritdoc} */ diff --git a/tests/search_api_test/search_api_test.info.yml b/tests/search_api_test/search_api_test.info.yml index fa1580ac..739ebf8f 100644 --- a/tests/search_api_test/search_api_test.info.yml +++ b/tests/search_api_test/search_api_test.info.yml @@ -4,5 +4,5 @@ description: 'Support module for Search API tests' package: Testing dependencies: - search_api:search_api -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_db/search_api_test_db.info.yml b/tests/search_api_test_db/search_api_test_db.info.yml index a02a1548..e9011ad5 100644 --- a/tests/search_api_test_db/search_api_test_db.info.yml +++ b/tests/search_api_test_db/search_api_test_db.info.yml @@ -5,5 +5,5 @@ package: Testing dependencies: - search_api:search_api_db - search_api:search_api_test_example_content -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_events/search_api_test_events.info.yml b/tests/search_api_test_events/search_api_test_events.info.yml index 63360461..23a23ac7 100644 --- a/tests/search_api_test_events/search_api_test_events.info.yml +++ b/tests/search_api_test_events/search_api_test_events.info.yml @@ -4,5 +4,5 @@ description: 'Support module for Search API tests, tests all events.' package: Testing dependencies: - search_api:search_api -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_example_content/search_api_test_example_content.info.yml b/tests/search_api_test_example_content/search_api_test_example_content.info.yml index a2134767..fe9696a4 100644 --- a/tests/search_api_test_example_content/search_api_test_example_content.info.yml +++ b/tests/search_api_test_example_content/search_api_test_example_content.info.yml @@ -4,5 +4,5 @@ description: 'Provides field definitions for example content.' package: Testing dependencies: - drupal:entity_test -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml b/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml index 7c3cf4dd..ccb5fa99 100644 --- a/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml +++ b/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml @@ -6,5 +6,5 @@ dependencies: - search_api:search_api - search_api:search_api_test_db - drupal:views -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_extraction/search_api_test_extraction.info.yml b/tests/search_api_test_extraction/search_api_test_extraction.info.yml index 11a7cfad..fdef214c 100644 --- a/tests/search_api_test_extraction/search_api_test_extraction.info.yml +++ b/tests/search_api_test_extraction/search_api_test_extraction.info.yml @@ -4,5 +4,5 @@ description: 'Provides a setup for testing field values extraction.' package: Testing dependencies: - drupal:entity_test -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_hooks/search_api_test_hooks.info.yml b/tests/search_api_test_hooks/search_api_test_hooks.info.yml index 55f64622..c556cd59 100644 --- a/tests/search_api_test_hooks/search_api_test_hooks.info.yml +++ b/tests/search_api_test_hooks/search_api_test_hooks.info.yml @@ -4,5 +4,5 @@ description: 'Support module for Search API tests, tests all the hooks.' package: Testing dependencies: - search_api:search_api -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml b/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml index 70ab9767..ceee2f6c 100644 --- a/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml +++ b/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml @@ -5,5 +5,5 @@ package: Testing dependencies: - search_api:search_api - search_api:search_api_test -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml b/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml index 9d255d26..844d6549 100644 --- a/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml +++ b/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml @@ -2,5 +2,5 @@ type: module name: 'Language Fallback Test' description: 'Provides a language fallback fr => es.' package: 'Search API' -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml b/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml index ffce8020..4e730600 100644 --- a/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml +++ b/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml @@ -4,5 +4,5 @@ description: 'Support module for Search API tests ("No UI" plugins)' package: Testing dependencies: - search_api:search_api -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml b/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml index 10cdc56f..ee978fb2 100644 --- a/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml +++ b/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml @@ -4,5 +4,5 @@ description: 'Test module for testing indexing of nodes in Search API.' package: 'Search API' dependencies: - search_api:search_api_db -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_tasks/search_api_test_tasks.info.yml b/tests/search_api_test_tasks/search_api_test_tasks.info.yml index ac6cc1e6..a9727b6f 100644 --- a/tests/search_api_test_tasks/search_api_test_tasks.info.yml +++ b/tests/search_api_test_tasks/search_api_test_tasks.info.yml @@ -4,5 +4,5 @@ description: 'Support module for tests of the Search API tasks system.' package: Testing dependencies: - search_api:search_api -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/search_api_test_views/search_api_test_views.info.yml b/tests/search_api_test_views/search_api_test_views.info.yml index 49e133b6..3c8c2283 100644 --- a/tests/search_api_test_views/search_api_test_views.info.yml +++ b/tests/search_api_test_views/search_api_test_views.info.yml @@ -8,5 +8,5 @@ dependencies: - drupal:node - drupal:rest - drupal:views -core: 8.x +core_version_requirement: ^8.8 || ^9 hidden: true diff --git a/tests/src/Functional/IntegrationTest.php b/tests/src/Functional/IntegrationTest.php index 46723fce..5ace1ecf 100644 --- a/tests/src/Functional/IntegrationTest.php +++ b/tests/src/Functional/IntegrationTest.php @@ -1045,7 +1045,7 @@ class IntegrationTest extends SearchApiBrowserTestBase { // Find the "Remove" link for the "body" field. $links = $this->xpath('//a[@data-drupal-selector=:id]', [':id' => 'edit-fields-body-remove']); $this->assertNotEmpty($links, 'Found "Remove" link for body field'); - $this->assertInternalType('array', $links); + $this->assertSame('array', gettype($links)); $url_target = $this->getAbsoluteUrl($links[0]->getAttribute('href')); $this->drupalGet($url_target); $this->drupalGet($this->getIndexPath('fields')); @@ -1106,7 +1106,7 @@ class IntegrationTest extends SearchApiBrowserTestBase { // Find the "Remove" link for the "title" field. $links = $this->xpath('//a[@data-drupal-selector=:id]', [':id' => 'edit-fields-title-remove']); $this->assertNotEmpty($links, 'Found "Remove" link for title field'); - $this->assertInternalType('array', $links); + $this->assertSame('array', gettype($links)); $url_target = $this->getAbsoluteUrl($links[0]->getAttribute('href')); $this->drupalGet($url_target); diff --git a/tests/src/Kernel/Processor/AddHierarchyTest.php b/tests/src/Kernel/Processor/AddHierarchyTest.php index e1adf791..86163f40 100644 --- a/tests/src/Kernel/Processor/AddHierarchyTest.php +++ b/tests/src/Kernel/Processor/AddHierarchyTest.php @@ -9,7 +9,7 @@ use Drupal\search_api\Item\Field; use Drupal\search_api\Query\Query; use Drupal\Tests\node\Traits\NodeCreationTrait; use Drupal\Tests\search_api\Kernel\ResultsTrait; -use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait; +use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait; /** * Tests the "Hierarchy" processor. diff --git a/tests/src/Kernel/Processor/RenderedItemTest.php b/tests/src/Kernel/Processor/RenderedItemTest.php index 28e6723d..3caaa92a 100644 --- a/tests/src/Kernel/Processor/RenderedItemTest.php +++ b/tests/src/Kernel/Processor/RenderedItemTest.php @@ -57,13 +57,10 @@ class RenderedItemTest extends ProcessorTestBase { public function setUp($processor = NULL) { parent::setUp('rendered_item'); - // Drupal 8.8 converted path aliases to entities, which means there will be - // one more entity type enabled by default (which we need to install for - // this test, to make sure the processor breaks for none of them). - // @todo Remove if once we depend on Drupal 8.8+. - if (\Drupal::entityTypeManager()->hasDefinition('path_alias')) { - $this->installEntitySchema('path_alias'); - } + // Enable the optional "path_alias" entity type as well to make sure the + // processor doesn't break for any of the default types. + $this->installEntitySchema('path_alias'); + // Load additional configuration and needed schemas. (The necessary schemas // for using nodes are already installed by the parent method.) $this->installConfig(['system', 'filter', 'node', 'comment', 'user']); @@ -246,7 +243,7 @@ class RenderedItemTest extends ProcessorTestBase { // object, which contains a string (not, for example, some markup object). $this->assertInstanceOf('Drupal\search_api\Plugin\search_api\data_type\value\TextValueInterface', $values[0], "$type item $entity_id rendered value is properly wrapped in a text value object."); $field_value = $values[0]->getText(); - $this->assertInternalType('string', $field_value, "$type item $entity_id rendered value is a string."); + $this->assertSame('string', gettype($field_value), "$type item $entity_id rendered value is a string."); $this->assertEquals(1, count($values), "$type item $entity_id rendered value is a single value."); switch ($datasource_id) { diff --git a/tests/src/Kernel/System/CommandHelperTest.php b/tests/src/Kernel/System/CommandHelperTest.php index 24399797..5b89173f 100644 --- a/tests/src/Kernel/System/CommandHelperTest.php +++ b/tests/src/Kernel/System/CommandHelperTest.php @@ -119,7 +119,7 @@ class CommandHelperTest extends KernelTestBase { */ public function testListCommand() { $results = $this->systemUnderTest->indexListCommand(); - $this->assertInternalType('array', $results); + $this->assertSame('array', gettype($results)); $this->assertCount(2, $results); $this->assertArrayHasKey('test_index', $results); $this->assertArrayHasKey('second_index', $results); @@ -137,7 +137,7 @@ class CommandHelperTest extends KernelTestBase { $index->delete(); $results = $this->systemUnderTest->indexListCommand(); - $this->assertInternalType('array', $results); + $this->assertSame('array', gettype($results)); $this->assertArrayNotHasKey('test_index', $results); $this->assertArrayHasKey('second_index', $results); } @@ -149,7 +149,7 @@ class CommandHelperTest extends KernelTestBase { */ public function testStatusCommand() { $results = $this->systemUnderTest->indexStatusCommand(); - $this->assertInternalType('array', $results); + $this->assertSame('array', gettype($results)); $this->assertCount(2, $results); $this->assertArrayHasKey('test_index', $results); $this->assertArrayHasKey('id', $results['test_index']); @@ -176,7 +176,7 @@ class CommandHelperTest extends KernelTestBase { $index = Index::load('second_index'); $this->assertTrue($index->status()); - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->enableIndexCommand(['foo']); } @@ -192,7 +192,7 @@ class CommandHelperTest extends KernelTestBase { $index->delete(); } - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->enableIndexCommand(['second_index']); } @@ -222,7 +222,7 @@ class CommandHelperTest extends KernelTestBase { $index = Index::load('test_index'); $this->assertFalse($index->status()); - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->disableIndexCommand(['foo']); } @@ -278,7 +278,7 @@ class CommandHelperTest extends KernelTestBase { */ public function testServerListCommand() { $result = $this->systemUnderTest->serverListCommand(); - $this->assertInternalType('array', $result); + $this->assertSame('array', gettype($result)); $this->assertCount(1, $result); $this->assertArrayHasKey('test_server', $result); $this->assertSame('test_server', $result['test_server']['id']); @@ -291,7 +291,7 @@ class CommandHelperTest extends KernelTestBase { $server->save(); $result = $this->systemUnderTest->serverListCommand(); - $this->assertInternalType('array', $result); + $this->assertSame('array', gettype($result)); $this->assertCount(1, $result); $this->assertArrayHasKey('test_server', $result); $this->assertSame('test_server', $result['test_server']['id']); @@ -299,7 +299,7 @@ class CommandHelperTest extends KernelTestBase { $this->assertSame('disabled', (string) $result['test_server']['status']); $server->delete(); - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->serverListCommand(); } @@ -318,7 +318,7 @@ class CommandHelperTest extends KernelTestBase { $server = Server::load('test_server'); $this->assertTrue($server->status()); - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->enableServerCommand('foo'); } @@ -333,7 +333,7 @@ class CommandHelperTest extends KernelTestBase { $server = Server::load('test_server'); $this->assertFalse($server->status()); - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->enableServerCommand('foo'); } @@ -376,7 +376,7 @@ class CommandHelperTest extends KernelTestBase { * @covers ::setIndexServerCommand */ public function testSetIndexServerCommandWithInvalidIndex() { - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->setIndexServerCommand('foo', 'test_server'); } @@ -386,7 +386,7 @@ class CommandHelperTest extends KernelTestBase { * @covers ::setIndexServerCommand */ public function testSetIndexServerCommandWithInvalidServer() { - $this->setExpectedException(ConsoleException::class); + $this->expectException(ConsoleException::class); $this->systemUnderTest->setIndexServerCommand('test_index', 'bar'); } diff --git a/tests/src/Kernel/System/SerializationTest.php b/tests/src/Kernel/System/SerializationTest.php index f266e560..79724b88 100644 --- a/tests/src/Kernel/System/SerializationTest.php +++ b/tests/src/Kernel/System/SerializationTest.php @@ -132,7 +132,7 @@ class SerializationTest extends KernelTestBase { $query = $this->createTestQuery(); // Since Drupal's DB layer sometimes has problems with side-effects of // __toString(), we here try to make sure this won't happen to us. - $this->assertInternalType('string', (string) $query); + $this->assertSame('string', gettype((string) $query)); $clone = clone $query;