diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php index 81065a2b67438..84780cc8ec041 100644 --- a/administrator/components/com_content/src/Extension/ContentComponent.php +++ b/administrator/components/com_content/src/Extension/ContentComponent.php @@ -202,7 +202,7 @@ public function getWorkflowContexts(): array * * @return string|null * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getCategoryWorkflowContext(?string $section = null): string { diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php index 59cae00061bab..332110dda46af 100644 --- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php +++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php @@ -177,7 +177,7 @@ public function refreshUpdates($force = false) * * @return boolean True if there is an update else false * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getCheckForSelfUpdate() { diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 33e444d48f749..69121669aa6ce 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -75,7 +75,7 @@ class HtmlView extends BaseHtmlView * * @var boolean True when update is available otherwise false * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $selfUpdateAvailable = false; @@ -84,7 +84,7 @@ class HtmlView extends BaseHtmlView * * @var string The prefix * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $messagePrefix = ''; @@ -218,7 +218,7 @@ public function display($tpl = null) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected function addToolbar() { diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php index a4e8246e7c102..1fae8680e31b4 100644 --- a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php @@ -28,7 +28,7 @@ class HtmlView extends BaseHtmlView * * @var array * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $updateInfo = null; @@ -37,7 +37,7 @@ class HtmlView extends BaseHtmlView * * @var boolean True when update is available otherwise false * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $selfUpdateAvailable = false; @@ -46,7 +46,7 @@ class HtmlView extends BaseHtmlView * * @var array An array of warnings which could prevent the upload update * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $warnings = []; @@ -85,7 +85,7 @@ public function display($tpl = null) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected function addToolbar() { diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 1c30207750547..0d8b287c3eddf 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - June 2021 + July 2021 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 1cbdb407c2697..8c4ecff6e6f17 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - June 2021 + July 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 56bea1f333778..1c47c6b6384b7 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 - 4.0.0-rc4-dev - June 2021 + 4.0.0-rc4 + July 2021 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 0da59c726b8e4..d31a362d565b9 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 4.0.0.1 - June 2021 + July 2021 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 d443e7ccd5955..df915dd684845 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - June 2021 + July 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 9f626ad5fdb6d..4735bb2feaaed 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - June 2021 + July 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 0861789d83ba7..9a01cf5adadc9 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - June 2021 + July 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index c34fe6291adbb..868f21b224fd9 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -61,7 +61,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'rc4-dev'; + const EXTRA_VERSION = 'rc4'; /** * Development status. @@ -69,7 +69,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Release Candidate'; /** * Code name. @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '29-June-2021'; + const RELDATE = '13-July-2021'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '19:04'; + const RELTIME = '20:00'; /** * Release timezone. diff --git a/libraries/src/Workflow/WorkflowServiceInterface.php b/libraries/src/Workflow/WorkflowServiceInterface.php index 3e5f4c2f2268c..07f60519f598e 100644 --- a/libraries/src/Workflow/WorkflowServiceInterface.php +++ b/libraries/src/Workflow/WorkflowServiceInterface.php @@ -97,7 +97,7 @@ public function getWorkflowContexts(): array; * * @return string|null * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getCategoryWorkflowContext(?string $section = null): string; }