Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-08-20

Bodge-IT · Bodge-IT · commit 927281e643c5 · 2025-08-20T07:38:55.000+01:00
diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
@@ -46,7 +46,7 @@ abstract class FieldsPlugin extends CMSPlugin
      * @var    \Joomla\CMS\Application\CMSApplication
      * @since  4.0.0
      *
-     * @deprecated  6.0.0 will be removed in 7.0 use $this->getApplication() instead
+     * @deprecated  5.4.0 will be removed in 7.0 use $this->getApplication() instead
      */
     protected $app;
 
diff --git a/administrator/modules/mod_latest/services/provider.php b/administrator/modules/mod_latest/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The latest articles module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/administrator/modules/mod_latest/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_latest/src/Dispatcher/Dispatcher.php
@@ -24,7 +24,7 @@
 /**
  * Dispatcher class for mod_latest
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
diff --git a/administrator/modules/mod_latest/src/Helper/LatestHelper.php b/administrator/modules/mod_latest/src/Helper/LatestHelper.php
@@ -37,7 +37,7 @@ class LatestHelper
      *
      * @return  mixed  An array of articles, or false on error.
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function getArticles(Registry $params, ArticlesModel $model, CMSApplicationInterface $app): mixed
     {
@@ -115,7 +115,7 @@ public function getArticles(Registry $params, ArticlesModel $model, CMSApplicati
      *
      * @return  string  The alternate title for the module.
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function getModuleTitle(Registry $params, CMSApplicationInterface $app): string
     {
@@ -148,7 +148,7 @@ public function getModuleTitle(Registry $params, CMSApplicationInterface $app):
      *
      * @return  mixed  An array of articles, or false on error.
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @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')
@@ -166,7 +166,7 @@ public static function getList(Registry $params, ArticlesModel $model)
      *
      * @return  string  The alternate title for the module.
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @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')
diff --git a/administrator/modules/mod_logged/services/provider.php b/administrator/modules/mod_logged/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The logged-in users module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/administrator/modules/mod_logged/src/Helper/LoggedHelper.php b/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
@@ -37,7 +37,7 @@ class LoggedHelper
      *
      * @return  mixed  An array of users, or false on error.
      *
-     * @since   6.0.0
+     * @since   5.4.0
      *
      * @throws  \RuntimeException
      */
