[7.0] Removing deprecated static methods from modules

administrator/modules/mod_feed/src/Helper/FeedHelper.php

@@ -53,24 +53,4 @@ public function getFeedData(Registry $params, FeedFactory $feed): \Joomla\CMS\Fe
 
         return $rssDoc;
     }
-
-    /**
-     * Method to load a feed.
-     *
-     * @param   \Joomla\Registry\Registry  $params  The parameters object.
-     *
-     * @return  \Joomla\CMS\Feed\Feed|string  Return a Feed object or a string message if error.
-     *
-     * @since   1.5
-     *
-     * @deprecated 5.3.0 will be removed in 7.0
-     *             Use the non-static method getFeedData
-     *             Example: Factory::getApplication()->bootModule('mod_feed', 'administrator')
-     *                          ->getHelper('FeedHelper')
-     *                          ->getFeedData($params, new FeedFactory())
-     */
-    public static function getFeed($params)
-    {
-        return (new self())->getFeedData($params, new FeedFactory());
-    }
 }

administrator/modules/mod_latest/src/Helper/LatestHelper.php

@@ -11,7 +11,6 @@
 namespace Joomla\Module\Latest\Administrator\Helper;
 
 use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Administrator\Model\ArticlesModel;
@@ -139,41 +138,4 @@ public function getModuleTitle(Registry $params, CMSApplicationInterface $app):
             $title
         );
     }
-
-    /**
-     * Get a list of articles.
-     *
-     * @param   Registry       $params  The module parameters.
-     * @param   ArticlesModel  $model   The model.
-     *
-     * @return  mixed  An array of articles, or false on error.
-     *
-     * @deprecated 5.4.0 will be removed in 7.0
-     *             Use the non-static method getArticles
-     *             Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')
-     *                          ->getHelper('LatestHelper')
-     *                          ->getArticles($params, $model, Factory::getApplication())
-     */
-    public static function getList(Registry $params, ArticlesModel $model)
-    {
-        return (new self())->getArticles($params, $model, Factory::getApplication());
-    }
-
-    /**
-     * Get the alternate title for the module.
-     *
-     * @param   Registry  $params  The module parameters.
-     *
-     * @return  string  The alternate title for the module.
-     *
-     * @deprecated 5.4.0 will be removed in 7.0
-     *             Use the non-static method getModuleTitle
-     *             Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')
-     *                          ->getHelper('LatestHelper')
-     *                          ->getModuleTitle($params, Factory::getApplication())
-     */
-    public static function getTitle($params)
-    {
-        return (new self())->getModuleTitle($params, Factory::getApplication());
-    }
 }

administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php

@@ -76,46 +76,4 @@ public function getModuleTitle($params)
     {
         return Text::plural('MOD_LATESTACTIONS_TITLE', $params->get('count', 5));
     }
-
-    /**
-     * Get the alternate title for the module
-     *
-     * @param   Registry  $params  The module parameters.
-     *
-     * @return  string    The alternate title for the module.
-     *
-     * @since   3.9.1
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getModuleTitle
-     *             Example: Factory::getApplication()->bootModule('mod_latestactions', 'administrator')
-     *                          ->getHelper('LatestActionsHelper')
-     *                          ->getModuleTitle($params)
-     */
-    public static function getTitle($params)
-    {
-        return (new self())->getModuleTitle($params);
-    }
-
-    /**
-     * Get a list of logged actions.
-     *
-     * @param   Registry  &$params  The module parameters.
-     *
-     * @return  mixed  An array of action logs, or false on error.
-     *
-     * @since   3.9.1
-     *
-     * @throws  \Exception
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getActions
-     *             Example: Factory::getApplication()->bootModule('mod_latestactions', 'administrator')
-     *                          ->getHelper('LatestActionsHelper')
-     *                          ->getActions($params)
-     */
-    public static function getList(&$params)
-    {
-        return (new self())->getActions($params);
-    }
 }

administrator/modules/mod_logged/src/Helper/LoggedHelper.php

@@ -91,44 +91,4 @@ public function getModuleTitle($params): string
     {
         return Text::plural('MOD_LOGGED_TITLE', $params->get('count', 5));
     }
