From 71389ff3d73122359d3812abaa64f9928ab653cc Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Sat, 18 Jun 2022 13:53:49 +0200 Subject: [PATCH 1/4] Bump to 4.1.5 stable --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 04ef78e83512e..5817c5eb1a093 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 - 4.1.5-rc3-dev + 4.1.5 June 2022 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index e410322db0690..1dee6ad84e0a7 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 = 'rc3-dev'; + const EXTRA_VERSION = ''; /** * Development status. @@ -69,7 +69,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Stable'; /** * Code name. @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '18-June-2022'; + const RELDATE = '21-June-2022'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '11:05'; + const RELTIME = '14:00'; /** * Release timezone. From afd8c4bf3f72a7e9835694674d585bd0b238c439 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Sat, 18 Jun 2022 14:08:20 +0200 Subject: [PATCH 2/4] Revert to dev --- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- 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 | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 44dc08afe7490..34ac5219873a6 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 35e10f1017760..0f6a14dbcbdca 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 5817c5eb1a093..9f30c7f5ce74b 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 - 4.1.5 + 4.1.6-dev June 2022 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 2ea0cab7491be..6ad612df695a0 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.1.5.1 + 4.1.6.1 June 2022 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 608da625673a4..b6095d9c9b81e 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index 72398bb9bd856..cc78e53f6a800 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index 6a86b41df0c47..eb3a53a4aa56c 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.1.5 + 4.1.6 June 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 706d478291c53..0f3302fabf5e6 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index e3f6685e86a42..4e0bc75ec2b6f 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.5 + 4.1.6 June 2022 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 1dee6ad84e0a7..3cbaf80548d94 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -50,7 +50,7 @@ final class Version * @var integer * @since 3.8.0 */ - const PATCH_VERSION = 5; + const PATCH_VERSION = 6; /** * Extra release version info. @@ -61,7 +61,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = ''; + const EXTRA_VERSION = 'dev'; /** * Development status. @@ -69,7 +69,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Stable'; + const DEV_STATUS = 'Development'; /** * Code name. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '14:00'; + const RELTIME = '14:01'; /** * Release timezone. From 7cdcb04552c906ac34a6632387d434e02a1d06c8 Mon Sep 17 00:00:00 2001 From: FancyFranci Date: Wed, 22 Jun 2022 17:03:52 +0200 Subject: [PATCH 3/4] Bump to version 4.2.0-beta2 --- .../components/com_joomlaupdate/extract.php | 4 +- .../src/Controller/UpdateController.php | 2 +- .../src/View/Joomlaupdate/HtmlView.php | 4 +- .../src/View/Upload/HtmlView.php | 2 +- .../com_messages/src/Model/MessagesModel.php | 2 +- .../src/Controller/MessageController.php | 4 +- .../src/Model/MessagesModel.php | 4 +- .../com_templates/src/Model/StyleModel.php | 4 +- administrator/manifests/files/joomla.xml | 2 +- build/media_source/system/js/core.es6.js | 6 +-- .../com_tags/src/Helper/RouteHelper.php | 4 +- components/com_users/src/Model/LoginModel.php | 2 +- .../CacheControllerFactoryAwareInterface.php | 4 +- .../CacheControllerFactoryAwareTrait.php | 8 ++-- libraries/src/Console/AddUserCommand.php | 2 +- .../src/Console/AddUserToGroupCommand.php | 2 +- libraries/src/Console/DeleteUserCommand.php | 2 +- .../src/Console/ExtensionRemoveCommand.php | 2 +- libraries/src/Console/ListUserCommand.php | 2 +- .../Console/RemoveUserFromGroupCommand.php | 2 +- libraries/src/Installer/InstallerAdapter.php | 2 +- libraries/src/MVC/Factory/MVCFactory.php | 2 +- libraries/src/Plugin/CMSPlugin.php | 8 ++-- libraries/src/Version.php | 8 ++-- .../behaviour/taggable/services/provider.php | 2 +- .../taggable/src/Extension/Taggable.php | 2 +- .../versionable/services/provider.php | 2 +- .../versionable/src/Extension/Versionable.php | 6 +-- plugins/system/httpheaders/httpheaders.php | 2 +- plugins/system/shortcut/services/provider.php | 2 +- plugins/system/shortcut/shortcut.xml | 2 +- .../shortcut/src/Extension/Shortcut.php | 10 ++-- plugins/task/requests/services/provider.php | 2 +- .../task/requests/src/Extension/Requests.php | 6 +-- plugins/task/sitestatus/services/provider.php | 2 +- .../sitestatus/src/Extension/SiteStatus.php | 6 +-- .../CacheControllerFactoryAwareTraitTest.php | 4 +- .../Libraries/Cms/Plugin/CMSPluginTest.php | 46 +++++++++---------- .../Requests/Extension/RequestsPluginTest.php | 16 +++---- .../Extension/SiteStatusPluginTest.php | 20 ++++---- 40 files changed, 107 insertions(+), 107 deletions(-) diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php index 9328a57beea0c..1ea4d93c8a799 100644 --- a/administrator/components/com_joomlaupdate/extract.php +++ b/administrator/components/com_joomlaupdate/extract.php @@ -1946,7 +1946,7 @@ function getConfiguration(): ?array * Sets the PHP timeout to 3600 seconds * * @return void - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ function setLongTimeout() { @@ -1962,7 +1962,7 @@ function setLongTimeout() * Sets the memory limit to 1GiB * * @return void - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ function setHugeMemoryLimit() { diff --git a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php index 87a9f5912aa99..5aa701148261d 100644 --- a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php +++ b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php @@ -588,7 +588,7 @@ public function fetchExtensionCompatibility() * Called by the Joomla Update JavaScript (PreUpdateChecker.checkNextChunk). * * @return void - * @since __DEPLOY_VERSION__ + * @since 4.2.0 * */ public function batchextensioncompatibility() diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index e24e607386d2f..554c8c01968fc 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -119,7 +119,7 @@ class HtmlView extends BaseHtmlView * Should I disable the confirmation checkbox for pre-update extension version checks? * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected $noVersionCheck = false; @@ -127,7 +127,7 @@ class HtmlView extends BaseHtmlView * Should I disable the confirmation checkbox for taking a backup before updating? * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected $noBackupCheck = false; diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php index 3ca0a5fb4ba25..f172fc7900273 100644 --- a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php @@ -55,7 +55,7 @@ class HtmlView extends BaseHtmlView * Should I disable the confirmation checkbox for taking a backup before updating? * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected $noBackupCheck = false; diff --git a/administrator/components/com_messages/src/Model/MessagesModel.php b/administrator/components/com_messages/src/Model/MessagesModel.php index 722929eede357..0077db55d982d 100644 --- a/administrator/components/com_messages/src/Model/MessagesModel.php +++ b/administrator/components/com_messages/src/Model/MessagesModel.php @@ -174,7 +174,7 @@ protected function getListQuery() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function purge(int $userId): void { diff --git a/administrator/components/com_postinstall/src/Controller/MessageController.php b/administrator/components/com_postinstall/src/Controller/MessageController.php index 51029cd8cee5f..1342187f6713c 100644 --- a/administrator/components/com_postinstall/src/Controller/MessageController.php +++ b/administrator/components/com_postinstall/src/Controller/MessageController.php @@ -79,7 +79,7 @@ public function unpublish() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function republish() { @@ -105,7 +105,7 @@ public function republish() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function archive() { diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php index e2c3355d4df70..5dd094febeb61 100644 --- a/administrator/components/com_postinstall/src/Model/MessagesModel.php +++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php @@ -127,7 +127,7 @@ public function unpublishMessage($id) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function archiveMessage($id) { @@ -152,7 +152,7 @@ public function archiveMessage($id) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function republishMessage($id) { diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php index 4acffdbb9c1ed..427101683fa8a 100644 --- a/administrator/components/com_templates/src/Model/StyleModel.php +++ b/administrator/components/com_templates/src/Model/StyleModel.php @@ -743,7 +743,7 @@ public function getHelp() * * @return stdClass * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function getAdminTemplate(int $styleId): stdClass { @@ -789,7 +789,7 @@ public function getAdminTemplate(int $styleId): stdClass * * @return array * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function getSiteTemplates(): array { diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index bd2a7002d4a2b..c818edd399718 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 - 4.2.0-beta2-dev + 4.2.0-beta2 2022-06 FILES_JOOMLA_XML_DESCRIPTION diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js index d0dd7bc06e8cf..6967fff737c80 100644 --- a/build/media_source/system/js/core.es6.js +++ b/build/media_source/system/js/core.es6.js @@ -573,7 +573,7 @@ window.Joomla.Modal = window.Joomla.Modal || { * * @type {Array} * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ const requestQueue = []; @@ -582,7 +582,7 @@ window.Joomla.Modal = window.Joomla.Modal || { * * @type {boolean} * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ let performingQueuedRequest = false; @@ -624,7 +624,7 @@ window.Joomla.Modal = window.Joomla.Modal || { /** * Processes queued Request objects. * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ const processQueuedRequests = () => { if (performingQueuedRequest || requestQueue.length === 0) { diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php index ed90a95efb7d3..99354fcb481bd 100644 --- a/components/com_tags/src/Helper/RouteHelper.php +++ b/components/com_tags/src/Helper/RouteHelper.php @@ -105,7 +105,7 @@ public static function getTagRoute($id) * * @return string URL link to pass to the router * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 * @throws Exception */ public static function getComponentTagRoute(string $id, string $language = '*'): string @@ -167,7 +167,7 @@ public static function getTagsRoute() * * @return string URL link to pass to the router * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 * @throws Exception */ public static function getComponentTagsRoute(string $language = '*'): string diff --git a/components/com_users/src/Model/LoginModel.php b/components/com_users/src/Model/LoginModel.php index 9ad43587be4d6..e4b2ae5d735d5 100644 --- a/components/com_users/src/Model/LoginModel.php +++ b/components/com_users/src/Model/LoginModel.php @@ -128,7 +128,7 @@ protected function preprocessForm(Form $form, $data, $group = 'user') * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function getMenuLanguage(int $id): string { diff --git a/libraries/src/Cache/CacheControllerFactoryAwareInterface.php b/libraries/src/Cache/CacheControllerFactoryAwareInterface.php index 7ccd49e9d0147..e3dd21ced2ad3 100644 --- a/libraries/src/Cache/CacheControllerFactoryAwareInterface.php +++ b/libraries/src/Cache/CacheControllerFactoryAwareInterface.php @@ -13,7 +13,7 @@ /** * Interface to be implemented by classes depending on a cache controller factory. * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ interface CacheControllerFactoryAwareInterface { @@ -24,7 +24,7 @@ interface CacheControllerFactoryAwareInterface * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function setCacheControllerFactory(CacheControllerFactoryInterface $factory): void; } diff --git a/libraries/src/Cache/CacheControllerFactoryAwareTrait.php b/libraries/src/Cache/CacheControllerFactoryAwareTrait.php index d6c4592416860..d40e946fcb28f 100644 --- a/libraries/src/Cache/CacheControllerFactoryAwareTrait.php +++ b/libraries/src/Cache/CacheControllerFactoryAwareTrait.php @@ -15,7 +15,7 @@ /** * Defines the trait for a CacheControllerFactoryInterface Aware Class. * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ trait CacheControllerFactoryAwareTrait { @@ -24,7 +24,7 @@ trait CacheControllerFactoryAwareTrait * * @var CacheControllerFactoryInterface * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $cacheControllerFactory; @@ -33,7 +33,7 @@ trait CacheControllerFactoryAwareTrait * * @return CacheControllerFactoryInterface * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected function getCacheControllerFactory(): CacheControllerFactoryInterface { @@ -57,7 +57,7 @@ protected function getCacheControllerFactory(): CacheControllerFactoryInterface * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function setCacheControllerFactory(CacheControllerFactoryInterface $cacheControllerFactory = null): void { diff --git a/libraries/src/Console/AddUserCommand.php b/libraries/src/Console/AddUserCommand.php index 22bb49a1512db..c44cf43f7071c 100644 --- a/libraries/src/Console/AddUserCommand.php +++ b/libraries/src/Console/AddUserCommand.php @@ -104,7 +104,7 @@ class AddUserCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Console/AddUserToGroupCommand.php b/libraries/src/Console/AddUserToGroupCommand.php index 5cbbe0eef541e..07204d935b033 100644 --- a/libraries/src/Console/AddUserToGroupCommand.php +++ b/libraries/src/Console/AddUserToGroupCommand.php @@ -78,7 +78,7 @@ class AddUserToGroupCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Console/DeleteUserCommand.php b/libraries/src/Console/DeleteUserCommand.php index 4eae40c7b5084..704a3b299e7a6 100644 --- a/libraries/src/Console/DeleteUserCommand.php +++ b/libraries/src/Console/DeleteUserCommand.php @@ -69,7 +69,7 @@ class DeleteUserCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php index ac088ba0456dd..3b0dfe088cb11 100644 --- a/libraries/src/Console/ExtensionRemoveCommand.php +++ b/libraries/src/Console/ExtensionRemoveCommand.php @@ -99,7 +99,7 @@ class ExtensionRemoveCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Console/ListUserCommand.php b/libraries/src/Console/ListUserCommand.php index 8a279d522cd8b..2c1b65e11f2da 100644 --- a/libraries/src/Console/ListUserCommand.php +++ b/libraries/src/Console/ListUserCommand.php @@ -48,7 +48,7 @@ class ListUserCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Console/RemoveUserFromGroupCommand.php b/libraries/src/Console/RemoveUserFromGroupCommand.php index c66894a166d10..8afc9a2808e6a 100644 --- a/libraries/src/Console/RemoveUserFromGroupCommand.php +++ b/libraries/src/Console/RemoveUserFromGroupCommand.php @@ -78,7 +78,7 @@ class RemoveUserFromGroupCommand extends AbstractCommand * * @param DatabaseInterface $db The database * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DatabaseInterface $db) { diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php index 2b0d99bcb3acc..460ce1b985f39 100644 --- a/libraries/src/Installer/InstallerAdapter.php +++ b/libraries/src/Installer/InstallerAdapter.php @@ -1395,7 +1395,7 @@ public function update() * * @return mixed The value of the element if set, null otherwise * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 * * @deprecated 5.0 Use getDatabase() instead of directly accessing db */ diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php index 83445fd8cb540..0af257f74b929 100644 --- a/libraries/src/MVC/Factory/MVCFactory.php +++ b/libraries/src/MVC/Factory/MVCFactory.php @@ -366,7 +366,7 @@ private function setRouterOnObject($object): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private function setCacheControllerOnObject($object): void { diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php index 2a544990c6cdd..c394b5e161fec 100644 --- a/libraries/src/Plugin/CMSPlugin.php +++ b/libraries/src/Plugin/CMSPlugin.php @@ -81,7 +81,7 @@ abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface * * @var CMSApplicationInterface * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $application; @@ -195,7 +195,7 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR) * * @return string The translated string * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 * * @see sprintf */ @@ -406,7 +406,7 @@ private function parameterImplementsEventInterface(\ReflectionParameter $paramet * * @return CMSApplicationInterface|null * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected function getApplication(): ?CMSApplicationInterface { @@ -420,7 +420,7 @@ protected function getApplication(): ?CMSApplicationInterface * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function setApplication(CMSApplicationInterface $application): void { diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 146ef1c188ef8..f22ca5c28d5af 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -63,7 +63,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'beta2-dev'; + const EXTRA_VERSION = 'beta2'; /** * Development status. @@ -71,7 +71,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Beta'; /** * Code name. @@ -87,7 +87,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '7-June-2022'; + const RELDATE = '22-June-2022'; /** * Release time. @@ -95,7 +95,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '16:53'; + const RELTIME = '17:00'; /** * Release timezone. diff --git a/plugins/behaviour/taggable/services/provider.php b/plugins/behaviour/taggable/services/provider.php index ac256d63c87a9..74b3f55f3f0d0 100644 --- a/plugins/behaviour/taggable/services/provider.php +++ b/plugins/behaviour/taggable/services/provider.php @@ -25,7 +25,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function register(Container $container) { diff --git a/plugins/behaviour/taggable/src/Extension/Taggable.php b/plugins/behaviour/taggable/src/Extension/Taggable.php index 07f94fdc39ba0..015ce31ef9ec3 100644 --- a/plugins/behaviour/taggable/src/Extension/Taggable.php +++ b/plugins/behaviour/taggable/src/Extension/Taggable.php @@ -40,7 +40,7 @@ final class Taggable extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public static function getSubscribedEvents(): array { diff --git a/plugins/behaviour/versionable/services/provider.php b/plugins/behaviour/versionable/services/provider.php index 36a84b8ae7902..16b4795814cb7 100644 --- a/plugins/behaviour/versionable/services/provider.php +++ b/plugins/behaviour/versionable/services/provider.php @@ -28,7 +28,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function register(Container $container) { diff --git a/plugins/behaviour/versionable/src/Extension/Versionable.php b/plugins/behaviour/versionable/src/Extension/Versionable.php index 7cb6d41d5312e..f340976c061be 100644 --- a/plugins/behaviour/versionable/src/Extension/Versionable.php +++ b/plugins/behaviour/versionable/src/Extension/Versionable.php @@ -36,7 +36,7 @@ final class Versionable extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public static function getSubscribedEvents(): array { @@ -50,7 +50,7 @@ public static function getSubscribedEvents(): array * The input filter * * @var InputFilter - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $filter; @@ -58,7 +58,7 @@ public static function getSubscribedEvents(): array * The CMS helper * * @var CMSHelper - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $helper; diff --git a/plugins/system/httpheaders/httpheaders.php b/plugins/system/httpheaders/httpheaders.php index 7adfb4f4eeedc..470fc400b36a5 100644 --- a/plugins/system/httpheaders/httpheaders.php +++ b/plugins/system/httpheaders/httpheaders.php @@ -323,7 +323,7 @@ private function setCspHeader(): void /** * That line is for B/C we do no longer require to add the nonce tag * but add it once the setting is enabled so this line here is needed - * to remove the outdated tag that was required until __DEPLOY_VERSION__ + * to remove the outdated tag that was required until 4.2.0 */ $cspValue->value = str_replace('{nonce}', '', $cspValue->value); diff --git a/plugins/system/shortcut/services/provider.php b/plugins/system/shortcut/services/provider.php index 1a848ef83c6cf..c3a07ad557826 100644 --- a/plugins/system/shortcut/services/provider.php +++ b/plugins/system/shortcut/services/provider.php @@ -26,7 +26,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function register(Container $container) { diff --git a/plugins/system/shortcut/shortcut.xml b/plugins/system/shortcut/shortcut.xml index 3cb92232d97aa..df15b1cfbfea8 100644 --- a/plugins/system/shortcut/shortcut.xml +++ b/plugins/system/shortcut/shortcut.xml @@ -7,7 +7,7 @@ GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - __DEPLOY_VERSION__ + 4.2.0 PLG_SYSTEM_SHORTCUT_XML_DESCRIPTION Joomla\Plugin\System\Shortcut diff --git a/plugins/system/shortcut/src/Extension/Shortcut.php b/plugins/system/shortcut/src/Extension/Shortcut.php index bcdf5a3944724..82c47f702b2e0 100644 --- a/plugins/system/shortcut/src/Extension/Shortcut.php +++ b/plugins/system/shortcut/src/Extension/Shortcut.php @@ -22,7 +22,7 @@ /** * Shortcut plugin to add accessible keyboard shortcuts to the administrator templates. * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ final class Shortcut extends CMSPlugin implements SubscriberInterface { @@ -30,7 +30,7 @@ final class Shortcut extends CMSPlugin implements SubscriberInterface * Load the language file on instantiation. * * @var boolean - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ protected $autoloadLanguage = true; @@ -49,7 +49,7 @@ final class Shortcut extends CMSPlugin implements SubscriberInterface * * @return array * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public static function getSubscribedEvents(): array { @@ -64,7 +64,7 @@ public static function getSubscribedEvents(): array * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function initialize() { @@ -112,7 +112,7 @@ public function initialize() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function addShortcuts(Event $event) { diff --git a/plugins/task/requests/services/provider.php b/plugins/task/requests/services/provider.php index b7320429f62bc..cb864458ded72 100644 --- a/plugins/task/requests/services/provider.php +++ b/plugins/task/requests/services/provider.php @@ -27,7 +27,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function register(Container $container) { diff --git a/plugins/task/requests/src/Extension/Requests.php b/plugins/task/requests/src/Extension/Requests.php index 96cac4e98a7a4..f44da578ad0c8 100644 --- a/plugins/task/requests/src/Extension/Requests.php +++ b/plugins/task/requests/src/Extension/Requests.php @@ -71,7 +71,7 @@ public static function getSubscribedEvents(): array * The http factory * * @var HttpFactory - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $httpFactory; @@ -79,7 +79,7 @@ public static function getSubscribedEvents(): array * The root directory * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $rootDirectory; @@ -91,7 +91,7 @@ public static function getSubscribedEvents(): array * @param HttpFactory $httpFactory The http factory * @param string $rootDirectory The root directory to store the output file in * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DispatcherInterface $dispatcher, array $config, HttpFactory $httpFactory, string $rootDirectory) { diff --git a/plugins/task/sitestatus/services/provider.php b/plugins/task/sitestatus/services/provider.php index a5e6afce3465f..686a40b5d6f98 100644 --- a/plugins/task/sitestatus/services/provider.php +++ b/plugins/task/sitestatus/services/provider.php @@ -27,7 +27,7 @@ * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function register(Container $container) { diff --git a/plugins/task/sitestatus/src/Extension/SiteStatus.php b/plugins/task/sitestatus/src/Extension/SiteStatus.php index a8bc52c22af93..88c429ae76047 100644 --- a/plugins/task/sitestatus/src/Extension/SiteStatus.php +++ b/plugins/task/sitestatus/src/Extension/SiteStatus.php @@ -82,7 +82,7 @@ public static function getSubscribedEvents(): array * The old config * * @var array - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $oldConfig; @@ -90,7 +90,7 @@ public static function getSubscribedEvents(): array * The config file * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ private $configFile; @@ -102,7 +102,7 @@ public static function getSubscribedEvents(): array * @param array $oldConfig The old config * @param string $configFile The config * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function __construct(DispatcherInterface $dispatcher, array $config, array $oldConfig, string $configFile) { diff --git a/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php index b4242233371c8..22b09b3c869a6 100644 --- a/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php +++ b/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php @@ -21,7 +21,7 @@ * * @testdoc The CacheControllerFactoryAwareTrait * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ class CacheControllerFactoryAwareTraitTest extends UnitTestCase { @@ -30,7 +30,7 @@ class CacheControllerFactoryAwareTraitTest extends UnitTestCase * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testGetCacheControllerFactory() { diff --git a/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php b/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php index 29bc6f3cfb76e..8ba3b53ac8511 100644 --- a/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php +++ b/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php @@ -28,7 +28,7 @@ * * @testdox The CMSPlugin * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ class CMSPluginTest extends UnitTestCase { @@ -37,7 +37,7 @@ class CMSPluginTest extends UnitTestCase * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedDispatcher() { @@ -54,7 +54,7 @@ public function testInjectedDispatcher() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedApplication() { @@ -78,7 +78,7 @@ public function getApplication(): CMSApplicationInterface * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testEmptyParams() { @@ -95,7 +95,7 @@ public function testEmptyParams() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedRegistryParams() { @@ -113,7 +113,7 @@ public function testInjectedRegistryParams() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedArrayParams() { @@ -130,7 +130,7 @@ public function testInjectedArrayParams() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedName() { @@ -152,7 +152,7 @@ public function getName() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInjectedType() { @@ -174,7 +174,7 @@ public function getType() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testLoadLanguage() { @@ -196,7 +196,7 @@ public function testLoadLanguage() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testLoadLanguageWithExtensionAndPath() { @@ -218,7 +218,7 @@ public function testLoadLanguageWithExtensionAndPath() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testNotLoadLanguageWhenExists() { @@ -241,7 +241,7 @@ public function testNotLoadLanguageWhenExists() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testTranslateWithoutArguments() { @@ -269,7 +269,7 @@ public function test(): string * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testTranslateWithArguments() { @@ -297,7 +297,7 @@ public function test(): string * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersAsSubscriber() { @@ -323,7 +323,7 @@ public function unit() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersAsLegacy() { @@ -344,7 +344,7 @@ public function onTest() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersForEventInterface() { @@ -365,7 +365,7 @@ public function onTest(EventInterface $event) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersWithForcedEventInterface() { @@ -388,7 +388,7 @@ public function onTest(EventInterface $event) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersForNoEventInterface() { @@ -409,7 +409,7 @@ public function onTest(string $context) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersNotTyped() { @@ -430,7 +430,7 @@ public function onTest($event) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRegisterListenersNullable() { @@ -451,7 +451,7 @@ public function onTest(stdClass $event = null) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testDispatchLegacyListener() { @@ -480,7 +480,7 @@ public function onTest() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testDispatchLegacyListenerWhenNullIsReturned() { @@ -507,7 +507,7 @@ public function onTest() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testDispatchLegacyListenerWhenEventHasResult() { diff --git a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php index 53ee9017309de..4a876d0688b2c 100644 --- a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php +++ b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php @@ -32,7 +32,7 @@ * * @testdox The Requests plugin * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ class RequestsPluginTest extends UnitTestCase { @@ -41,7 +41,7 @@ class RequestsPluginTest extends UnitTestCase * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function setUp(): void { @@ -56,7 +56,7 @@ public function setUp(): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function tearDown(): void { @@ -71,7 +71,7 @@ public function tearDown(): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testRequest() { @@ -125,7 +125,7 @@ public static function isSupported() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInvalidRequest() { @@ -179,7 +179,7 @@ public static function isSupported() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testAuthRequest() { @@ -230,7 +230,7 @@ public static function isSupported() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testExceptionInRequest() { @@ -279,7 +279,7 @@ public static function isSupported() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInvalidFileToWrite() { diff --git a/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php b/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php index 66d420824dd7a..a7dfda3d3f99b 100644 --- a/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php +++ b/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php @@ -27,7 +27,7 @@ * * @testdox The SiteStatus plugin * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ class SiteStatusPluginTest extends UnitTestCase { @@ -36,7 +36,7 @@ class SiteStatusPluginTest extends UnitTestCase * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function setUp(): void { @@ -53,7 +53,7 @@ public function setUp(): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function tearDown(): void { @@ -68,7 +68,7 @@ public function tearDown(): void * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testSetOnlineWhenOffline() { @@ -93,7 +93,7 @@ public function testSetOnlineWhenOffline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testSetOnlineWhenOnline() { @@ -118,7 +118,7 @@ public function testSetOnlineWhenOnline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testSetOfflineWhenOnline() { @@ -143,7 +143,7 @@ public function testSetOfflineWhenOnline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testSetOfflineWhenOffline() { @@ -168,7 +168,7 @@ public function testSetOfflineWhenOffline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testToggleOffline() { @@ -193,7 +193,7 @@ public function testToggleOffline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testToggleOnline() { @@ -218,7 +218,7 @@ public function testToggleOnline() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.2.0 */ public function testInvalidConfigFile() { From cdb16688824c4fc61e4da947f3af435e1751cc25 Mon Sep 17 00:00:00 2001 From: FancyFranci Date: Wed, 22 Jun 2022 18:21:37 +0200 Subject: [PATCH 4/4] Reset to dev --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index c818edd399718..f011e3cc09fa7 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 - 4.2.0-beta2 + 4.2.0-dev 2022-06 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index f22ca5c28d5af..6071395f4b80b 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -63,7 +63,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'beta2'; + const EXTRA_VERSION = 'dev'; /** * Development status. @@ -71,7 +71,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Beta'; + const DEV_STATUS = 'Development'; /** * Code name.