refactor

Author: dgrammatiko

plugins/behaviour/compat/src/Extension/Compat.php

@@ -11,11 +11,12 @@
 namespace Joomla\Plugin\Behaviour\Compat\Extension;
 
 use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
+use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Priority;
 use Joomla\Event\SubscriberInterface;
-use Joomla\Plugin\Behaviour\Compat\HTMLHelper\Bootstrap;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -44,6 +45,7 @@ public static function getSubscribedEvents(): array
          */
         return [
             'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH],
+            'onAfterRoute'              => ['onAfterRoute', Priority::HIGH],
         ];
     }
 
@@ -84,24 +86,36 @@ public function __construct(DispatcherInterface $dispatcher, array $config = [])
     }
 
     /**
-     * We run as early as possible, this should be the first event
+     * The after Route logic
      *
-     * @param  AfterInitialiseDocumentEvent $event
+     * @param  AfterRouteEvent $event
      * @return void
      *
-     * @since  5.0.0
+     * @since  __DEPLOY_VERSION__
      */
-    public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event)
+    public function onAfterRoute($event)
     {
         /**
          * Load the deprecated HTMLHelper classes/functions
          * likely be removed in Joomla 7.0
          */
         if ($this->params->get('html_helpers', '1')) {
             // Restore HTMLHelper::Bootstrap('framework')
-            new Bootstrap();
+            Factory::getContainer()->get(\Joomla\CMS\HTML\Registry::class)
+                ->register('bootstrap', \Joomla\Plugin\Behaviour\Compat\HTMLHelper\Bootstrap::class, true);
         }
+    }
 
+    /**
+     * We run as early as possible, this should be the first event
+     *
+     * @param  AfterInitialiseDocumentEvent $event
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event)
+    {
         /**
          * Load the es5 assets stubs, they are needed if an extension
          * directly uses a core es5 asset which has no function in Joomla 5+

plugins/behaviour/compat/src/HTMLHelper/Bootstrap.php

@@ -8,17 +8,11 @@
 namespace Joomla\Plugin\Behaviour\Compat\HTMLHelper;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\HTML\Helpers\Bootstrap as OriginalBootstrap;
 
-class Bootstrap
-{
-    public function __construct()
-    {
-        if (!HTMLHelper::isRegistered('bootstrap.framework')) {
-            HTMLHelper::register('bootstrap.framework', 'Joomla\Plugin\Behaviour\Compat\HTMLHelper\Bootstrap::framework');
-        }
-    }
 
+class Bootstrap extends OriginalBootstrap
+{
     /**
      * Method to load the ALL the Bootstrap Components
      *