From 1ba9d23f54b2b3c4d6dc816b8de06564ba0955b9 Mon Sep 17 00:00:00 2001 From: Martina Scholz <64533137+LadySolveig@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:09:40 +0100 Subject: [PATCH] Joomla! 5.1.0 Alpha 4 with security patches --- .../com_guidedtours/src/Extension/GuidedtoursComponent.php | 4 ++-- .../components/com_guidedtours/src/Table/StepTable.php | 2 +- .../com_installer/src/Controller/ManageController.php | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 6 +++--- libraries/src/WebAsset/WebAssetManager.php | 4 ++-- modules/mod_banners/services/provider.php | 4 ++-- modules/mod_banners/src/Dispatcher/Dispatcher.php | 4 ++-- modules/mod_banners/src/Helper/BannersHelper.php | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/administrator/components/com_guidedtours/src/Extension/GuidedtoursComponent.php b/administrator/components/com_guidedtours/src/Extension/GuidedtoursComponent.php index b043f9868e192..088246bc28d48 100644 --- a/administrator/components/com_guidedtours/src/Extension/GuidedtoursComponent.php +++ b/administrator/components/com_guidedtours/src/Extension/GuidedtoursComponent.php @@ -103,14 +103,14 @@ class GuidedtoursComponent extends MVCComponent implements BootableExtensionInte /** * An interactive step for checkbox/radio fields * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public const STEP_INTERACTIVETYPE_CHECKBOX_RADIO = 5; /** * An interactive step for select element fields * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public const STEP_INTERACTIVETYPE_SELECT = 6; diff --git a/administrator/components/com_guidedtours/src/Table/StepTable.php b/administrator/components/com_guidedtours/src/Table/StepTable.php index 5a6d21281554d..0af696921e63c 100644 --- a/administrator/components/com_guidedtours/src/Table/StepTable.php +++ b/administrator/components/com_guidedtours/src/Table/StepTable.php @@ -62,7 +62,7 @@ public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher * @return mixed Null if operation was satisfactory, otherwise returns an error * * @see Table::bind() - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public function bind($array, $ignore = '') { diff --git a/administrator/components/com_installer/src/Controller/ManageController.php b/administrator/components/com_installer/src/Controller/ManageController.php index 9ebb2c1856b1c..bfbc9c1895378 100644 --- a/administrator/components/com_installer/src/Controller/ManageController.php +++ b/administrator/components/com_installer/src/Controller/ManageController.php @@ -181,7 +181,7 @@ public function loadChangelog() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public function loadChangelogRaw() { diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 5abad2c733dae..2ae768b53ce8e 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 51bdef13f0398..81c26d5ae956c 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 7b91b5f6ad881..330c01de56df9 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 5.1.0-alpha4-dev - 2024-01 + 5.1.0-alpha4 + 2024-02 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 6af362b538163..eb67d5684a636 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 5.1.0.1 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index eba932fdb41e2..f8abbed399ef0 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index e4eb9486aa534..2074a4f00f97a 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index 3edfc06cdd182..de080eb1b8cfb 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (United Kingdom) 5.1.0 - 2024-01 + 2024-02 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 45ecece38d41c..db5f1ab153576 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 4eb97a5ec157d..5951b9a61451e 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.1.0 - 2024-01 + 2024-02 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 184790dccd677..f5932c97f61e4 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 = 'alpha4-dev'; + public const EXTRA_VERSION = 'alpha4'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Development'; + public const DEV_STATUS = 'Alpha'; /** * Code name. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '23-January-2024'; + public const RELDATE = '20-February-2024'; /** * Release time. diff --git a/libraries/src/WebAsset/WebAssetManager.php b/libraries/src/WebAsset/WebAssetManager.php index 9772c5156b348..d3fda5ee2b98a 100644 --- a/libraries/src/WebAsset/WebAssetManager.php +++ b/libraries/src/WebAsset/WebAssetManager.php @@ -114,7 +114,7 @@ class WebAssetManager implements WebAssetManagerInterface * * @var array * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ protected $sortedAssets = []; @@ -1026,7 +1026,7 @@ protected function getDependenciesForAsset( * * @return array Array of object ids for which callback was called * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public static function callOnAttachCallback(array $assets, Document $document, array $cache = []): array { diff --git a/modules/mod_banners/services/provider.php b/modules/mod_banners/services/provider.php index 9fcd6f7121552..3e78536b3071d 100644 --- a/modules/mod_banners/services/provider.php +++ b/modules/mod_banners/services/provider.php @@ -19,7 +19,7 @@ /** * The banners module service provider. * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ return new class () implements ServiceProviderInterface { /** @@ -29,7 +29,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public function register(Container $container): void { diff --git a/modules/mod_banners/src/Dispatcher/Dispatcher.php b/modules/mod_banners/src/Dispatcher/Dispatcher.php index 9e2c3beb9c2c0..dcad4f9f481a4 100644 --- a/modules/mod_banners/src/Dispatcher/Dispatcher.php +++ b/modules/mod_banners/src/Dispatcher/Dispatcher.php @@ -22,7 +22,7 @@ /** * Dispatcher class for mod_banners * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface { @@ -33,7 +33,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI * * @return array * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ protected function getLayoutData(): array { diff --git a/modules/mod_banners/src/Helper/BannersHelper.php b/modules/mod_banners/src/Helper/BannersHelper.php index 737981e442c41..fd34cfe1cae9c 100644 --- a/modules/mod_banners/src/Helper/BannersHelper.php +++ b/modules/mod_banners/src/Helper/BannersHelper.php @@ -35,7 +35,7 @@ class BannersHelper * * @return mixed * - * @since __DEPLOY_VERSION__ + * @since 5.1.0 */ public function getBanners(Registry $params, CMSApplication $app) { @@ -76,7 +76,7 @@ public function getBanners(Registry $params, CMSApplication $app) * * @since 1.5 * - * @deprecated __DEPLOY_VERSION__ will be removed in 7.0 + * @deprecated 5.1.0 will be removed in 7.0 * Use the non-static method getBanners * Example: Factory::getApplication()->bootModule('mod_banners', 'site') * ->getHelper('BannersHelper')