Skip to content
Snippets Groups Projects
Commit dafa2ad8 authored by catch's avatar catch
Browse files

Issue #3421480 by Spokje, longwave, andypost: Convert OpenerResolver to use a service locator

parent 19baa4e1
No related branches found
No related tags found
29 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #111518 passed with warnings
......@@ -9,8 +9,8 @@ services:
class: Drupal\media_library\Routing\RouteSubscriber
media_library.opener_resolver:
class: Drupal\media_library\OpenerResolver
calls:
- [setContainer, ['@service_container']]
tags:
- { name: service_collector, tag: media_library.opener, call: addOpener }
Drupal\media_library\OpenerResolverInterface: '@media_library.opener_resolver'
media_library.opener.field_widget:
class: Drupal\media_library\MediaLibraryFieldWidgetOpener
......
<?php
declare(strict_types=1);
namespace Drupal\media_library;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\DependencyInjection\ServiceProviderInterface;
/**
* Service provider for media library services.
*/
class MediaLibraryServiceProvider implements ServiceProviderInterface {
/**
* {@inheritdoc}
*/
public function register(ContainerBuilder $container) {
$container->registerForAutoconfiguration(MediaLibraryOpenerInterface::class)
->addTag('media_library.opener');
}
}
......@@ -2,10 +2,8 @@
namespace Drupal\media_library;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
/**
* Defines a class to get media library openers from the container.
* Defines a class to resolve media library openers.
*
* This is intended to be a very thin interface-verifying wrapper around
* services which implement \Drupal\media_library\MediaLibraryOpenerInterface.
......@@ -18,7 +16,22 @@
*/
class OpenerResolver implements OpenerResolverInterface {
use ContainerAwareTrait;
/**
* @var \Drupal\media_library\MediaLibraryOpenerInterface[]
*/
protected array $openers = [];
/**
* Registers an opener.
*
* @param \Drupal\media_library\MediaLibraryOpenerInterface $opener
* The opener.
* @param string $id
* The service ID.
*/
public function addOpener(MediaLibraryOpenerInterface $opener, string $id): void {
$this->openers[$id] = $opener;
}
/**
* {@inheritdoc}
......@@ -26,7 +39,7 @@ class OpenerResolver implements OpenerResolverInterface {
public function get(MediaLibraryState $state) {
$service_id = $state->getOpenerId();
$service = $this->container->get($service_id);
$service = $this->openers[$service_id] ?? NULL;
if ($service instanceof MediaLibraryOpenerInterface) {
return $service;
}
......
......@@ -29,6 +29,7 @@ class MediaLibraryAddFormTest extends KernelTestBase {
'media_library',
'file',
'field',
'filter',
'image',
'system',
'views',
......
......@@ -29,6 +29,7 @@ class MediaLibraryWidgetTest extends KernelTestBase {
'media',
'media_library',
'field',
'filter',
'image',
'system',
'views',
......
......@@ -1161,14 +1161,6 @@ parameters:
count: 1
path: modules/media/src/OEmbed/UrlResolver.php
-
message: """
#^Usage of deprecated trait Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareTrait in class Drupal\\\\media_library\\\\OpenerResolver\\:
since Symfony 6\\.4, use dependency injection instead$#
"""
count: 1
path: modules/media_library/src/OpenerResolver.php
-
message: "#^Variable \\$jpg_image might not be defined\\.$#"
count: 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment