Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand All @@ -85,11 +82,11 @@
"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",
"drupal/paragraphs": "^1.19",
"drupal/paragraphs": "^1.22",
"drupal/paragraphs_features": "^2.2",
"drupal/password_policy": "^4.0.3",
"drupal/pathauto": "^1.15",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,13 @@
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.
*/
abstract class ThunderTaxonomyTermBreadcrumbBuilderBase implements BreadcrumbBuilderInterface {
use StringTranslationTrait;

/**
* The taxonomy storage.
*
* @var \Drupal\taxonomy\TermStorageInterface
*/
protected TermStorageInterface $termStorage;

/**
* Constructs the ThunderArticleBreadcrumbBuilder.
*
Expand All @@ -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) {
}

/**
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ abstract class ThunderSearchApiProducerBase extends DataProducerPluginBase imple
*
* @var \Drupal\thunder_gqls\Wrappers\SearchApiResponse
*/
private SearchApiResponse $responseWrapper;
protected SearchApiResponse $responseWrapper;

/**
* {@inheritdoc}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,13 +21,6 @@ class ThunderRedirectTest extends GraphQLTestBase {
*/
protected NodeInterface $node;

/**
* The redirect entity.
*
* @var \Drupal\Core\Entity\EntityStorageInterface
*/
protected EntityStorageInterface $storage;

/**
* {@inheritdoc}
*/
Expand All @@ -55,7 +47,6 @@ public function setUp(): void {
]);

$this->node->save();
$this->storage = $this->container->get('entity_type.manager')->getStorage('redirect');
}

/**
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) . ")"));
Expand Down
Loading