From 26c26bbfc633b8d90340aa4d60fe695d3148b205 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 13 Aug 2026 11:15:09 +0200 Subject: [PATCH 1/5] update diff --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a4131aab1..f95d50335 100644 --- a/composer.json +++ b/composer.json @@ -37,9 +37,6 @@ "drupal/core": { "Let users configure the text of the \"Add media\" button": "https://www.drupal.org/files/issues/2021-10-01/3169956-34.patch" }, - "drupal/diff": { - "Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch" - }, "drupal/inline_entity_form": { "Issue #3542076: Empty media entities with simple widget in paragraphs": "https://www.drupal.org/files/issues/2025-08-20/3542076-empty-media-entities-with-simple-widget-in-paragraphs.diff" }, @@ -66,7 +63,7 @@ "drupal/config_update": "^2.0-alpha4", "drupal/content_lock": "^3.0.0-rc4", "drupal/crop": "^2.2", - "drupal/diff": "1.10", + "drupal/diff": "^2.1", "drupal/dropzonejs": "^2.8", "drupal/empty_fields": "^1.0", "drupal/entity_reference_actions": "^1.1.1", From faab86b40f06d1b31e2242533115595732432171 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 13 Aug 2026 11:16:53 +0200 Subject: [PATCH 2/5] update media_library_media_modify --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f95d50335..5db774432 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,7 @@ "drupal/media_entity_slideshow": "^2.6", "drupal/media_entity_twitter": "^2.5", "drupal/media_expire": "^2.6", - "drupal/media_library_media_modify": "^2.0.0-beta1", + "drupal/media_library_media_modify": "^2.0.0-beta2", "drupal/media_file_delete": "^1.2", "drupal/metatag": "^2.1.1", "drupal/metatag_async_widget": "^1.2", From fc2ba2cf8038836d78d474be4de07dc0707b500d Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 13 Aug 2026 11:35:18 +0200 Subject: [PATCH 3/5] Fix phpstan --- .../ThunderTaxonomyTermBreadcrumbBuilderBase.php | 16 ++-------------- .../ThunderSearchApiProducerBase.php | 2 +- .../Kernel/DataProducer/ThunderRedirectTest.php | 11 +---------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/modules/thunder_article/src/Breadcrumb/ThunderTaxonomyTermBreadcrumbBuilderBase.php b/modules/thunder_article/src/Breadcrumb/ThunderTaxonomyTermBreadcrumbBuilderBase.php index e28939ace..0d05b9e44 100644 --- a/modules/thunder_article/src/Breadcrumb/ThunderTaxonomyTermBreadcrumbBuilderBase.php +++ b/modules/thunder_article/src/Breadcrumb/ThunderTaxonomyTermBreadcrumbBuilderBase.php @@ -11,7 +11,6 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\taxonomy\TermInterface; -use Drupal\taxonomy\TermStorageInterface; /** * Class to define the menu_link breadcrumb builder. @@ -19,13 +18,6 @@ abstract class ThunderTaxonomyTermBreadcrumbBuilderBase implements BreadcrumbBuilderInterface { use StringTranslationTrait; - /** - * The taxonomy storage. - * - * @var \Drupal\taxonomy\TermStorageInterface - */ - protected TermStorageInterface $termStorage; - /** * Constructs the ThunderArticleBreadcrumbBuilder. * @@ -35,12 +27,8 @@ abstract class ThunderTaxonomyTermBreadcrumbBuilderBase implements BreadcrumbBui * The entity repository service. * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory * The config factory. - * - * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException - * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException */ - public function __construct(EntityTypeManagerInterface $entityTypeManager, protected readonly EntityRepositoryInterface $entityRepository, protected readonly ConfigFactoryInterface $configFactory) { - $this->termStorage = $entityTypeManager->getStorage('taxonomy_term'); + public function __construct(protected readonly EntityTypeManagerInterface $entityTypeManager, protected readonly EntityRepositoryInterface $entityRepository, protected readonly ConfigFactoryInterface $configFactory) { } /** @@ -67,7 +55,7 @@ public function build(RouteMatchInterface $route_match): Breadcrumb { $breadcrumb->addCacheableDependency($term); $links = []; - $parents = $this->termStorage->loadAllParents($term->id()); + $parents = $this->entityTypeManager->getStorage('taxonomy_term')->loadAllParents($term->id()); foreach (array_reverse($parents) as $term) { /** @var \Drupal\taxonomy\TermInterface $term */ $term = $this->entityRepository->getTranslationFromContext($term); diff --git a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/ThunderSearchApiProducerBase.php b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/ThunderSearchApiProducerBase.php index bd3bcb0e2..e31a46017 100644 --- a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/ThunderSearchApiProducerBase.php +++ b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/ThunderSearchApiProducerBase.php @@ -39,7 +39,7 @@ abstract class ThunderSearchApiProducerBase extends DataProducerPluginBase imple * * @var \Drupal\thunder_gqls\Wrappers\SearchApiResponse */ - private SearchApiResponse $responseWrapper; + protected SearchApiResponse $responseWrapper; /** * {@inheritdoc} diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php index 8dd48f578..5afebc7d5 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; use Drupal\Core\Cache\CacheableMetadata; -use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\node\Entity\Node; use Drupal\node\NodeInterface; @@ -22,13 +21,6 @@ class ThunderRedirectTest extends GraphQLTestBase { */ protected NodeInterface $node; - /** - * The redirect entity. - * - * @var \Drupal\Core\Entity\EntityStorageInterface - */ - protected EntityStorageInterface $storage; - /** * {@inheritdoc} */ @@ -55,7 +47,6 @@ public function setUp(): void { ]); $this->node->save(); - $this->storage = $this->container->get('entity_type.manager')->getStorage('redirect'); } /** @@ -81,7 +72,7 @@ public function testRedirect(): void { $redirectDestination = '/redirect-test-destination'; /** @var \Drupal\redirect\Entity\Redirect $redirect */ - $redirect = $this->storage->create(); + $redirect = $this->container->get('entity_type.manager')->getStorage('redirect')->create(); $redirect->setSource($redirectSource); $redirect->setRedirect($redirectDestination); $redirect->setStatusCode(301); From 654cd988978c75fe7f869345443c960649a58826 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 13 Aug 2026 11:53:52 +0200 Subject: [PATCH 4/5] fix race condition --- tests/src/FunctionalJavascript/ThunderParagraphsTestTrait.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/src/FunctionalJavascript/ThunderParagraphsTestTrait.php b/tests/src/FunctionalJavascript/ThunderParagraphsTestTrait.php index 383467009..d09ff56bb 100644 --- a/tests/src/FunctionalJavascript/ThunderParagraphsTestTrait.php +++ b/tests/src/FunctionalJavascript/ThunderParagraphsTestTrait.php @@ -115,7 +115,9 @@ public function addParagraph(string $fieldName, string $type, ?int $position = N $this->clickCssSelector($addButtonCssSelector); if ($index > 3) { - $this->getSession()->getDriver()->click("//div[contains(@class, \"ui-dialog-content\")]/*[contains(@class, \"paragraphs-add-dialog-list\")]//*[@name=\"{$fieldName}_{$type}_add_more\"]"); + $addMoreButtonXpath = "//div[contains(@class, \"ui-dialog-content\")]/*[contains(@class, \"paragraphs-add-dialog-list\")]//*[@name=\"{$fieldName}_{$type}_add_more\"]"; + $this->assertNotEmpty($this->assertSession()->waitForElementVisible('xpath', $addMoreButtonXpath)); + $this->getSession()->getDriver()->click($addMoreButtonXpath); $this->assertWaitOnAjaxRequest(); } $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', "#edit-{$fieldSelector}-wrapper table > tbody > tr:nth-child(" . (($numberOfParagraphs + 1) * 2 + 1) . ")")); From 8a662fefe0618b70d74ca9fc12630c3547b3f0cd Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Thu, 13 Aug 2026 12:54:23 +0200 Subject: [PATCH 5/5] fix paragraphs min-version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5db774432..85e0f2021 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "drupal/media_file_delete": "^1.2", "drupal/metatag": "^2.1.1", "drupal/metatag_async_widget": "^1.2", - "drupal/paragraphs": "^1.19", + "drupal/paragraphs": "^1.22", "drupal/paragraphs_features": "^2.2", "drupal/password_policy": "^4.0.3", "drupal/pathauto": "^1.15",