Verified Commit 2704d9d4 authored by quietone's avatar quietone
Browse files

task: #3623051 Clean up references to moved Search plugins

By: dcam
By: sapnil_biswas
By: daffie
(cherry picked from commit 4bef24b8)
parent 464824e1
Loading
Loading
Loading
Loading
+0 −2
Changes for core/lib/Drupal/Core/Hook/Attribute/HookDependsOnModule.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@
 * Apart from performance benefits, when this attribute is applied to a class,
 * services provided by the module dependency can be injected as required
 * properties.
 *
 * @see \Drupal\node\Hook\NodeSearchHooks
 */
#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
class HookDependsOnModule implements HookAttributeInterface {
+2 −5
Changes for core/modules/search/modules/search_node/src/Plugin/Search/SearchNode.php: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -106,9 +106,6 @@ public static function create(ContainerInterface $container, array $configuratio
    );
  }

  /**
   * Constructs a \Drupal\node\Plugin\Search\NodeSearch object.
   */
  public function __construct(
    array $configuration,
    $plugin_id,
@@ -466,7 +463,7 @@ protected function indexNode(NodeInterface $node): array {
   * {@inheritdoc}
   */
  public function indexClear(): void {
    // All NodeSearch pages share a common search index "type" equal to
    // All SearchNode pages share a common search index "type" equal to
    // the plugin ID.
    $this->searchIndex->clear($this->getPluginId());
  }
@@ -475,7 +472,7 @@ public function indexClear(): void {
   * {@inheritdoc}
   */
  public function markForReindex(): void {
    // All NodeSearch pages share a common search index "type" equal to
    // All SearchNode pages share a common search index "type" equal to
    // the plugin ID.
    $this->searchIndex->markForReindex($this->getPluginId());
  }
+1 −1
Changes for core/modules/search/modules/search_node/tests/src/Kernel/NodeSearchTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ protected function setUp(): void {
   * The idea is not to save URL aliases or execute certain procedures
   * if the node being processed is not the default revision.
   *
   * @see \Drupal\node\Hook\NodeSearchHooks::nodeUpdate()
   * @see \Drupal\search_node\Hook\NodeSearchHooks::nodeUpdate()
   */
  public function testNodeReindexDefaultRevision(): void {
    $node = $this->createNode([
+0 −18
Changes for core/modules/search/modules/search_user/src/Plugin/Search/SearchUser.php: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -66,24 +66,6 @@ public static function create(ContainerInterface $container, array $configuratio
    );
  }

  /**
   * Creates a UserSearch object.
   *
   * @param \Drupal\Core\Database\Connection $database
   *   The database connection.
   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
   *   The entity type manager.
   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
   *   The module handler.
   * @param \Drupal\Core\Session\AccountInterface $current_user
   *   The current user.
   * @param array $configuration
   *   A configuration array containing information about the plugin instance.
   * @param string $plugin_id
   *   The plugin ID for the plugin instance.
   * @param mixed $plugin_definition
   *   The plugin implementation definition.
   */
  public function __construct(Connection $database, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, AccountInterface $current_user, array $configuration, $plugin_id, $plugin_definition) {
    $this->database = $database;
    $this->entityTypeManager = $entity_type_manager;
+1 −1
Changes for core/modules/search/search.api.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
 *   The language code for the language the text is in, if known. When this hook
 *   is invoked during search indexing, the language will most likely be known
 *   and passed in. This is left up to the search plugin;
 *   \Drupal\node\Plugin\Search\NodeSearch does pass in the node
 *   \Drupal\search_node\Plugin\Search\SearchNode does pass in the node
 *   language. However, when this hook is invoked during searching, in order to
 *   let a module apply the same preprocessing to the search keywords and
 *   indexed text so they will match, $langcode will be NULL. A hook
Loading