Remove the client id in the model cleanCache function (#44637)

laoneo · web-flow · commit decb2dd28de2 · 2025-02-04T10:23:00.000Z
Thanks @laoneo
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/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');
 
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/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');
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/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');
 
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/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');
 
diff --git a/administrator/components/com_finder/src/Model/FilterModel.php b/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);
     }
diff --git a/administrator/components/com_languages/src/Model/LanguageModel.php b/administrator/components/com_languages/src/Model/LanguageModel.php
@@ -268,15 +268,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');
diff --git a/administrator/components/com_languages/src/Model/LanguagesModel.php b/administrator/components/com_languages/src/Model/LanguagesModel.php
@@ -222,15 +222,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');
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/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');
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/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');
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/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');
     }
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/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');
     }
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/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');
diff --git a/components/com_content/src/Model/ArticleModel.php b/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');

Original file line number	Diff line number	Diff line change
`@@ -1211,15 +1211,13 @@ protected function batchMove($value, $pks, $contexts)`
`1211`	`1211`	`/**`
`1212`	`1212`	`* Custom clean the cache of com_content and content modules`
`1213`	`1213`	`*`
`1214`		`- * @param string $group Cache group name.`
`1215`		`- * @param integer $clientId No longer used, will be removed without replacement`
`1216`		`- * @deprecated 4.3 will be removed in 6.0`
	`1214`	`+ * @param string $group Cache group name.`
`1217`	`1215`	`*`
`1218`	`1216`	`* @return void`
`1219`	`1217`	`*`
`1220`	`1218`	`* @since 1.6`
`1221`	`1219`	`*/`
`1222`		`- protected function cleanCache($group = null, $clientId = 0)`
	`1220`	`+ protected function cleanCache($group = null)`
`1223`	`1221`	`{`
`1224`	`1222`	`$extension = Factory::getApplication()->getInput()->get('extension');`
`1225`	`1223`
Original file line number	Diff line number	Diff line change
`@@ -1032,15 +1032,13 @@ protected function preprocessForm(Form $form, $data, $group = 'content')`
`1032`	`1032`	`/**`
`1033`	`1033`	`* Custom clean the cache of com_content and content modules`
`1034`	`1034`	`*`
`1035`		`- * @param string $group The cache group`
`1036`		`- * @param integer $clientId No longer used, will be removed without replacement`
`1037`		`- * @deprecated 4.3 will be removed in 6.0`
	`1035`	`+ * @param string $group Cache group name.`
`1038`	`1036`	`*`
`1039`	`1037`	`* @return void`
`1040`	`1038`	`*`
`1041`	`1039`	`* @since 1.6`
`1042`	`1040`	`*/`
`1043`		`- protected function cleanCache($group = null, $clientId = 0)`
	`1041`	`+ protected function cleanCache($group = null)`
`1044`	`1042`	`{`
`1045`	`1043`	`parent::cleanCache('com_content');`
`1046`	`1044`	`parent::cleanCache('mod_articles_archive');`
Original file line number	Diff line number	Diff line change
`@@ -1112,15 +1112,13 @@ function () use ($component, $section) {`
`1112`	`1112`	`/**`
`1113`	`1113`	`* Clean the cache`
`1114`	`1114`	`*`
`1115`		`- * @param string $group The cache group`
`1116`		`- * @param integer $clientId No longer used, will be removed without replacement`
`1117`		`- * @deprecated 4.3 will be removed in 6.0`
	`1115`	`+ * @param string $group Cache group name.`
`1118`	`1116`	`*`
`1119`	`1117`	`* @return void`
`1120`	`1118`	`*`
`1121`	`1119`	`* @since 3.7.0`
`1122`	`1120`	`*/`
`1123`		`- protected function cleanCache($group = null, $clientId = 0)`
	`1121`	`+ protected function cleanCache($group = null)`
`1124`	`1122`	`{`
`1125`	`1123`	`$context = Factory::getApplication()->getInput()->get('context');`
`1126`	`1124`
Original file line number	Diff line number	Diff line change
`@@ -354,15 +354,13 @@ public function getItem($pk = null)`
`354`	`354`	`/**`
`355`	`355`	`* Clean the cache`
`356`	`356`	`*`
`357`		`- * @param string $group The cache group`
`358`		`- * @param integer $clientId No longer used, will be removed without replacement`
`359`		`- * @deprecated 4.3 will be removed in 6.0`
	`357`	`+ * @param string $group Cache group name.`
`360`	`358`	`*`
`361`	`359`	`* @return void`
`362`	`360`	`*`
`363`	`361`	`* @since 3.7.0`
`364`	`362`	`*/`
`365`		`- protected function cleanCache($group = null, $clientId = 0)`
	`363`	`+ protected function cleanCache($group = null)`
