From 64dffed5f1d4b8f57f9f49c3cf03f35440ab8499 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 13 Sep 2024 15:24:04 +0200 Subject: [PATCH] Release Joomla! 5.2.0 Beta 3 --- .../components/com_scheduler/src/Model/TaskModel.php | 8 ++++---- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Event/User/AbstractLoginEvent.php | 2 +- libraries/src/Event/User/AbstractLogoutEvent.php | 2 +- libraries/src/Version.php | 6 +++--- plugins/system/guidedtours/src/Extension/GuidedTours.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/administrator/components/com_scheduler/src/Model/TaskModel.php b/administrator/components/com_scheduler/src/Model/TaskModel.php index 126355213878a..dbd73a825b0db 100644 --- a/administrator/components/com_scheduler/src/Model/TaskModel.php +++ b/administrator/components/com_scheduler/src/Model/TaskModel.php @@ -415,7 +415,7 @@ public function getTask(array $options = []): ?\stdClass * * @param \JDatabaseDriver $db The database driver to use. * @return bool True if there are running tasks, false otherwise. - * @since __DEPLOY_VERSION__ + * @since 4.4.9 */ private function hasRunningTasks($db): bool { @@ -445,7 +445,7 @@ private function hasRunningTasks($db): bool * - allowDisabled: Whether to allow disabled tasks. * - id: The ID of the task. * @return Query The lock query. - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ private function buildLockQuery($db, $now, $options) { @@ -489,7 +489,7 @@ static function (TaskOption $taskOption): string { * - allowDisabled: Whether to allow disabled tasks. * @return array The ID of the next task, or an empty array if no task is found. * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 * @throws \RuntimeException If there is an error executing the query. */ private function getNextTaskId($db, $now, $options) @@ -537,7 +537,7 @@ static function (TaskOption $taskOption): string { * @param \JDatabaseDriver $db The database driver to use. * @param string $now The current time in the database's time format. * @return \stdClass|null The fetched task object, or null if no task was found. - * @since __DEPLOY_VERSION__ + * @since 5.2.0 * @throws \RuntimeException If there was an error executing the query. */ private function fetchTask($db, $now): ?\stdClass diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index e217e740f80ef..788fe4322e1f9 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-beta3-dev + 5.2.0-beta3 2024-09 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Event/User/AbstractLoginEvent.php b/libraries/src/Event/User/AbstractLoginEvent.php index 799be7a5c712d..346f5ae57b9f5 100644 --- a/libraries/src/Event/User/AbstractLoginEvent.php +++ b/libraries/src/Event/User/AbstractLoginEvent.php @@ -38,7 +38,7 @@ abstract class AbstractLoginEvent extends UserEvent * * @throws \BadMethodCallException * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function __construct($name, array $arguments = []) { diff --git a/libraries/src/Event/User/AbstractLogoutEvent.php b/libraries/src/Event/User/AbstractLogoutEvent.php index 3c4c36783b12f..dab05e4bdb5b1 100644 --- a/libraries/src/Event/User/AbstractLogoutEvent.php +++ b/libraries/src/Event/User/AbstractLogoutEvent.php @@ -38,7 +38,7 @@ abstract class AbstractLogoutEvent extends UserEvent * * @throws \BadMethodCallException * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ public function __construct($name, array $arguments = []) { diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 113ff436697c1..53fa58ab18122 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 = 'beta3-dev'; + public const EXTRA_VERSION = 'beta3'; /** * 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 = '00:00'; + public const RELTIME = '16:00'; /** * Release timezone. diff --git a/plugins/system/guidedtours/src/Extension/GuidedTours.php b/plugins/system/guidedtours/src/Extension/GuidedTours.php index fe254dd300269..15c9e81e9f18f 100644 --- a/plugins/system/guidedtours/src/Extension/GuidedTours.php +++ b/plugins/system/guidedtours/src/Extension/GuidedTours.php @@ -367,7 +367,7 @@ private function processTour($item) * * @return string * - * @since __DEPLOY_VERSION__ + * @since 5.2.0 */ private function fixImagePaths($description) {