[5.4] Remove use of deprecated dispatcher from the plugin constructors

administrator/components/com_finder/src/Indexer/Adapter.php

@@ -131,15 +131,21 @@ abstract class Adapter extends CMSPlugin
     /**
      * Method to instantiate the indexer adapter.
      *
-     * @param   DispatcherInterface  $dispatcher  The object to observe.
      * @param   array                $config      An array that holds the plugin configuration.
      *
      * @since   2.5
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config)
+    public function __construct($config)
     {
         // Call the parent constructor.
-        parent::__construct($dispatcher, $config);
+        if ($config instanceof DispatcherInterface) {
+            $dispatcher = $config;
+            $config     = \func_num_args() > 1 ? func_get_arg(1) : [];
+
+            parent::__construct($dispatcher, $config);
+        } else {
+            parent::__construct($config);
+        }
 
         // Get the type id.
         $this->type_id = $this->getTypeId();

phpstan-baseline.neon

@@ -17382,6 +17382,16 @@ parameters:
 			count: 2
 			path: plugins/content/confirmconsent/src/Field/ConsentBoxField.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\Content\\Finder\\Extension\\Finder\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/content/finder/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\Content\\Finder\\Extension\\Finder\:
@@ -17485,6 +17495,16 @@ parameters:
 			count: 2
 			path: plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\Editors\\CodeMirror\\Extension\\Codemirror\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/editors/codemirror/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\Editors\\CodeMirror\\Extension\\Codemirror\:
@@ -17495,6 +17515,16 @@ parameters:
 			count: 1
 			path: plugins/editors/codemirror/src/Extension/Codemirror.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\Editors\\None\\Extension\\None\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/editors/none/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\Editors\\None\\Extension\\None\:
@@ -17505,6 +17535,16 @@ parameters:
 			count: 1
 			path: plugins/editors/none/src/Extension/None.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\Editors\\TinyMCE\\Extension\\TinyMCE\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/editors/tinymce/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\Editors\\TinyMCE\\Extension\\TinyMCE\:
@@ -17718,6 +17758,16 @@ parameters:
 			count: 2
 			path: plugins/system/actionlogs/src/Extension/ActionLogs.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\System\\Cache\\Extension\\Cache\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/system/cache/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\System\\Cache\\Extension\\Cache\:
@@ -17921,6 +17971,16 @@ parameters:
 			count: 1
 			path: plugins/system/languagefilter/src/Extension/LanguageFilter.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\System\\Schemaorg\\Extension\\Schemaorg\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/system/schemaorg/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\System\\Schemaorg\\Extension\\Schemaorg\:
@@ -17931,6 +17991,16 @@ parameters:
 			count: 4
 			path: plugins/system/schemaorg/src/Extension/Schemaorg.php
 
+		-
+			message: '''
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\System\\Shortcut\\Extension\\Shortcut\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: plugins/system/shortcut/services/provider.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\System\\Shortcut\\Extension\\Shortcut\:

plugins/actionlog/joomla/services/provider.php

@@ -17,7 +17,6 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Actionlog\Joomla\Extension\Joomla;
 
 return new class () implements ServiceProviderInterface {
@@ -36,7 +35,6 @@ public function register(Container $container)
             PluginInterface::class,
             function (Container $container) {
                 $plugin = new Joomla(
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('actionlog', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());

plugins/actionlog/joomla/src/Extension/Joomla.php

@@ -24,7 +24,6 @@
 use Joomla\Component\Actionlogs\Administrator\Plugin\ActionLogPlugin;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Event;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -78,14 +77,13 @@ final class Joomla extends ActionLogPlugin implements SubscriberInterface
     /**
      * Constructor.
      *
-     * @param   DispatcherInterface  $dispatcher  The dispatcher
      * @param   array                $config      An optional associative array of configuration settings
      *
      * @since   3.9.0
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config)
+    public function __construct(array $config)
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct($config);
 
         $params = ComponentHelper::getComponent('com_actionlogs')->getParams();
 

plugins/api-authentication/basic/services/provider.php

@@ -17,7 +17,6 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\ApiAuthentication\Basic\Extension\Basic;
 
 return new class () implements ServiceProviderInterface {
@@ -36,7 +35,6 @@ public function register(Container $container)
             PluginInterface::class,
             function (Container $container) {
                 $plugin     = new Basic(
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('api-authentication', 'basic'),
                 );
                 $plugin->setApplication(Factory::getApplication());

plugins/api-authentication/token/services/provider.php

@@ -17,7 +17,6 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Filter\InputFilter;
 use Joomla\Plugin\ApiAuthentication\Token\Extension\Token;
 
@@ -37,7 +36,6 @@ public function register(Container $container)
             PluginInterface::class,
             function (Container $container) {
                 $plugin = new Token(
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('api-authentication', 'token'),
                     new InputFilter()
                 );

plugins/api-authentication/token/src/Extension/Token.php

@@ -17,7 +17,6 @@
 use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Filter\InputFilter;
 
@@ -74,15 +73,14 @@ public static function getSubscribedEvents(): array
     /**
      * Constructor.
      *
-     * @param   DispatcherInterface   $dispatcher   The dispatcher
      * @param   array                 $config       An optional associative array of configuration settings
      * @param   InputFilter           $filter       The input filter
      *
      * @since   4.2.0
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config, InputFilter $filter)
+    public function __construct(array $config, InputFilter $filter)
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct($config);
 
         $this->filter = $filter;
     }

plugins/authentication/cookie/services/provider.php

@@ -17,7 +17,6 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Authentication\Cookie\Extension\Cookie;
 
 return new class () implements ServiceProviderInterface {
@@ -36,7 +35,6 @@ public function register(Container $container)
             PluginInterface::class,
             function (Container $container) {
                 $plugin = new Cookie(
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'cookie')
                 );
                 $plugin->setApplication(Factory::getApplication());

plugins/authentication/joomla/services/provider.php

@@ -17,7 +17,6 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Authentication\Joomla\Extension\Joomla;
 
 return new class () implements ServiceProviderInterface {
@@ -36,7 +35,6 @@ public function register(Container $container)
             PluginInterface::class,
             function (Container $container) {
                 $plugin = new Joomla(
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());

plugins/authentication/ldap/services/provider.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Authentication\Ldap\Extension\Ldap;
 use Joomla\Plugin\Authentication\Ldap\Factory\LdapFactory;
 
@@ -36,7 +35,6 @@ public function register(Container $container)
             function (Container $container) {
                 $plugin = new Ldap(
                     new LdapFactory(),
-                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'ldap')
                 );
                 $plugin->setApplication(Factory::getApplication());

plugins/authentication/ldap/src/Extension/Ldap.php

@@ -14,7 +14,6 @@
 use Joomla\CMS\Event\User\AuthenticationEvent;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Plugin\Authentication\Ldap\Factory\LdapFactoryInterface;
 use Symfony\Component\Ldap\Entry;
@@ -45,16 +44,15 @@ final class Ldap extends CMSPlugin implements SubscriberInterface
      * Constructor
      *
      * @param   LdapFactoryInterface  $factory     The Ldap factory
-     * @param   DispatcherInterface   $dispatcher  The object to observe
      * @param   array                 $config      An optional associative array of configuration settings.
      *                                             Recognized key values include 'name', 'group', 'params', 'language'
      *                                             (this list is not meant to be comprehensive).
      *
      * @since   4.3.0
      */
