From 7923a4207aff13120c495cb738dcaa4cfa1be768 Mon Sep 17 00:00:00 2001
From: Michael Strelan <mstrelan@gmail.com>
Date: Mon, 24 Mar 2025 08:03:09 +1000
Subject: [PATCH 1/2] Manually apply 3325057-15.patch
---
.../Core/Extension/ModuleDependencyMessageTrait.php | 2 ++
core/lib/Drupal/Core/Plugin/PluginWithFormsTrait.php | 1 +
.../tests/src/Traits/ContentModerationTestTrait.php | 8 ++++++--
.../media/tests/src/Traits/MediaTypeCreationTrait.php | 4 +++-
.../FunctionalJavascriptTests/WebDriverTestBase.php | 8 +++++++-
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php b/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
index 4511f423df1a..6fef0d9a6a7c 100644
--- a/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
+++ b/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
@@ -49,6 +49,8 @@ public function checkDependencyMessage(array $modules, $dependency, Dependency $
]);
}
}
+
+ return NULL;
}
}
diff --git a/core/lib/Drupal/Core/Plugin/PluginWithFormsTrait.php b/core/lib/Drupal/Core/Plugin/PluginWithFormsTrait.php
index 6181b866515f..11b2d6ec9c89 100644
--- a/core/lib/Drupal/Core/Plugin/PluginWithFormsTrait.php
+++ b/core/lib/Drupal/Core/Plugin/PluginWithFormsTrait.php
@@ -17,6 +17,7 @@ public function getFormClass($operation) {
elseif ($operation === 'configure' && $this instanceof PluginFormInterface) {
return static::class;
}
+ return NULL;
}
/**
diff --git a/core/modules/content_moderation/tests/src/Traits/ContentModerationTestTrait.php b/core/modules/content_moderation/tests/src/Traits/ContentModerationTestTrait.php
index 6a76bb8743ca..986af08a58bd 100644
--- a/core/modules/content_moderation/tests/src/Traits/ContentModerationTestTrait.php
+++ b/core/modules/content_moderation/tests/src/Traits/ContentModerationTestTrait.php
@@ -4,6 +4,7 @@
namespace Drupal\Tests\content_moderation\Traits;
+use Drupal\content_moderation\Plugin\WorkflowType\ContentModerationInterface;
use Drupal\workflows\Entity\Workflow;
use Drupal\workflows\WorkflowInterface;
@@ -103,8 +104,11 @@ protected function createEditorialWorkflow() {
* The bundle ID to add.
*/
protected function addEntityTypeAndBundleToWorkflow(WorkflowInterface $workflow, $entity_type_id, $bundle) {
- $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle);
- $workflow->save();
+ $moderation = $workflow->getTypePlugin();
+ if ($moderation instanceof ContentModerationInterface) {
+ $moderation->addEntityTypeAndBundle($entity_type_id, $bundle);
+ $workflow->save();
+ }
}
}
diff --git a/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php b/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php
index 8059c9ca9c5e..b0fd28fc5332 100644
--- a/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php
+++ b/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php
@@ -54,7 +54,9 @@ protected function createMediaType($source_plugin_id, array $values = []) {
// The media type form creates a source field if it does not exist yet. The
// same must be done in a kernel test, since it does not use that form.
// @see \Drupal\media\MediaTypeForm::save()
- $source_field->getFieldStorageDefinition()->save();
+ /** @var \Drupal\field\FieldStorageConfigInterface $storage */
+ $storage = $source_field->getFieldStorageDefinition();
+ $storage->save();
// The source field storage has been created, now the field can be saved.
$source_field->save();
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
index 3275cd4c2529..c534e326d7fd 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
@@ -202,7 +202,13 @@ protected function createScreenshot($filename, $set_background_color = TRUE) {
}
/**
- * {@inheritdoc}
+ * Returns WebAssert object.
+ *
+ * @param string $name
+ * (optional) Name of the session. Defaults to the active session.
+ *
+ * @return \Drupal\FunctionalJavascriptTests\WebDriverWebAssert
+ * A new web-assert option for asserting the presence of elements with.
*/
public function assertSession($name = NULL) {
return new WebDriverWebAssert($this->getSession($name), $this->baseUrl);
--
GitLab
From 76fac94fce1b605cf6a57fc44549adf21251e558 Mon Sep 17 00:00:00 2001
From: Michael Strelan <mstrelan@gmail.com>
Date: Tue, 25 Mar 2025 11:24:02 +1000
Subject: [PATCH 2/2] BasicAuthResourceTestTrait
---
.../rest/tests/src/Functional/BasicAuthResourceTestTrait.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
index 589febbe1f02..cf0399d7532d 100644
--- a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
@@ -25,7 +25,7 @@ trait BasicAuthResourceTestTrait {
protected function getAuthenticationRequestOptions($method): array {
return [
'headers' => [
- 'Authorization' => 'Basic ' . base64_encode($this->account->name->value . ':' . $this->account->passRaw),
+ 'Authorization' => 'Basic ' . base64_encode($this->account->getAccountName() . ':' . $this->account->passRaw),
],
];
}
--
GitLab