From eb597b8eab2078d88cf271c69553232e24485e8f Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 25 Feb 2025 18:59:11 +0100 Subject: [PATCH 1/6] Re-add FeaturedModel for correct deprecation --- .../com_content/src/Model/FeaturedModel.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 administrator/components/com_content/src/Model/FeaturedModel.php diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php new file mode 100644 index 000000000000..8e37786800d2 --- /dev/null +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -0,0 +1,33 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * @deprecated 6.0 will be removed in 8.0 + */ + +namespace Joomla\Component\Content\Administrator\Model; + +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\Database\QueryInterface; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + +/** + * Methods supporting a list of featured article records. + * + * @since 1.6 + * + * @deprecated 6.0 will be removed in 8.0 + * Use \Joomla\Component\Content\Administrator\Model\ArticlesModel instead + * set the filter.featured state to 1 to get only featured articles + */ +class FeaturedModel extends ArticlesModel +{ +} \ No newline at end of file From 51425d832f6932646276acd33e51547df740c89a Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 25 Feb 2025 20:54:49 +0100 Subject: [PATCH 2/6] cs --- .../components/com_content/src/Model/FeaturedModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php index 8e37786800d2..5f13fecb06d8 100644 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -30,4 +30,4 @@ */ class FeaturedModel extends ArticlesModel { -} \ No newline at end of file +} From d9b0b3818178be051118f7fd9821d455dc4a7736 Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 25 Feb 2025 21:17:55 +0100 Subject: [PATCH 3/6] cs --- .../components/com_content/src/Model/FeaturedModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php index 5f13fecb06d8..8bbffde517f9 100644 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -6,7 +6,7 @@ * * @copyright (C) 2009 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt - * + * * @deprecated 6.0 will be removed in 8.0 */ From 13ff2854d7f124a5a308abc5107599a1c0edefd4 Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 25 Feb 2025 21:28:13 +0100 Subject: [PATCH 4/6] cs --- .../components/com_content/src/Model/FeaturedModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php index 8bbffde517f9..4e28379c0ec6 100644 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -23,7 +23,7 @@ * Methods supporting a list of featured article records. * * @since 1.6 - * + * * @deprecated 6.0 will be removed in 8.0 * Use \Joomla\Component\Content\Administrator\Model\ArticlesModel instead * set the filter.featured state to 1 to get only featured articles From 6b7745ef0465987800c66b651e4d5acd2fd6c599 Mon Sep 17 00:00:00 2001 From: chmst Date: Wed, 26 Feb 2025 11:15:54 +0100 Subject: [PATCH 5/6] Update as required --- .../com_content/src/Controller/FeaturedController.php | 2 -- .../components/com_content/src/Model/FeaturedModel.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/administrator/components/com_content/src/Controller/FeaturedController.php b/administrator/components/com_content/src/Controller/FeaturedController.php index 021c7b92bba5..49fc019fc21d 100644 --- a/administrator/components/com_content/src/Controller/FeaturedController.php +++ b/administrator/components/com_content/src/Controller/FeaturedController.php @@ -6,8 +6,6 @@ * * @copyright (C) 2009 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt - * - * @deprecated 6.0 will be removed in 8.0 */ namespace Joomla\Component\Content\Administrator\Controller; diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php index 4e28379c0ec6..fd6d9c28a371 100644 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -6,8 +6,6 @@ * * @copyright (C) 2009 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt - * - * @deprecated 6.0 will be removed in 8.0 */ namespace Joomla\Component\Content\Administrator\Model; From fed83cee60e7577048e2aad3242d6d7b4a381057 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Wed, 26 Feb 2025 22:34:01 +0100 Subject: [PATCH 6/6] Update administrator/components/com_content/src/Model/FeaturedModel.php Co-authored-by: Richard Fath --- .../components/com_content/src/Model/FeaturedModel.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php index fd6d9c28a371..a9ecfb637878 100644 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ b/administrator/components/com_content/src/Model/FeaturedModel.php @@ -10,9 +10,6 @@ namespace Joomla\Component\Content\Administrator\Model; -use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Database\QueryInterface; - // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; // phpcs:enable PSR1.Files.SideEffects