-    public function __construct(LdapFactoryInterface $factory, DispatcherInterface $dispatcher, array $config = [])
+    public function __construct(LdapFactoryInterface $factory, array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct($config);
 
         $this->factory = $factory;
     }

plugins/behaviour/compat/services/provider.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Behaviour\Compat\Extension\Compat;
 
 return new class () implements ServiceProviderInterface {
@@ -32,10 +31,7 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin     = PluginHelper::getPlugin('behaviour', 'compat');
-                $dispatcher = $container->get(DispatcherInterface::class);
-
-                $plugin = new Compat($dispatcher, (array) $plugin);
+                $plugin = new Compat((array) PluginHelper::getPlugin('behaviour', 'compat'));
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;

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

@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Priority;
 use Joomla\Event\SubscriberInterface;
 
@@ -49,16 +48,15 @@ public static function getSubscribedEvents(): array
     /**
      * Constructor
      *
-     * @param   DispatcherInterface  $dispatcher  The event dispatcher
      * @param   array                $config      An optional associative array of configuration settings.
      *                                            Recognized key values include 'name', 'group', 'params', 'language'
      *                                            (this list is not meant to be comprehensive).
      *
      * @since   1.5
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config = [])
+    public function __construct(array $config = [])
     {
-        parent::__construct($dispatcher, $config);
+        parent::__construct($config);
 
         /**
          * Normally we should never use the constructor to execute any logic which would

plugins/behaviour/compat6/services/provider.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Behaviour\Compat6\Extension\Compat6;
 
 return new class () implements ServiceProviderInterface {
@@ -32,10 +31,7 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin     = PluginHelper::getPlugin('behaviour', 'compat6');
-                $dispatcher = $container->get(DispatcherInterface::class);
-
-                $plugin = new Compat6($dispatcher, (array) $plugin);
+                $plugin = new Compat6((array) PluginHelper::getPlugin('behaviour', 'compat6'));
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;