fix conflicts

Author: dgrammatiko

administrator/language/en-GB/plg_behaviour_compat6.ini

@@ -6,6 +6,7 @@
 PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6"
 PLG_COMPAT6_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace."
 PLG_COMPAT6_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases"
+PLG_COMPAT6_FIELD_HTML_HELPERS_DESCRIPTION="Activate this option if your extension requires deprecated HTMLHelper classes or functions. When enabled, will provide backward compatibility to the prior major version."
 PLG_COMPAT6_FIELD_LEGACY_CLASSES_DESCRIPTION="Activate this option if your extension requires previously deprecated classes removed from the current version of Joomla. These removed classes can be found in the folder /plugins/behavior/compat6/classes/."
 PLG_COMPAT6_FIELD_LEGACY_CLASSES_LABEL="Include Deprecated Classes"
 PLG_COMPAT6_FIELD_REMOVED_ASSETS_DESCRIPTION="Activate this option if your extension requires removed assets which has resulted in an exception. The assets provided are empty but prevent the exception."

plugins/behaviour/compat6/compat6.xml

@@ -34,6 +34,18 @@
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
+				<field
+ 					name="html_helpers"
+ 					type="radio"
+ 					label="PLG_COMPAT_FIELD_HTML_HELPERS_LABEL"
+ 					description="PLG_COMPAT_FIELD_HTML_HELPERS_DESCRIPTION"
+ 					layout="joomla.form.field.radio.switcher"
+ 					default="1"
+ 					filter="integer"
+ 					>
+ 					<option value="0">JNO</option>
+ 					<option value="1">JYES</option>
+ 				</field>
 				<field
 					name="legacy_classes"
 					type="radio"
@@ -46,7 +58,6 @@
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
-
 			</fieldset>
 		</fields>
 	</config>

plugins/behaviour/compat6/src/Extension/Compat6.php

@@ -15,7 +15,6 @@
 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 +43,7 @@ public static function getSubscribedEvents(): array
          */
         return [
             'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH],
+            'onAfterRoute'              => ['onAfterRoute', Priority::HIGH],
         ];
     }
 
@@ -100,15 +100,6 @@ public function __construct(DispatcherInterface $dispatcher, array $config = [])
      */
     public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $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();
-        }
-
         /**
          * Load the removed assets stubs, they are needed if an extension
          * directly uses a core asset from Joomla 5 which is not present in Joomla 6
@@ -121,4 +112,27 @@ public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event)
                 ->addRegistryFile('media/plg_behaviour_compat6/removed.asset.json');
         }
     }
+
+    /**
+
+
+     * The after Route logic
+     *
+     * @param  AfterRouteEvent $event
+     * @return void
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    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')
+            Factory::getContainer()->get(\Joomla\CMS\HTML\Registry::class)
+                ->register('bootstrap', \Joomla\Plugin\Behaviour\Compat\HTMLHelper\Bootstrap::class, true);
+        }
+    }
 }