[6.0] Remove the client id in the model cleanCache function

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -1211,15 +1211,13 @@ protected function batchMove($value, $pks, $contexts)
     /**
      * Custom clean the cache of com_content and content modules
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $extension = Factory::getApplication()->getInput()->get('extension');
 

administrator/components/com_content/src/Model/ArticleModel.php

@@ -1032,15 +1032,13 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     /**
      * Custom clean the cache of com_content and content modules
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
         parent::cleanCache('mod_articles_archive');

administrator/components/com_fields/src/Model/FieldModel.php

@@ -1112,15 +1112,13 @@ function () use ($component, $section) {
     /**
      * Clean the cache
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $context = Factory::getApplication()->getInput()->get('context');
 

administrator/components/com_fields/src/Model/GroupModel.php

@@ -354,15 +354,13 @@ public function getItem($pk = null)
     /**
      * Clean the cache
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $context = Factory::getApplication()->getInput()->get('context');
 

administrator/components/com_finder/src/Model/FilterModel.php

@@ -45,15 +45,13 @@ class FilterModel extends AdminModel
     /**
      * Custom clean cache method.
      *
-     * @param   string   $group     The component name. [optional]
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param   string  $group  The component name. [optional]
      *
      * @return  void
      *
      * @since   2.5
      */
-    protected function cleanCache($group = 'com_finder', $clientId = 0)
+    protected function cleanCache($group = 'com_finder')
     {
         parent::cleanCache($group);
     }

administrator/components/com_languages/src/Model/LanguageModel.php

@@ -267,15 +267,13 @@ public function save($data)
     /**
      * Custom clean cache method.
      *
-     * @param   string   $group     Optional cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('_system');
         parent::cleanCache('com_languages');

administrator/components/com_languages/src/Model/LanguagesModel.php

@@ -220,15 +220,13 @@ public function delete($pks)
     /**
      * Custom clean cache method, 2 places for 2 clients.
      *
-     * @param   string   $group     Optional cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('_system');
         parent::cleanCache('com_languages');

administrator/components/com_menus/src/Model/ItemModel.php

@@ -1746,15 +1746,13 @@ protected function generateNewTitle($parentId, $alias, $title)
     /**
      * Custom clean the cache
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_menus');
         parent::cleanCache('com_modules');

administrator/components/com_menus/src/Model/MenuModel.php

@@ -402,15 +402,13 @@ public function getExtensionElementsForMenuItems(array $itemIds): array
     /**
      * Custom clean the cache
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_menus');
         parent::cleanCache('com_modules');

administrator/components/com_modules/src/Model/ModuleModel.php

@@ -1090,15 +1090,13 @@ protected function getReorderConditions($table)
     /**
      * Custom clean cache method for different clients
      *
-     * @param   string   $group     The name of the plugin group to import (defaults to null).
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_modules');
     }

administrator/components/com_plugins/src/Model/PluginModel.php

@@ -361,15 +361,13 @@ public function getHelp()
     /**
      * Custom clean cache method, plugins are cached in 2 places for different clients.
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_plugins');
     }

administrator/components/com_templates/src/Model/StyleModel.php

@@ -778,15 +778,13 @@ public function getSiteTemplates(): array
     /**
      * Custom clean cache method
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_templates');
         parent::cleanCache('_system');

components/com_content/src/Model/ArticleModel.php

@@ -414,15 +414,13 @@ public function storeVote($pk = 0, $rate = 0)
     /**
      * Cleans the cache of com_content and content modules
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.9.9
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
         parent::cleanCache('mod_articles_archive');