From 296563b23344eede1594865a168c19ce7adca184 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Sat, 18 Nov 2023 15:05:52 +0100 Subject: [PATCH 1/2] Declare the context variable correctly (#42336) * Declare the context variable correctly * cs --------- --- .../workflow/publishing/src/Extension/Publishing.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/workflow/publishing/src/Extension/Publishing.php b/plugins/workflow/publishing/src/Extension/Publishing.php index 4ec55ed520be1..86f418b059fc9 100644 --- a/plugins/workflow/publishing/src/Extension/Publishing.php +++ b/plugins/workflow/publishing/src/Extension/Publishing.php @@ -22,6 +22,7 @@ use Joomla\CMS\Table\TableInterface; use Joomla\CMS\Workflow\WorkflowPluginTrait; use Joomla\CMS\Workflow\WorkflowServiceInterface; +use Joomla\Event\Event; use Joomla\Event\EventInterface; use Joomla\Event\SubscriberInterface; use Joomla\Registry\Registry; @@ -87,6 +88,10 @@ public static function getSubscribedEvents(): array */ public function onContentPrepareForm(EventInterface $event) { + if (!$event instanceof Event) { + return; + } + [$form, $data] = array_values($event->getArguments()); $context = $form->getName(); @@ -352,7 +357,11 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event) */ public function onContentBeforeChangeState(EventInterface $event) { - [$form, $pks] = array_values($event->getArguments()); + if (!$event instanceof Event) { + return; + } + + [$context, $pks] = array_values($event->getArguments()); if (!$this->isSupported($context)) { return true; From 16681afbd496ec113f781737f1dd6f9cabb059da Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 18 Nov 2023 15:26:09 +0100 Subject: [PATCH 2/2] Joomla! 4.4.1 Rc 1 --- 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 | 8 ++++---- package.json | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 6e79e8dcbb75c..2c1617140bc96 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.4.1 - 2023-10 + 2023-11 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 1f08ebac7723c..2de9615cb6dc1 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.4.1 - 2023-10 + 2023-11 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 6a29533fea0c0..436c7c3a3e4ba 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.4.1-dev - 2023-10 + 4.4.1-rc1 + 2023-11 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 45d921b7e2dd9..f431914cc6a35 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.4.1.1 - 2023-10 + 2023-11 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 4ff9d7a556330..db7f63977d1c7 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.4.1 - 2023-10 + 2023-11 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 62be816bcad6d..fae03d9aeb0ce 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.4.1 - 2023-10 + 2023-11 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 e99473da18752..e704dd0e59e23 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (United Kingdom) 4.4.1 - 2023-10 + 2023-11 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 17dfee22b79e5..4f83fbba25b9f 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.4.1 - 2023-10 + 2023-11 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 4ca0c971a3ffa..554d0a06e5ddc 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.4.1 - 2023-10 + 2023-11 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index afcfec5baaf6b..e36e4167e2cb2 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 = 'dev'; + public const EXTRA_VERSION = 'rc1'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Development'; + public const DEV_STATUS = 'Release Candidate'; /** * Code name. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '17-October-2023'; + public const RELDATE = '28-November-2023'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '16:01'; + public const RELTIME = '16:00'; /** * Release timezone. diff --git a/package.json b/package.json index 0fe1b47024b32..33dac8d06012f 100644 --- a/package.json +++ b/package.json @@ -111,4 +111,4 @@ "stylelint-order": "^5.0.0", "stylelint-scss": "^4.7.0" } -} +} \ No newline at end of file