From 3fa3de79f10ee5df83be2152caaac0d3f449b72c Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 31 Aug 2024 16:20:42 +0200 Subject: [PATCH] Release 5.2.0 Beta 2 --- .../src/Controller/AjaxController.php | 2 +- .../com_guidedtours/src/Model/TourModel.php | 2 +- .../src/Plugin/MediaActionPlugin.php | 4 ++-- administrator/manifests/files/joomla.xml | 2 +- components/com_tags/src/Service/Router.php | 4 ++-- .../src/Component/Router/Rules/MenuRules.php | 4 ++-- .../Extension/AbstractJoomlaUpdateEvent.php | 8 ++++---- .../Extension/AfterJoomlaUpdateEvent.php | 10 +++++----- .../Extension/BeforeJoomlaUpdateEvent.php | 2 +- .../Mail/BeforeRenderingMailTemplateEvent.php | 6 +++--- .../src/Event/Mail/MailTemplateEvent.php | 20 +++++++++---------- libraries/src/Version.php | 6 +++--- modules/mod_articles/services/provider.php | 2 +- .../src/Dispatcher/Dispatcher.php | 4 ++-- .../src/Helper/ArticlesHelper.php | 10 +++++----- .../actionlog/joomla/src/Extension/Joomla.php | 2 +- .../basic/src/Extension/Basic.php | 2 +- .../cookie/src/Extension/Cookie.php | 2 +- .../ldap/src/Extension/Ldap.php | 2 +- .../extension/finder/src/Extension/Finder.php | 2 +- .../extension/joomla/src/Extension/Joomla.php | 2 +- .../src/Extension/NamespaceMap.php | 2 +- .../categories/src/Extension/Categories.php | 2 +- .../contacts/src/Extension/Contacts.php | 2 +- .../newsfeeds/src/Extension/Newsfeeds.php | 2 +- plugins/finder/tags/src/Extension/Tags.php | 2 +- .../override/src/Extension/Override.php | 2 +- .../resize/src/Extension/Resize.php | 2 +- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/administrator/components/com_guidedtours/src/Controller/AjaxController.php b/administrator/components/com_guidedtours/src/Controller/AjaxController.php index 031a4af78e3ed..0dbf1929e04cb 100644 --- a/administrator/components/com_guidedtours/src/Controller/AjaxController.php +++ b/administrator/components/com_guidedtours/src/Controller/AjaxController.php @@ -23,7 +23,7 @@ /** * The guided tours controller for ajax requests. * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class AjaxController extends BaseController { diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php index 8cc0d50181c2d..6a869c32d2a1d 100644 --- a/administrator/components/com_guidedtours/src/Model/TourModel.php +++ b/administrator/components/com_guidedtours/src/Model/TourModel.php @@ -576,7 +576,7 @@ public function isAutostart($pk): bool * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function saveTourUserState($id, $state = ''): bool { diff --git a/administrator/components/com_media/src/Plugin/MediaActionPlugin.php b/administrator/components/com_media/src/Plugin/MediaActionPlugin.php index d5b25a48b9b53..97aa5256e1776 100644 --- a/administrator/components/com_media/src/Plugin/MediaActionPlugin.php +++ b/administrator/components/com_media/src/Plugin/MediaActionPlugin.php @@ -40,7 +40,7 @@ class MediaActionPlugin extends CMSPlugin * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { @@ -57,7 +57,7 @@ public static function getSubscribedEvents(): array * * @return void * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function onContentPrepareFormListener(PrepareFormEvent $event): void { diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 5e9944f19b0f4..9a7b873698a63 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 5.2.0-beta2-dev + 5.2.0-beta2 2024-09 FILES_JOOMLA_XML_DESCRIPTION diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php index 6d9fe00b95791..e96b23363f43e 100644 --- a/components/com_tags/src/Service/Router.php +++ b/components/com_tags/src/Service/Router.php @@ -53,8 +53,8 @@ class Router extends RouterBase * System - SEF Plugin parameters * * @var Registry - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 * without replacement */ private $sefparams; diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index 200b00d0d83ba..9fc82938f5e61 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -46,8 +46,8 @@ class MenuRules implements RulesInterface * System - SEF Plugin parameters * * @var Registry - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 * without replacement */ private $sefparams; diff --git a/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php b/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php index dd63377a7cd2b..5501f55316de2 100644 --- a/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php +++ b/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php @@ -19,7 +19,7 @@ /** * Base class for Joomla Update events * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ abstract class AbstractJoomlaUpdateEvent extends AbstractImmutableEvent { @@ -30,8 +30,8 @@ abstract class AbstractJoomlaUpdateEvent extends AbstractImmutableEvent * * @var array * - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 */ protected $legacyArgumentsOrder = []; @@ -41,7 +41,7 @@ abstract class AbstractJoomlaUpdateEvent extends AbstractImmutableEvent * @param string $name The event name. * @param array $arguments The event arguments. * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function __construct($name, array $arguments = []) { diff --git a/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php b/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php index 46672bbec59de..cb8642c977e93 100644 --- a/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php +++ b/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php @@ -16,7 +16,7 @@ /** * Class for Joomla Update events * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class AfterJoomlaUpdateEvent extends AbstractJoomlaUpdateEvent { @@ -25,8 +25,8 @@ class AfterJoomlaUpdateEvent extends AbstractJoomlaUpdateEvent * * @var array * - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 */ protected $legacyArgumentsOrder = ['oldVersion']; @@ -37,7 +37,7 @@ class AfterJoomlaUpdateEvent extends AbstractJoomlaUpdateEvent * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function onSetOldVersion(?string $value): string { @@ -49,7 +49,7 @@ protected function onSetOldVersion(?string $value): string * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function getOldVersion(): string { diff --git a/libraries/src/Event/Extension/BeforeJoomlaUpdateEvent.php b/libraries/src/Event/Extension/BeforeJoomlaUpdateEvent.php index 635cee88ebc26..c708a6474e44c 100644 --- a/libraries/src/Event/Extension/BeforeJoomlaUpdateEvent.php +++ b/libraries/src/Event/Extension/BeforeJoomlaUpdateEvent.php @@ -16,7 +16,7 @@ /** * Class for Joomla Update events * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class BeforeJoomlaUpdateEvent extends AbstractJoomlaUpdateEvent { diff --git a/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php b/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php index 438e0e9d30dff..34d1588f279a7 100644 --- a/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php +++ b/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php @@ -14,7 +14,7 @@ * Example: * new BeforeRenderingMailTemplateEvent('onEventName', ['templateId' => 'com_example.template', 'subject' => $mailTemplateInstance]); * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class BeforeRenderingMailTemplateEvent extends MailTemplateEvent { @@ -23,8 +23,8 @@ class BeforeRenderingMailTemplateEvent extends MailTemplateEvent * * @var array * - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 */ protected $legacyArgumentsOrder = ['templateId', 'subject']; } diff --git a/libraries/src/Event/Mail/MailTemplateEvent.php b/libraries/src/Event/Mail/MailTemplateEvent.php index 57719d3c40adc..33092ece15aca 100644 --- a/libraries/src/Event/Mail/MailTemplateEvent.php +++ b/libraries/src/Event/Mail/MailTemplateEvent.php @@ -20,7 +20,7 @@ /** * Base class for MailTemplate events * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ abstract class MailTemplateEvent extends AbstractImmutableEvent { @@ -31,8 +31,8 @@ abstract class MailTemplateEvent extends AbstractImmutableEvent * * @var array * - * @since __DEPLOY_VERSION__ - * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 + * @since 5.2.0 + * @deprecated 5.2.0 will be removed in 6.0 */ protected $legacyArgumentsOrder = []; @@ -44,7 +44,7 @@ abstract class MailTemplateEvent extends AbstractImmutableEvent * * @throws \BadMethodCallException * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function __construct($name, array $arguments = []) { @@ -71,7 +71,7 @@ public function __construct($name, array $arguments = []) * * @return MailTemplate * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function onSetSubject(MailTemplate $value): MailTemplate { @@ -85,7 +85,7 @@ protected function onSetSubject(MailTemplate $value): MailTemplate * * @return MailTemplate * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function onGetSubject(MailTemplate $value): MailTemplate { @@ -99,7 +99,7 @@ protected function onGetSubject(MailTemplate $value): MailTemplate * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function onSetTemplateId(string $value): string { @@ -113,7 +113,7 @@ protected function onSetTemplateId(string $value): string * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function onGetTemplateId(string $value): string { @@ -125,7 +125,7 @@ protected function onGetTemplateId(string $value): string * * @return MailTemplate * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function getTemplate(): MailTemplate { @@ -137,7 +137,7 @@ public function getTemplate(): MailTemplate * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function getTemplateId(): string { diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 1d983eabca258..0d90019f5e569 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = 'beta2-dev'; + public const EXTRA_VERSION = 'beta2'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Development'; + public const DEV_STATUS = 'Beta'; /** * Code name. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '17:00'; + public const RELTIME = '00:00'; /** * Release timezone. diff --git a/modules/mod_articles/services/provider.php b/modules/mod_articles/services/provider.php index f1dabc182809a..23aec5fe033a8 100644 --- a/modules/mod_articles/services/provider.php +++ b/modules/mod_articles/services/provider.php @@ -19,7 +19,7 @@ /** * The articles module service provider. * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ return new class () implements ServiceProviderInterface { /** diff --git a/modules/mod_articles/src/Dispatcher/Dispatcher.php b/modules/mod_articles/src/Dispatcher/Dispatcher.php index a63bf8fa43eb4..f3c93d9c25289 100644 --- a/modules/mod_articles/src/Dispatcher/Dispatcher.php +++ b/modules/mod_articles/src/Dispatcher/Dispatcher.php @@ -22,7 +22,7 @@ /** * Dispatcher class for mod_articles * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface { @@ -33,7 +33,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ protected function getLayoutData(): array { diff --git a/modules/mod_articles/src/Helper/ArticlesHelper.php b/modules/mod_articles/src/Helper/ArticlesHelper.php index 734c9c2c8fa9c..cf737adb0180e 100644 --- a/modules/mod_articles/src/Helper/ArticlesHelper.php +++ b/modules/mod_articles/src/Helper/ArticlesHelper.php @@ -32,7 +32,7 @@ /** * Helper for mod_articles * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ class ArticlesHelper implements DatabaseAwareInterface { @@ -46,7 +46,7 @@ class ArticlesHelper implements DatabaseAwareInterface * * @return object[] * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function getArticles(Registry $params, SiteApplication $app) { @@ -331,7 +331,7 @@ public function getArticles(Registry $params, SiteApplication $app) * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function groupBy($list, $fieldName, $direction, $fieldNameToKeep = null) { @@ -375,7 +375,7 @@ public static function groupBy($list, $fieldName, $direction, $fieldNameToKeep = * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function groupByDate($list, $direction = 'ksort', $type = 'year', $monthYearFormat = 'F Y', $field = 'created') { @@ -438,7 +438,7 @@ public static function groupByDate($list, $direction = 'ksort', $type = 'year', * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function groupByTags($list, $direction = 'ksort') { diff --git a/plugins/actionlog/joomla/src/Extension/Joomla.php b/plugins/actionlog/joomla/src/Extension/Joomla.php index 4c407485209e3..be2683ae77b98 100644 --- a/plugins/actionlog/joomla/src/Extension/Joomla.php +++ b/plugins/actionlog/joomla/src/Extension/Joomla.php @@ -1311,7 +1311,7 @@ public function onUserBeforeSave(User\BeforeSaveEvent $event): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function onBeforeTourSaveUserState(AbstractEvent $event): void { diff --git a/plugins/api-authentication/basic/src/Extension/Basic.php b/plugins/api-authentication/basic/src/Extension/Basic.php index 2ed6bfba5a4a2..8ba09c79310be 100644 --- a/plugins/api-authentication/basic/src/Extension/Basic.php +++ b/plugins/api-authentication/basic/src/Extension/Basic.php @@ -37,7 +37,7 @@ final class Basic extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/authentication/cookie/src/Extension/Cookie.php b/plugins/authentication/cookie/src/Extension/Cookie.php index 4be82698a48d4..8d9d8993c50d7 100644 --- a/plugins/authentication/cookie/src/Extension/Cookie.php +++ b/plugins/authentication/cookie/src/Extension/Cookie.php @@ -45,7 +45,7 @@ final class Cookie extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/authentication/ldap/src/Extension/Ldap.php b/plugins/authentication/ldap/src/Extension/Ldap.php index f0084cb1fee8d..ece6caa677971 100644 --- a/plugins/authentication/ldap/src/Extension/Ldap.php +++ b/plugins/authentication/ldap/src/Extension/Ldap.php @@ -64,7 +64,7 @@ public function __construct(LdapFactoryInterface $factory, DispatcherInterface $ * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/extension/finder/src/Extension/Finder.php b/plugins/extension/finder/src/Extension/Finder.php index 16ef01c32cfb2..05acb5071e935 100644 --- a/plugins/extension/finder/src/Extension/Finder.php +++ b/plugins/extension/finder/src/Extension/Finder.php @@ -39,7 +39,7 @@ final class Finder extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/extension/joomla/src/Extension/Joomla.php b/plugins/extension/joomla/src/Extension/Joomla.php index b98e8f8c8e875..48c30a1a2df5b 100644 --- a/plugins/extension/joomla/src/Extension/Joomla.php +++ b/plugins/extension/joomla/src/Extension/Joomla.php @@ -61,7 +61,7 @@ final class Joomla extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/extension/namespacemap/src/Extension/NamespaceMap.php b/plugins/extension/namespacemap/src/Extension/NamespaceMap.php index c5e60266ad6c7..aa3fe2613ce26 100644 --- a/plugins/extension/namespacemap/src/Extension/NamespaceMap.php +++ b/plugins/extension/namespacemap/src/Extension/NamespaceMap.php @@ -58,7 +58,7 @@ public function __construct(DispatcherInterface $dispatcher, \JNamespacePsr4Map * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/finder/categories/src/Extension/Categories.php b/plugins/finder/categories/src/Extension/Categories.php index 1f02269d919f6..d478fddcc75a2 100644 --- a/plugins/finder/categories/src/Extension/Categories.php +++ b/plugins/finder/categories/src/Extension/Categories.php @@ -96,7 +96,7 @@ final class Categories extends Adapter implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/finder/contacts/src/Extension/Contacts.php b/plugins/finder/contacts/src/Extension/Contacts.php index 7c517290cb035..71759b965dd0c 100644 --- a/plugins/finder/contacts/src/Extension/Contacts.php +++ b/plugins/finder/contacts/src/Extension/Contacts.php @@ -96,7 +96,7 @@ final class Contacts extends Adapter implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php index 9105582877abb..120476d9b3279 100644 --- a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php +++ b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php @@ -96,7 +96,7 @@ final class Newsfeeds extends Adapter implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/finder/tags/src/Extension/Tags.php b/plugins/finder/tags/src/Extension/Tags.php index 28709a8272236..d75848e0ea582 100644 --- a/plugins/finder/tags/src/Extension/Tags.php +++ b/plugins/finder/tags/src/Extension/Tags.php @@ -96,7 +96,7 @@ final class Tags extends Adapter implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/installer/override/src/Extension/Override.php b/plugins/installer/override/src/Extension/Override.php index e2a10231d58d1..6cf60631e1d96 100644 --- a/plugins/installer/override/src/Extension/Override.php +++ b/plugins/installer/override/src/Extension/Override.php @@ -44,7 +44,7 @@ final class Override extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/media-action/resize/src/Extension/Resize.php b/plugins/media-action/resize/src/Extension/Resize.php index e3218ca98d5f8..38030498de15a 100644 --- a/plugins/media-action/resize/src/Extension/Resize.php +++ b/plugins/media-action/resize/src/Extension/Resize.php @@ -31,7 +31,7 @@ final class Resize extends MediaActionPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public static function getSubscribedEvents(): array {