`366`	`364`	`{`
`367`	`365`	`$context = Factory::getApplication()->getInput()->get('context');`
`368`	`366`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,13 @@ class FilterModel extends AdminModel`
`45`	`45`	`/**`
`46`	`46`	`* Custom clean cache method.`
`47`	`47`	`*`
`48`		`- * @param string $group The component name. [optional]`
`49`		`- * @param integer $clientId No longer used, will be removed without replacement`
`50`		`- * @deprecated 4.3 will be removed in 6.0`
	`48`	`+ * @param string $group The component name. [optional]`
`51`	`49`	`*`
`52`	`50`	`* @return void`
`53`	`51`	`*`
`54`	`52`	`* @since 2.5`
`55`	`53`	`*/`
`56`		`- protected function cleanCache($group = 'com_finder', $clientId = 0)`
	`54`	`+ protected function cleanCache($group = 'com_finder')`
`57`	`55`	`{`
`58`	`56`	`parent::cleanCache($group);`
`59`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,15 +268,13 @@ public function save($data)`
`268`	`268`	`/**`
`269`	`269`	`* Custom clean cache method.`
`270`	`270`	`*`
`271`		`- * @param string $group Optional cache group name.`
`272`		`- * @param integer $clientId No longer used, will be removed without replacement`
`273`		`- * @deprecated 4.3 will be removed in 6.0`
	`271`	`+ * @param string $group Cache group name.`
`274`	`272`	`*`
`275`	`273`	`* @return void`
`276`	`274`	`*`
`277`	`275`	`* @since 1.6`
`278`	`276`	`*/`
`279`		`- protected function cleanCache($group = null, $clientId = 0)`
	`277`	`+ protected function cleanCache($group = null)`
`280`	`278`	`{`
`281`	`279`	`parent::cleanCache('_system');`
`282`	`280`	`parent::cleanCache('com_languages');`
Original file line number	Diff line number	Diff line change
`@@ -222,15 +222,13 @@ public function delete($pks)`
`222`	`222`	`/**`
`223`	`223`	`* Custom clean cache method, 2 places for 2 clients.`
`224`	`224`	`*`
`225`		`- * @param string $group Optional cache group name.`
`226`		`- * @param integer $clientId No longer used, will be removed without replacement`
`227`		`- * @deprecated 4.3 will be removed in 6.0`
	`225`	`+ * @param string $group Cache group name.`
`228`	`226`	`*`
`229`	`227`	`* @return void`
`230`	`228`	`*`
`231`	`229`	`* @since 1.6`
`232`	`230`	`*/`
`233`		`- protected function cleanCache($group = null, $clientId = 0)`
	`231`	`+ protected function cleanCache($group = null)`
`234`	`232`	`{`
`235`	`233`	`parent::cleanCache('_system');`
`236`	`234`	`parent::cleanCache('com_languages');`
Original file line number	Diff line number	Diff line change
`@@ -1746,15 +1746,13 @@ protected function generateNewTitle($parentId, $alias, $title)`
`1746`	`1746`	`/**`
`1747`	`1747`	`* Custom clean the cache`
`1748`	`1748`	`*`
`1749`		`- * @param string $group Cache group name.`
`1750`		`- * @param integer $clientId No longer used, will be removed without replacement`
`1751`		`- * @deprecated 4.3 will be removed in 6.0`
	`1749`	`+ * @param string $group Cache group name.`
`1752`	`1750`	`*`
`1753`	`1751`	`* @return void`
`1754`	`1752`	`*`
`1755`	`1753`	`* @since 1.6`
`1756`	`1754`	`*/`
`1757`		`- protected function cleanCache($group = null, $clientId = 0)`
	`1755`	`+ protected function cleanCache($group = null)`
`1758`	`1756`	`{`
`1759`	`1757`	`parent::cleanCache('com_menus');`
`1760`	`1758`	`parent::cleanCache('com_modules');`
Original file line number	Diff line number	Diff line change
`@@ -402,15 +402,13 @@ public function getExtensionElementsForMenuItems(array $itemIds): array`
`402`	`402`	`/**`
`403`	`403`	`* Custom clean the cache`
`404`	`404`	`*`
`405`		`- * @param string $group Cache group name.`
`406`		`- * @param integer $clientId No longer used, will be removed without replacement`
`407`		`- * @deprecated 4.3 will be removed in 6.0`
	`405`	`+ * @param string $group Cache group name.`
`408`	`406`	`*`
`409`	`407`	`* @return void`
`410`	`408`	`*`
`411`	`409`	`* @since 1.6`
`412`	`410`	`*/`
`413`		`- protected function cleanCache($group = null, $clientId = 0)`
	`411`	`+ protected function cleanCache($group = null)`
`414`	`412`	`{`
`415`	`413`	`parent::cleanCache('com_menus');`
`416`	`414`	`parent::cleanCache('com_modules');`
Original file line number	Diff line number	Diff line change
`@@ -1090,15 +1090,13 @@ protected function getReorderConditions($table)`
`1090`	`1090`	`/**`
`1091`	`1091`	`* Custom clean cache method for different clients`
`1092`	`1092`	`*`
`1093`		`- * @param string $group The name of the plugin group to import (defaults to null).`
`1094`		`- * @param integer $clientId No longer used, will be removed without replacement`
`1095`		`- * @deprecated 4.3 will be removed in 6.0`
	`1093`	`+ * @param string $group Cache group name.`
`1096`	`1094`	`*`
`1097`	`1095`	`* @return void`
`1098`	`1096`	`*`
`1099`	`1097`	`* @since 1.6`
`1100`	`1098`	`*/`
`1101`		`- protected function cleanCache($group = null, $clientId = 0)`
	`1099`	`+ protected function cleanCache($group = null)`
`1102`	`1100`	`{`
`1103`	`1101`	`parent::cleanCache('com_modules');`
`1104`	`1102`	`}`