system highlight

plugins/system/accessibility/src/Extension/Accessibility.php

@@ -42,6 +42,8 @@ public static function getSubscribedEvents(): array
     /**
      * Add the javascript for the accessibility menu
      *
+     * @param  BeforeCompileHeadEvent $event  The event object
+     *
      * @return  void
      *
      * @since   4.0.0

plugins/system/fields/src/Extension/Fields.php

@@ -53,7 +53,6 @@ public static function getSubscribedEvents(): array
             'onContentAfterTitle'           => 'onContentAfterTitle',
             'onContentBeforeDisplay'        => 'onContentBeforeDisplay',
             'onContentAfterDisplay'         => 'onContentAfterDisplay',
-
         ];
     }
 

plugins/system/highlight/services/provider.php

@@ -37,7 +37,6 @@ function (Container $container) {
                     $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('system', 'highlight')
                 );
-                $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
             }

plugins/system/highlight/src/Extension/Highlight.php

@@ -11,9 +11,11 @@
 namespace Joomla\Plugin\System\Highlight\Extension;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Application\BeforeCompileHeadEvent;
+use Joomla\CMS\Event\Finder\ResultEvent;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Component\Finder\Administrator\Indexer\Result;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,28 +26,45 @@
  *
  * @since  2.5
  */
-final class Highlight extends CMSPlugin
+final class Highlight extends CMSPlugin implements SubscriberInterface
 {
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onAfterDispatch' => 'onAfterDispatch',
+            'onFinderResult'  => 'onFinderResult',
+        ];
+    }
+
     /**
      * Method to catch the onAfterDispatch event.
      *
      * This is where we setup the click-through content highlighting for.
      * The highlighting is done with JavaScript so we just
      * need to check a few parameters and the JHtml behavior will do the rest.
      *
+     * @param  BeforeCompileHeadEvent $event  The event object
+     *
      * @return  void
      *
      * @since   2.5
      */
-    public function onAfterDispatch()
+    public function onAfterDispatch(BeforeCompileHeadEvent $event): void
     {
         // Check that we are in the site application.
-        if (!$this->getApplication()->isClient('site')) {
+        if (!$event->getApplication()->isClient('site')) {
             return;
         }
 
         // Set the variables.
-        $input     = $this->getApplication()->getInput();
+        $input     = $event->getApplication();
         $extension = $input->get('option', '', 'cmd');
 
         // Check if the highlighter is enabled.
@@ -77,7 +96,7 @@ public function onAfterDispatch()
         }
 
         /** @var \Joomla\CMS\Document\HtmlDocument $doc */
-        $doc = $this->getApplication()->getDocument();
+        $doc = $event->getDocument();
 
         // Activate the highlighter.
         if (!empty($cleanTerms)) {
@@ -100,21 +119,23 @@ public function onAfterDispatch()
     /**
      * Method to catch the onFinderResult event.
      *
-     * @param   Result  $item   The search result
-     * @param   object  $query  The search query of this result
+     * @param  ResultEvent $event  The event object
      *
      * @return  void
      *
      * @since   4.0.0
      */
-    public function onFinderResult($item, $query)
+    public function onFinderResult(ResultEvent $event): void
     {
         static $params;
 
         if (\is_null($params)) {
             $params = ComponentHelper::getParams('com_finder');
         }
 
+        $item  = $event->getItem();
+        $query = $event->getQuery();
+
         // Get the route with highlighting information.
         if (
             !empty($query->highlight)