[6.1] CMSPlugin: use Lazy Object feature

libraries/src/Plugin/CMSPlugin.php

@@ -227,9 +227,9 @@ public function registerListeners()
     {
         // Plugins which are SubscriberInterface implementations are handled without legacy layer support
         if ($this instanceof SubscriberInterface) {
-            $this->getDispatcher()->addSubscriber($this);
-
-            return;
+            // The subscriber registration handled by PluginHelper::import().
+            // Return boolean instead of void, to distinguish overridden registerListeners(), need for backward compatibility.
+            return true;
         }
 
         $reflectedObject = new \ReflectionObject($this);

libraries/src/Plugin/PluginHelper.php

@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherInterface;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -231,15 +232,18 @@ protected static function import($plugin, $autocreate = true, ?DispatcherInterfa
 
         $plugin = Factory::getApplication()->bootPlugin($plugin->name, $plugin->type);
 
-        if ($dispatcher && $plugin instanceof DispatcherAwareInterface) {
-            $plugin->setDispatcher($dispatcher);
-        }
+        // @TODO: This piece of code breaks everything, and triggering Lazy Object instantiation !!!
+        // if ($dispatcher && $plugin instanceof DispatcherAwareInterface) {
+        //     $plugin->setDispatcher($dispatcher);
+        // }
 
         if (!$autocreate) {
             return;
         }
 
-        $plugin->registerListeners();
+        if ($plugin->registerListeners() && $plugin instanceof SubscriberInterface) {
+            $dispatcher->addSubscriber($plugin);
+        }
     }
 
     /**

plugins/system/schedulerunner/services/provider.php

@@ -33,11 +33,30 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin     = new ScheduleRunner(
-                    $container->get(DispatcherInterface::class),
-                    (array) PluginHelper::getPlugin('system', 'schedulerunner')
-                );
-                $plugin->setApplication(Factory::getApplication());
+                $construct = function (?ScheduleRunner $plugin = null) use ($container) {
+                    $eager  = !$plugin;
+                    $params = [
+                        $container->get(DispatcherInterface::class),
+                        (array) PluginHelper::getPlugin('system', 'schedulerunner'),
+                    ];
+
+                    if ($eager) {
+                        $plugin = new ScheduleRunner(...$params);
+                    } else {
+                        $plugin->__construct(...$params);
+                    }
+
+                    $plugin->setApplication(Factory::getApplication());
+
+                    return $eager ? $plugin : null;
+                };
+
+                if (PHP_VERSION_ID >= 80400) {
+                    $reflector = new ReflectionClass(ScheduleRunner::class);
+                    $plugin    = $reflector->newLazyGhost($construct);
+                } else {
+                    $plugin = $construct();
+                }
 
                 return $plugin;
             }

plugins/system/tasknotification/services/provider.php

@@ -35,13 +35,32 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin     = new TaskNotification(
-                    $container->get(DispatcherInterface::class),
-                    (array) PluginHelper::getPlugin('system', 'tasknotification')
-                );
-                $plugin->setApplication(Factory::getApplication());
-                $plugin->setDatabase($container->get(DatabaseInterface::class));
-                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $construct = function (?TaskNotification $plugin = null) use ($container) {
+                    $eager  = !$plugin;
+                    $params = [
+                        $container->get(DispatcherInterface::class),
+                        (array) PluginHelper::getPlugin('system', 'tasknotification'),
+                    ];
+
+                    if ($eager) {
+                        $plugin = new TaskNotification(...$params);
+                    } else {
+                        $plugin->__construct(...$params);
+                    }
+
+                    $plugin->setApplication(Factory::getApplication());
+                    $plugin->setDatabase($container->get(DatabaseInterface::class));
+                    $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                    return $eager ? $plugin : null;
+                };
+
+                if (PHP_VERSION_ID >= 80400) {
+                    $reflector = new ReflectionClass(TaskNotification::class);
+                    $plugin    = $reflector->newLazyGhost($construct);
+                } else {
+                    $plugin = $construct();
+                }
 
                 return $plugin;
             }

plugins/system/webauthn/services/provider.php

@@ -42,33 +42,52 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $app     = Factory::getApplication();
-                $session = $container->has('session') ? $container->get('session') : $this->getSession($app);
+                $construct = function (?Webauthn $plugin = null) use ($container) {
+                    $eager   = !$plugin;
+                    $app     = Factory::getApplication();
+                    $session = $container->has('session') ? $container->get('session') : $this->getSession($app);
 
-                $db                    = $container->get(DatabaseInterface::class);
-                $credentialsRepository = $container->has(PublicKeyCredentialSourceRepository::class)
-                    ? $container->get(PublicKeyCredentialSourceRepository::class)
-                    : new CredentialRepository($db);
+                    $db                    = $container->get(DatabaseInterface::class);
+                    $credentialsRepository = $container->has(PublicKeyCredentialSourceRepository::class)
+                        ? $container->get(PublicKeyCredentialSourceRepository::class)
+                        : new CredentialRepository($db);
 
-                $metadataRepository = null;
-                $params             = new Registry($config['params'] ?? '{}');
+                    $metadataRepository = null;
+                    $params             = new Registry($config['params'] ?? '{}');
 
-                if ($params->get('attestationSupport', 0) == 1) {
-                    $metadataRepository    = $container->has(MetadataStatementRepository::class)
-                        ? $container->get(MetadataStatementRepository::class)
-                        : new MetadataRepository();
-                }
+                    if ($params->get('attestationSupport', 0) == 1) {
+                        $metadataRepository = $container->has(MetadataStatementRepository::class)
+                            ? $container->get(MetadataStatementRepository::class)
+                            : new MetadataRepository();
+                    }
+
+                    $authenticationHelper = $container->has(Authentication::class)
+                        ? $container->get(Authentication::class)
+                        : new Authentication($app, $session, $credentialsRepository, $metadataRepository);
+
+                    $params = [
+                        $container->get(DispatcherInterface::class),
+                        (array) PluginHelper::getPlugin('system', 'webauthn'),
+                        $authenticationHelper,
+                    ];
 
-                $authenticationHelper  = $container->has(Authentication::class)
-                    ? $container->get(Authentication::class)
-                    : new Authentication($app, $session, $credentialsRepository, $metadataRepository);
+                    if ($eager) {
+                        $plugin = new Webauthn(...$params);
+                    } else {
+                        $plugin->__construct(...$params);
+                    }
 
-                $plugin = new Webauthn(
-                    $container->get(DispatcherInterface::class),
-                    (array) PluginHelper::getPlugin('system', 'webauthn'),
-                    $authenticationHelper
-                );
-                $plugin->setApplication($app);
+                    $plugin->setApplication($app);
+
+                    return $eager ? $plugin : null;
+                };
+
+                if (PHP_VERSION_ID >= 80400) {
+                    $reflector = new ReflectionClass(Webauthn::class);
+                    $plugin    = $reflector->newLazyGhost($construct);
+                } else {
+                    $plugin = $construct();
+                }
 
                 return $plugin;
             }