From 8b9ed2bfa2797ad959c86cccdac8621c70d35a46 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Thu, 19 Dec 2024 11:00:05 +0100 Subject: [PATCH] Remove the client id in the model cleanCache function --- .../components/com_categories/src/Model/CategoryModel.php | 6 ++---- .../components/com_content/src/Model/ArticleModel.php | 6 ++---- .../components/com_fields/src/Model/FieldModel.php | 6 ++---- .../components/com_fields/src/Model/GroupModel.php | 6 ++---- .../components/com_finder/src/Model/FilterModel.php | 6 ++---- .../components/com_languages/src/Model/LanguageModel.php | 6 ++---- .../components/com_languages/src/Model/LanguagesModel.php | 6 ++---- administrator/components/com_menus/src/Model/ItemModel.php | 6 ++---- administrator/components/com_menus/src/Model/MenuModel.php | 6 ++---- .../components/com_modules/src/Model/ModuleModel.php | 6 ++---- .../components/com_plugins/src/Model/PluginModel.php | 6 ++---- .../components/com_templates/src/Model/StyleModel.php | 6 ++---- components/com_content/src/Model/ArticleModel.php | 6 ++---- 13 files changed, 26 insertions(+), 52 deletions(-) diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php index 8450caf2d68df..5272f59029e04 100644 --- 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 index 24d953b11af5a..243c57c0aadfb 100644 --- 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 index b66b18643b12a..7c2d8801ba7fc 100644 --- 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 index bdec38168dc96..1f9ab2086c63d 100644 --- 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 index f785e07312386..da0644231c5d2 100644 --- 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 index 5c191be729218..8e57435e017f5 100644 --- a/administrator/components/com_languages/src/Model/LanguageModel.php +++ b/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'); diff --git a/administrator/components/com_languages/src/Model/LanguagesModel.php b/administrator/components/com_languages/src/Model/LanguagesModel.php index bd2a894d108af..2de1b1722979c 100644 --- a/administrator/components/com_languages/src/Model/LanguagesModel.php +++ b/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'); diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php index b43f6c9c6e396..77e3721f2d267 100644 --- 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 index 5b44c12ca7008..9f58f2cc60e41 100644 --- 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 index cb4201e4aacd3..f3e0a179f3fa3 100644 --- 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 index c12192d5dbd91..a21be546460dd 100644 --- 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 index bb381388aea5e..a23e9ae5f34a1 100644 --- 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 index dd64c43756e0b..0abf7e74b7c1d 100644 --- 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');