-
-    /**
-     * Get a list of logged users.
-     *
-     * @param   Registry           $params  The module parameters
-     * @param   CMSApplication     $app     The application
-     * @param   DatabaseInterface  $db      The database
-     *
-     * @return  mixed  An array of users, or false on error.
-     *
-     * @throws  \RuntimeException
-     *
-     * @deprecated 5.4.0 will be removed in 7.0
-     *             Use the non-static method getUsers
-     *             Example: Factory::getApplication()->bootModule('mod_logged', 'administrator')
-     *                          ->getHelper('LoggedHelper')
-     *                          ->getUsers($params, Factory::getApplication(), $db)
-     */
-    public static function getList(Registry $params, CMSApplication $app, DatabaseInterface $db)
-    {
-        return (new self())->getUsers($params, $app, $db);
-    }
-
-    /**
-     * Get the alternate title for the module
-     *
-     * @param   Registry  $params  The module parameters.
-     *
-     * @return  string    The alternate title for the module.
-     *
-     * @deprecated 5.4.0 will be removed in 7.0
-     *             Use the non-static method getModuleTitle
-     *             Example: Factory::getApplication()->bootModule('mod_logged', 'administrator')
-     *                          ->getHelper('LoggedHelper')
-     *                          ->getModuleTitle($params)
-     */
-    public static function getTitle($params)
-    {
-        return (new self())->getModuleTitle($params);
-    }
 }

administrator/modules/mod_login/src/Helper/LoginHelper.php

@@ -11,7 +11,6 @@
 namespace Joomla\Module\Login\Administrator\Helper;
 
 use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -82,36 +81,4 @@ public function getReturnUriString()
 
         return base64_encode('index.php');
     }
-
-    /**
-     * Get an HTML select list of the available languages.
-     *
-     * @return  string
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getLanguages
-     *             Example: Factory::getApplication()->bootModule('mod_login', 'administrator')
-     *                            ->getHelper('LoginHelper')
-     *                            ->getLanguages(Factory::getApplication())
-     */
-    public static function getLanguageList()
-    {
-        return (new self())->getLanguages(Factory::getApplication());
-    }
-
-    /**
-     * Get the redirect URI after login.
-     *
-     * @return  string
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getReturnUriString
-     *             Example: Factory::getApplication()->bootModule('mod_login', 'administrator')
-     *                            ->getHelper('LoginHelper')
-     *                            ->getReturnUriString()
-     */
-    public static function getReturnUri()
-    {
-        return (new self())->getReturnUriString();
-    }
 }

administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php

@@ -10,7 +10,6 @@
 
 namespace Joomla\Module\PrivacyDashboard\Administrator\Helper;
 
-use Joomla\CMS\Factory;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
@@ -58,24 +57,4 @@ public function getPrivacyRequests(): array
             return [];
         }
     }
-
-    /**
-     * Method to retrieve information about the site privacy requests
-     *
-     * @return  array  Array containing site privacy requests
-     *
-     * @since   3.9.0
-     *
-     * @deprecated 5.4.0 will be removed in 7.0
-     *             Use the non-static method getPrivacyRequests
-     *             Example: Factory::getApplication()->bootModule('mod_privacy_dashboard', 'administrator')
-     *                          ->getHelper('PrivacyDashboardHelper')
-     *                          ->getPrivacyRequests()
-     */
-    public static function getData()
-    {
-        return Factory::getApplication()->bootModule('mod_privacy_dashboard', 'administrator')
-                                  ->getHelper('PrivacyDashboardHelper')
-                                  ->getPrivacyRequests();
-    }
 }

administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php

@@ -198,68 +198,4 @@ public function getDatabaseConnectionEncryption()
     {
         return $this->getDatabase()->getConnectionEncryption();
     }
