https://github.com/joomla/joomla-cms/pull/45644

Author: brbrbr

CHANGELOG.txt

@@ -20,7 +20,8 @@
  * L Language
  * N Note
  */
-25.44.7589
+__DEPLOY_VERSION__
+ ^ Remove use of deprecated dispatcher from the plugin constructors (related to https://github.com/joomla/joomla-cms/pull/45644). With J4 backward compability
  + Added validation of sql type fields (checker). 
  + Added cleanup of obsolete field values
  # Fixed incorrect check for 'empty' dates in LinkTable

com_blc/admin/src/Blc/BlcPlugin.php

@@ -22,10 +22,11 @@
 use Blc\Component\Blc\Administrator\Traits\BlcExtractTrait;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Event\DispatcherInterface;
 
-abstract class BlcPlugin extends CMSPlugin
+
+abstract class BlcPlugin extends CMSPlugin implements DatabaseAwareInterface
 {
     use DatabaseAwareTrait;
     use BlcExtractTrait; /* for now. This must move to implementations of blcExtractInterface */
@@ -36,9 +37,14 @@ abstract class BlcPlugin extends CMSPlugin
     protected $allowLegacyListeners = false;
 
 
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct(array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        if (version_compare(JVERSION, '5.0', '>=')) {
+            parent::__construct($config);
+        } else {
+            $dispatcher =  Factory::getApplication()->getDispatcher();
+            parent::__construct($dispatcher, $config);
+        }
         $this->componentConfig = ComponentHelper::getParams('com_blc');
     }
 

plg_blc_category/services/provider.php

@@ -35,9 +35,9 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class); //Joomla 4
+               
                 $plugin     = new BlcPluginActor(
-                    $dispatcher,
+                   
                     (array) PluginHelper::getPlugin('blc', 'category')
                 );
                 $plugin->setApplication(Factory::getApplication());

plg_blc_category/src/Extension/BlcPluginActor.php

@@ -50,9 +50,9 @@ class BlcPluginActor extends BlcPlugin implements SubscriberInterface, BlcExtrac
     protected $context    = 'com_categories.category';
     private $replacedUrls = [];
 
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct( array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct( $config);
         $this->fieldContext = 'com_content.categories'; //why joomla WHY?
         $this->__cftConstruct();
     }

plg_blc_checker/services/provider.php

@@ -37,9 +37,9 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
+             
                 $plugin     = new BlcPluginActor(
-                    $dispatcher,
+                   
                     (array) PluginHelper::getPlugin('blc', 'checker')
                 );
                 $plugin->setApplication(Factory::getApplication());

plg_blc_checker/src/Extension/BlcPluginActor.php

@@ -31,9 +31,9 @@ class BlcPluginActor extends BlcPlugin implements SubscriberInterface, BlcChecke
     protected $autoloadLanguage = true;
 
     private const HELPLINK = 'https://brokenlinkchecker.dev/extensions/plg-blc-checker';
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct( array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct( $config);
     }
 
     public static function getSubscribedEvents(): array

plg_blc_content/services/provider.php

@@ -19,7 +19,7 @@
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 
-return new class () implements ServiceProviderInterface {
+return new class() implements ServiceProviderInterface {
     /**
      * Registers the service provider with a DI container.
      *
@@ -34,9 +34,7 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class); //Joomla 4
                 $plugin     = new BlcPluginActor(
-                    $dispatcher,
                     (array) PluginHelper::getPlugin('blc', 'content')
                 );
                 $plugin->setApplication(Factory::getApplication());

plg_blc_content/src/Extension/BlcPluginActor.php

@@ -55,9 +55,16 @@ class BlcPluginActor extends BlcPlugin implements SubscriberInterface, BlcExtrac
         'image_fulltext'                      => BlcSetAltInterface::BLC_REPLACE_ALT_YES,
     ];
 
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct(array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+
+        if (version_compare(JVERSION, '5.0', '>=')) {
+            parent::__construct($config);
+        } else {
+            $dispatcher =  Factory::getApplication()->getDispatcher();
+            parent::__construct($dispatcher, $config);
+        }
+
 
         $this->__cftConstruct();
     }

plg_blc_external/services/provider.php

@@ -17,7 +17,7 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
+
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -35,9 +35,9 @@ public function register(Container $container): void
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class); //Joomla 4
+              
                 $plugin     = new BlcPluginActor(
-                    $dispatcher,
+                  
                     (array) PluginHelper::getPlugin('blc', 'external')
                 );
                 $plugin->setApplication(Factory::getApplication());

plg_blc_external/src/Extension/BlcPluginActor.php

@@ -50,9 +50,9 @@ final class BlcPluginActor extends BlcPlugin implements SubscriberInterface, Blc
      * @since   3.5
      */
 
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct( array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct( $config);
         $this->setRecheck();
     }