Use new event trigger and more (#582)

* Use new event trigger and more

* Use 5.2.0 for now

Author: joomdonation

src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php

@@ -20,7 +20,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Weblinks\Administrator\Model\WeblinksModel;
 
@@ -136,7 +135,7 @@ protected function addToolbar()
         $user  = $this->getCurrentUser();
 
         // Get the toolbar object instance
-        $toolbar = Toolbar::getInstance('toolbar');
+        $toolbar = $this->getDocument()->getToolbar();
 
         ToolbarHelper::title(Text::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks');
 

src/administrator/manifests/packages/weblinks/script.php

@@ -38,7 +38,7 @@ class Pkg_WeblinksInstallerScript extends InstallerScript
      */
     public function __construct()
     {
-        $this->minimumJoomla = '4.4.0';
+        $this->minimumJoomla = '5.2.0';
         $this->minimumPhp    = JOOMLA_MINIMUM_PHP;
     }
 }

src/components/com_weblinks/src/View/Weblink/HtmlView.php

@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Weblinks\Site\View\Weblink;
 
+use Joomla\CMS\Event\Content;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -75,23 +76,45 @@ public function display($tpl = null)
             $this->handleModelErrors($errors);
         }
 
-        PluginHelper::importPlugin('content');
-
         // Create a shortcut for $item.
         $item         = $this->item;
         $item->slug   = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
         $temp         = $item->params;
         $item->params = clone $app->getParams();
         $item->params->merge($temp);
         $offset = $this->state->get('list.offset');
-        $app->triggerEvent('onContentPrepare', ['com_weblinks.weblink', &$item, &$item->params, $offset]);
-        $item->event                       = new \stdClass();
-        $results                           = $app->triggerEvent('onContentAfterTitle', ['com_weblinks.weblink', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayTitle    = trim(implode("\n", $results));
-        $results                           = $app->triggerEvent('onContentBeforeDisplay', ['com_weblinks.weblink', &$item, &$item->params, $offset]);
-        $item->event->beforeDisplayContent = trim(implode("\n", $results));
-        $results                           = $app->triggerEvent('onContentAfterDisplay', ['com_weblinks.weblink', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayContent  = trim(implode("\n", $results));
+
+        $dispatcher = $this->getDispatcher();
+
+        // Process the content plugins.
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
+
+        $contentEventArguments = [
+            'context' => 'com_weblinks.weblink',
+            'subject' => $item,
+            'params'  => $item->params,
+            'page'    => $offset,
+        ];
+
+        $dispatcher->dispatch(
+            'onContentPrepare',
+            new Content\ContentPrepareEvent('onContentPrepare', $contentEventArguments)
+        );
+
+        // Extra content from events
+        $item->event   = new \stdClass();
+        $contentEvents = [
+            'afterDisplayTitle'    => new Content\AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+            'beforeDisplayContent' => new Content\BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+            'afterDisplayContent'  => new Content\AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+        ];
+
+        foreach ($contentEvents as $resultKey => $event) {
+            $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
+
+            $item->event->{$resultKey} = $results ? trim(implode("\n", $results)) : '';
+        }
+
         parent::display($tpl);
     }