@@ -82,7 +82,7 @@ public function getUsers(Registry $params, CMSApplication $app, DatabaseInterfac
      *
      * @param   Registry  $params  The module parameters.
      *
-     * @since   6.0.0
+     * @since   5.4.0
      *
      * @return  string    The alternate title for the module.
      */
@@ -102,7 +102,7 @@ public function getModuleTitle($params): string
      *
      * @throws  \RuntimeException
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @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')
@@ -120,7 +120,7 @@ public static function getList(Registry $params, CMSApplication $app, DatabaseIn
      *
      * @return  string    The alternate title for the module.
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @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')
diff --git a/administrator/modules/mod_privacy_dashboard/services/provider.php b/administrator/modules/mod_privacy_dashboard/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The privacy dashboard module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/administrator/modules/mod_privacy_dashboard/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_privacy_dashboard/src/Dispatcher/Dispatcher.php
@@ -23,7 +23,7 @@
 /**
  * Dispatcher class for mod_privacy_dashboard
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -34,7 +34,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function dispatch()
     {
@@ -97,7 +97,7 @@ public function dispatch()
      *
      * @return  array
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     protected function getLayoutData()
     {
diff --git a/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php b/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
@@ -33,7 +33,7 @@ class PrivacyDashboardHelper implements DatabaseAwareInterface
      *
      * @return  array  Array containing site privacy requests
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function getPrivacyRequests(): array
     {
@@ -66,7 +66,7 @@ public function getPrivacyRequests(): array
      *
      * @since   3.9.0
      *
-     * @deprecated 6.0.0 will be removed in 7.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')
diff --git a/administrator/modules/mod_submenu/services/provider.php b/administrator/modules/mod_submenu/services/provider.php
@@ -18,7 +18,7 @@
 /**
  * The administrator dashboard menu module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -28,7 +28,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/administrator/modules/mod_submenu/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_submenu/src/Dispatcher/Dispatcher.php
@@ -21,7 +21,7 @@
 /**
  * Dispatcher class for mod_submenu
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher
 {
@@ -30,7 +30,7 @@ class Dispatcher extends AbstractModuleDispatcher
      *
      * @return  array
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     protected function getLayoutData()
     {
diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
@@ -306,7 +306,7 @@ public function delete()
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function disableAutomatedUpdates()
     {
diff --git a/installation/src/Model/AutomatedUpdatesModel.php b/installation/src/Model/AutomatedUpdatesModel.php
@@ -22,14 +22,14 @@
 /**
  * Automated Updates model for the Joomla Core Installer.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class AutomatedUpdatesModel extends BaseInstallationModel implements DatabaseAwareInterface
 {
     use DatabaseAwareTrait;
 
     /**
-     * @since  6.0.0
+     * @since  5.4.0
      */
     public function __construct()
     {
@@ -45,7 +45,7 @@ public function __construct()
     /**
      * Opt out from automated Updates
      *
-     * @since  6.0.0
+     * @since  5.4.0
      */
     public function disable()
     {
diff --git a/modules/mod_finder/services/provider.php b/modules/mod_finder/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The finder module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/modules/mod_finder/src/Dispatcher/Dispatcher.php b/modules/mod_finder/src/Dispatcher/Dispatcher.php
@@ -27,7 +27,7 @@
 /**
  * Dispatcher class for mod_finder
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -38,7 +38,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  array
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     protected function getLayoutData()
     {
diff --git a/modules/mod_finder/src/Helper/FinderHelper.php b/modules/mod_finder/src/Helper/FinderHelper.php
@@ -42,7 +42,7 @@ class FinderHelper implements DatabaseAwareInterface
      *
      * @return  string  A string of hidden input form fields
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function getHiddenFields($route = null): string
     {
@@ -66,7 +66,7 @@ public function getHiddenFields($route = null): string
      *
      * @return  Query object
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function getSearchQuery(Registry $params, CMSApplicationInterface $app): Query
     {
@@ -98,7 +98,7 @@ public function getSearchQuery(Registry $params, CMSApplicationInterface $app):
      *
      * @since   2.5
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @deprecated 5.4.0 will be removed in 7.0
      *             Use the non-static method getFields
      *             Example: Factory::getApplication()->bootModule('mod_finder', 'site')
      *                          ->getHelper('FinderHelper')
@@ -118,7 +118,7 @@ public static function getGetFields($route = null, $paramItem = 0)
      *
      * @since   2.5
      *
-     * @deprecated 6.0.0 will be removed in 7.0
+     * @deprecated 5.4.0 will be removed in 7.0
      *             Use the non-static method getSearchQuery
      *             Example: Factory::getApplication()->bootModule('mod_finder', 'site')
      *                          ->getHelper('FinderHelper')
diff --git a/modules/mod_login/services/provider.php b/modules/mod_login/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The login module service provider.
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function register(Container $container)
     {
diff --git a/modules/mod_login/src/Dispatcher/Dispatcher.php b/modules/mod_login/src/Dispatcher/Dispatcher.php
@@ -23,7 +23,7 @@
 /**
  * Dispatcher class for mod_login
  *
- * @since  6.0.0
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -34,7 +34,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  void
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     public function dispatch()
     {
@@ -80,7 +80,7 @@ public function dispatch()
      *
      * @return  array
      *
-     * @since   6.0.0
+     * @since   5.4.0
      */
     protected function getLayoutData()
     {
diff --git a/modules/mod_login/src/Helper/LoginHelper.php b/modules/mod_login/src/Helper/LoginHelper.php
diff --git a/modules/mod_menu/services/provider.php b/modules/mod_menu/services/provider.php
diff --git a/modules/mod_menu/src/Dispatcher/Dispatcher.php b/modules/mod_menu/src/Dispatcher/Dispatcher.php
diff --git a/modules/mod_menu/src/Helper/MenuHelper.php b/modules/mod_menu/src/Helper/MenuHelper.php
diff --git a/modules/mod_whosonline/services/provider.php b/modules/mod_whosonline/services/provider.php
diff --git a/modules/mod_whosonline/src/Dispatcher/Dispatcher.php b/modules/mod_whosonline/src/Dispatcher/Dispatcher.php
diff --git a/modules/mod_whosonline/src/Helper/WhosonlineHelper.php b/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ abstract class FieldsPlugin extends CMSPlugin`
`46`	`46`	`* @var \Joomla\CMS\Application\CMSApplication`
`47`	`47`	`* @since 4.0.0`
`48`	`48`	`*`
`49`		`- * @deprecated 6.0.0 will be removed in 7.0 use $this->getApplication() instead`
	`49`	`+ * @deprecated 5.4.0 will be removed in 7.0 use $this->getApplication() instead`
`50`	`50`	`*/`
`51`	`51`	`protected $app;`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`/**`
`20`	`20`	`* The latest articles module service provider.`
`21`	`21`	`*`
`22`		`- * @since 6.0.0`
	`22`	`+ * @since 5.4.0`
`23`	`23`	`*/`
`24`	`24`	`return new class () implements ServiceProviderInterface {`
`25`	`25`	`/**`
`@@ -29,7 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`* @return void`
`31`	`31`	`*`
`32`		`- * @since 6.0.0`
	`32`	`+ * @since 5.4.0`
`33`	`33`	`*/`
`34`	`34`	`public function register(Container $container)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`/**`
`25`	`25`	`* Dispatcher class for mod_latest`
`26`	`26`	`*`
`27`		`- * @since 6.0.0`
	`27`	`+ * @since 5.4.0`
`28`	`28`	`*/`
`29`	`29`	`class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class LatestHelper`
`37`	`37`	`*`
`38`	`38`	`* @return mixed An array of articles, or false on error.`
`39`	`39`	`*`
`40`		`- * @since 6.0.0`
	`40`	`+ * @since 5.4.0`
`41`	`41`	`*/`
`42`	`42`	`public function getArticles(Registry $params, ArticlesModel $model, CMSApplicationInterface $app): mixed`
`43`	`43`	`{`
`@@ -115,7 +115,7 @@ public function getArticles(Registry $params, ArticlesModel $model, CMSApplicati`
`115`	`115`	`*`
`116`	`116`	`* @return string The alternate title for the module.`
`117`	`117`	`*`
`118`		`- * @since 6.0.0`
	`118`	`+ * @since 5.4.0`
`119`	`119`	`*/`
`120`	`120`	`public function getModuleTitle(Registry $params, CMSApplicationInterface $app): string`
`121`	`121`	`{`
`@@ -148,7 +148,7 @@ public function getModuleTitle(Registry $params, CMSApplicationInterface $app):`
`148`	`148`	`*`
`149`	`149`	`* @return mixed An array of articles, or false on error.`
`150`	`150`	`*`
`151`		`- * @deprecated 6.0.0 will be removed in 7.0`
	`151`	`+ * @deprecated 5.4.0 will be removed in 7.0`
`152`	`152`	`* Use the non-static method getArticles`
`153`	`153`	`* Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')`
`154`	`154`	`* ->getHelper('LatestHelper')`
`@@ -166,7 +166,7 @@ public static function getList(Registry $params, ArticlesModel $model)`
`166`	`166`	`*`
`167`	`167`	`* @return string The alternate title for the module.`
`168`	`168`	`*`
`169`		`- * @deprecated 6.0.0 will be removed in 7.0`
	`169`	`+ * @deprecated 5.4.0 will be removed in 7.0`
`170`	`170`	`* Use the non-static method getModuleTitle`
`171`	`171`	`* Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')`
`172`	`172`	`* ->getHelper('LatestHelper')`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class LoggedHelper`
`37`	`37`	`*`
`38`	`38`	`* @return mixed An array of users, or false on error.`
`39`	`39`	`*`
`40`		`- * @since 6.0.0`
	`40`	`+ * @since 5.4.0`
`41`	`41`	`*`
`42`	`42`	`* @throws \RuntimeException`
`43`	`43`	`*/`
`@@ -82,7 +82,7 @@ public function getUsers(Registry $params, CMSApplication $app, DatabaseInterfac`
`82`	`82`	`*`
`83`	`83`	`* @param Registry $params The module parameters.`
`84`	`84`	`*`
`85`		`- * @since 6.0.0`
	`85`	`+ * @since 5.4.0`
`86`	`86`	`*`
`87`	`87`	`* @return string The alternate title for the module.`
`88`	`88`	`*/`
`@@ -102,7 +102,7 @@ public function getModuleTitle($params): string`
`102`	`102`	`*`
`103`	`103`	`* @throws \RuntimeException`
`104`	`104`	`*`
`105`		`- * @deprecated 6.0.0 will be removed in 7.0`
	`105`	`+ * @deprecated 5.4.0 will be removed in 7.0`
`106`	`106`	`* Use the non-static method getUsers`
`107`	`107`	`* Example: Factory::getApplication()->bootModule('mod_logged', 'administrator')`
`108`	`108`	`* ->getHelper('LoggedHelper')`
`@@ -120,7 +120,7 @@ public static function getList(Registry $params, CMSApplication $app, DatabaseIn`
`120`	`120`	`*`
`121`	`121`	`* @return string The alternate title for the module.`
`122`	`122`	`*`
`123`		`- * @deprecated 6.0.0 will be removed in 7.0`
	`123`	`+ * @deprecated 5.4.0 will be removed in 7.0`
`124`	`124`	`* Use the non-static method getModuleTitle`
`125`	`125`	`* Example: Factory::getApplication()->bootModule('mod_logged', 'administrator')`
`126`	`126`	`* ->getHelper('LoggedHelper')`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`/**`
`24`	`24`	`* Dispatcher class for mod_privacy_dashboard`
`25`	`25`	`*`
`26`		`- * @since 6.0.0`
	`26`	`+ * @since 5.4.0`
`27`	`27`	`*/`
`28`	`28`	`class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface`
`29`	`29`	`{`
`@@ -34,7 +34,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI`
`34`	`34`	`*`
`35`	`35`	`* @return void`
`36`	`36`	`*`
`37`		`- * @since 6.0.0`
	`37`	`+ * @since 5.4.0`
`38`	`38`	`*/`
`39`	`39`	`public function dispatch()`
`40`	`40`	`{`
`@@ -97,7 +97,7 @@ public function dispatch()`
`97`	`97`	`*`
`98`	`98`	`* @return array`
`99`	`99`	`*`
`100`		`- * @since 6.0.0`
	`100`	`+ * @since 5.4.0`
`101`	`101`	`*/`
`102`	`102`	`protected function getLayoutData()`
`103`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class PrivacyDashboardHelper implements DatabaseAwareInterface`
`33`	`33`	`*`
`34`	`34`	`* @return array Array containing site privacy requests`
`35`	`35`	`*`
`36`		`- * @since 6.0.0`
	`36`	`+ * @since 5.4.0`
`37`	`37`	`*/`
`38`	`38`	`public function getPrivacyRequests(): array`
`39`	`39`	`{`
`@@ -66,7 +66,7 @@ public function getPrivacyRequests(): array`
`66`	`66`	`*`
`67`	`67`	`* @since 3.9.0`
`68`	`68`	`*`
`69`		`- * @deprecated 6.0.0 will be removed in 7.0`
	`69`	`+ * @deprecated 5.4.0 will be removed in 7.0`
`70`	`70`	`* Use the non-static method getPrivacyRequests`
`71`	`71`	`* Example: Factory::getApplication()->bootModule('mod_privacy_dashboard', 'administrator')`
`72`	`72`	`* ->getHelper('PrivacyDashboardHelper')`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`/**`
`19`	`19`	`* The administrator dashboard menu module service provider.`
`20`	`20`	`*`
`21`		`- * @since 6.0.0`
	`21`	`+ * @since 5.4.0`
`22`	`22`	`*/`
`23`	`23`	`return new class () implements ServiceProviderInterface {`
`24`	`24`	`/**`
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @return void`
`30`	`30`	`*`
`31`		`- * @since 6.0.0`
	`31`	`+ * @since 5.4.0`
`32`	`32`	`*/`
`33`	`33`	`public function register(Container $container)`
`34`	`34`	`{`