Introduce SearchHandlerInterface

src/Block/AdminSearchBlockService.php

@@ -16,7 +16,7 @@
 use Sonata\AdminBundle\Admin\Pool;
 use Sonata\AdminBundle\Filter\FilterInterface;
 use Sonata\AdminBundle\Search\SearchableFilterInterface;
-use Sonata\AdminBundle\Search\SearchHandler;
+use Sonata\AdminBundle\Search\SearchHandlerInterface;
 use Sonata\AdminBundle\Templating\TemplateRegistryInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
@@ -37,7 +37,7 @@ final class AdminSearchBlockService extends AbstractBlockService
     public function __construct(
         Environment $twig,
         private Pool $pool,
-        private SearchHandler $searchHandler,
+        private SearchHandlerInterface $searchHandler,
         private TemplateRegistryInterface $templateRegistry,
         private string $emptyBoxesOption,
         private string $adminRoute

src/Resources/config/core.php

@@ -33,6 +33,7 @@
 use Sonata\AdminBundle\Request\AdminFetcherInterface;
 use Sonata\AdminBundle\Route\AdminPoolLoader;
 use Sonata\AdminBundle\Search\SearchHandler;
+use Sonata\AdminBundle\Search\SearchHandlerInterface;
 use Sonata\AdminBundle\SonataConfiguration;
 use Sonata\AdminBundle\Templating\TemplateRegistry;
 use Sonata\AdminBundle\Translator\BCLabelTranslatorStrategy;
@@ -124,6 +125,8 @@
 
         ->set('sonata.admin.search.handler', SearchHandler::class)
 
+        ->alias(SearchHandlerInterface::class, 'sonata.admin.search.handler')
+
         ->set('sonata.admin.controller.crud', CRUDController::class)
             ->public()
             ->tag('container.service_subscriber')

src/Search/SearchHandler.php

@@ -15,26 +15,18 @@
 
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Datagrid\PagerInterface;
-use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
 use Sonata\AdminBundle\Filter\FilterInterface;
 
 /**
  * @author Thomas Rabaix <[email protected]>
  */
-final class SearchHandler
+final class SearchHandler implements SearchHandlerInterface
 {
     /**
      * @var array<string, bool>
      */
     private array $adminsSearchConfig = [];
 
-    /**
-     * @throws \RuntimeException
-     *
-     * @phpstan-template T of object
-     * @phpstan-param AdminInterface<T> $admin
-     * @phpstan-return PagerInterface<ProxyQueryInterface<T>>|null
-     */
     public function search(AdminInterface $admin, string $term, int $page = 0, int $offset = 20): ?PagerInterface
     {
         // If the search is disabled for the whole admin, skip any further processing.

src/Search/SearchHandlerInterface.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\AdminBundle\Search;
+
+use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Datagrid\PagerInterface;
+use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
+
+interface SearchHandlerInterface
+{
+    /**
+     * @throws \RuntimeException
+     *
+     * @phpstan-template T of object
+     * @phpstan-param AdminInterface<T> $admin
+     * @phpstan-return PagerInterface<ProxyQueryInterface<T>>|null
+     */
+    public function search(AdminInterface $admin, string $term, int $page = 0, int $offset = 20): ?PagerInterface;
+}