Improve triggerEvent function

templaza · Jun 13, 2024 · 1548a15 · 1548a15
1 parent 834f724
commit 1548a15
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/framework/library/astroid/Element/Layout.php b/framework/library/astroid/Element/Layout.php
@@ -54,18 +54,15 @@ public static function getSublayouts($template = '')
         foreach ($files as $file) {
             $json = file_get_contents($file);
             $data = \json_decode($json, true);
-            $layout = ['title' => pathinfo($file)['filename'], 'desc' => '', 'thumbnail' => '', 'data' => [], 'name' => pathinfo($file)['filename']];
+            $layout = ['title' => pathinfo($file)['filename'], 'desc' => '', 'thumbnail' => '', 'name' => pathinfo($file)['filename']];
             if (isset($data['title']) && !empty($data['title'])) {
                 $layout['title'] = Text::_($data['title']);
             }
             if (isset($data['desc'])) {
                 $layout['desc'] = Text::_($data['desc']);
             }
             if (isset($data['thumbnail']) && !empty($data['thumbnail'])) {
-                $layout['thumbnail'] = Uri::root() . 'media/templates/site/' . $template . '/' . $data['thumbnail'];
-            }
-            if (isset($data['data'])) {
-                $layout['data'] = $data['data'];
+                $layout['thumbnail'] = Uri::root() . 'media/templates/site/' . $template . '/images/layouts/' . $data['thumbnail'];
             }
             $layouts[] = $layout;
         }

diff --git a/framework/library/astroid/Helper.php b/framework/library/astroid/Helper.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
+use Joomla\Database\DatabaseInterface;
 
 defined('_JEXEC') or die;
 
@@ -180,7 +181,9 @@ public static function getXml($url)
     public static function triggerEvent($name, $data = [])
     {
         PluginHelper::importPlugin('astroid');
-        Factory::getApplication()->triggerEvent($name, $data);
+//        Factory::getApplication()->triggerEvent($name, $data);
+        $event     = new Helper\Events($name, $data);
+        Factory::getApplication()->getDispatcher()->dispatch($name, $event);
     }
 
     public static function clearCacheByTemplate($template)
@@ -320,7 +323,7 @@ public static function fieldsetOrding($a, $b)
 
     public static function getModules()
     {
-        $db = Factory::getDbo();
+        $db = Factory::getContainer()->get(DatabaseInterface::class);
         $query = "SELECT #__modules.*, #__usergroups.title as access_title FROM #__modules JOIN #__usergroups ON #__usergroups.id=#__modules.access WHERE #__modules.client_id=0";
 
         $db->setQuery($query);

diff --git a/framework/library/astroid/Helper/Events.php b/framework/library/astroid/Helper/Events.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Astroid\Helper;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Event for getting information on an API Relationship
+ *
+ * @since  4.0.0
+ */
+final class Events extends AbstractImmutableEvent
+{
+}