-
-    /**
-     * Get the information about the published privacy policy
-     *
-     * @return  array  Array containing a status of whether a privacy policy is set and a link to the policy document for editing
-     *
-     * @since   4.0.0
-     *
-     * @deprecated 5.3.0 will be removed in 7.0
-     *             Use the non-static method getPrivacyPolicyInformation
-     *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
-     *                          ->getHelper('PrivacyStatusHelper')
-     *                          ->getPrivacyPolicyInformation(Factory::getApplication())
-     */
-    public static function getPrivacyPolicyInfo()
-    {
-        $app = Factory::getApplication();
-
-        return $app->bootModule('mod_privacy_status', 'administrator')
-                            ->getHelper('PrivacyStatusHelper')
-                            ->getPrivacyPolicyInformation($app);
-    }
-
-    /**
-     * Check whether there is a menu item for the request form
-     *
-     * @return  array  Array containing a status of whether a menu is published for the request form and its current link
-     *
-     * @since   4.0.0
-     *
-     * @deprecated 5.3.0 will be removed in 7.0
-     *             Use the non-static method getRequestFormMenuStatus
-     *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
-     *                          ->getHelper('PrivacyStatusHelper')
-     *                          ->getRequestFormMenuStatus(Factory::getApplication())
-     */
-    public static function getRequestFormPublished()
-    {
-        $app = Factory::getApplication();
-
-        return $app->bootModule('mod_privacy_status', 'administrator')
-                            ->getHelper('PrivacyStatusHelper')
-                            ->getRequestFormMenuStatus($app);
-    }
-
-    /**
-     * Method to return number privacy requests older than X days.
-     *
-     * @return  integer
-     *
-     * @since   4.0.0
-     *
-     * @deprecated 5.3.0 will be removed in 7.0
-     *             Use the non-static method getNumberOfUrgentRequests
-     *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
-     *                          ->getHelper('PrivacyStatusHelper')
-     *                          ->getNumberOfUrgentRequests()
-     */
-    public static function getNumberUrgentRequests()
-    {
-        return Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
-                            ->getHelper('PrivacyStatusHelper')
-                            ->getNumberOfUrgentRequests();
-    }
 }

administrator/modules/mod_sampledata/src/Helper/SampledataHelper.php

@@ -49,22 +49,4 @@ public function getSampledataList()
             )
             ->getArgument('result') ?? [];
     }
-
-    /**
-     * Get a list of sampledata.
-     *
-     * @return  mixed  An array of sampledata, or false on error.
-     *
-     * @since  3.8.0
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getSampledataList
-     *             Example: Factory::getApplication()->bootModule('mod_sampledata', 'administrator')
-     *                            ->getHelper('SampledataHelper')
-     *                            ->getSampledataList()
-     */
-    public static function getList()
-    {
-        return (new self())->getSampledataList();
-    }
 }

administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php

@@ -144,26 +144,4 @@ public function getStatsData(Registry $params, CMSApplication $app, DatabaseInte
 
         return $rows;
     }
-
-    /**
-     * Method to retrieve information about the site
-     *
-     * @param   Registry           $params  The module parameters
-     * @param   CMSApplication     $app     The application
-     * @param   DatabaseInterface  $db      The database
-     *
-     * @return  array  Array containing site information
-     *
-     * @since   3.0
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getStatsData
-     *             Example: Factory::getApplication()->bootModule('mod_stats_admin', 'administrator')
-     *                          ->getHelper('StatsAdminHelper')
-     *                          ->getStatsData($params, Factory::getApplication(), Factory::getContainer()->get(DatabaseInterface::class))
-     */
-    public static function getStats(Registry $params, CMSApplication $app, DatabaseInterface $db)
-    {
-        return (new self())->getStatsData($params, $app, $db);
-    }
 }

administrator/modules/mod_version/src/Helper/VersionHelper.php

@@ -36,20 +36,4 @@ public function getVersionString()
 
         return '‎' . $version->getShortVersion();
     }
-
-    /**
-     * Get the Joomla version number.
-     *
-     * @return  string  String containing the current Joomla version.
-     *
-     * @deprecated 5.1.0 will be removed in 7.0
-     *             Use the non-static method getVersionString
-     *             Example: Factory::getApplication()->bootModule('mod_version', 'administrator')
-     *                            ->getHelper('VersionHelper')
-     *                            ->getVersionString()
-     */
-    public static function getVersion()
-    {
-        return (new self())->getVersionString();
-    }
 }