composer path finder and event backwardscompatibility

Leantime · Nov 16, 2024 · 2674245 · 2674245
1 parent 8b97857
commit 2674245
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/Core/Events/EventDispatcher.php b/app/Core/Events/EventDispatcher.php
@@ -293,7 +293,13 @@ public static function add_event_listener(
     ): void {
 
         //Some backwards compatibility rules
-        $eventName = str_replace('leantime.core.template.tpl', 'leantime.*', $eventName);
+        if(str_starts_with($eventName, "leantime.core.template.tpl")) {
+            $eventParts = explode(".", $eventName);
+
+            $count = count($eventParts);
+
+            $eventName = "leantime.*.".($eventParts[$count-2] ?? '').".".($eventParts[$count-1] ?? '');
+        }
 
         if (! array_key_exists($eventName, self::$eventRegistry)) {
             self::$eventRegistry[$eventName] = [];

diff --git a/app/Core/Providers/Views.php b/app/Core/Providers/Views.php
@@ -255,6 +255,7 @@ private function discoverComposerPaths()
         $enabledPlugins = $this->app->make(\Leantime\Domain\Plugins\Services\Plugins::class)->getEnabledPlugins();
         $pluginComposerClasses = collect($enabledPlugins)
             ->map(function ($plugin) {
+
                 if ($plugin->format === 'phar') {
                     $pharPath = APP_ROOT.'/app/Plugins/'.$plugin->foldername.'/'.$plugin->foldername.'.phar';
 
@@ -281,7 +282,8 @@ private function discoverComposerPaths()
                     }
                 }
 
-                return glob(APP_ROOT.'app/Views/Composers/*.php') ?: [];
+                //If not a phar, we can just use glob
+                return glob(APP_ROOT.'/app/Plugins/'.$plugin->foldername.'/Composers/*.php') ?: [];
             })
             ->flatten();