Skip to content
Snippets Groups Projects
Verified Commit 0e2d34fb authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3487586 by geek-merlin: BlockLibraryController typehints...

Issue #3487586 by geek-merlin: BlockLibraryController typehints LazyContextRepository, not the interface

(cherry picked from commit 7a0fee2e)
parent 1e356a6d
Branches
Tags
21 merge requests!12227Issue #3181946 by jonmcl, mglaman,!12079Issue #3523476 by matthiasm11: Add empty check on operator,!12024Fix: DocBlock comment for return value of Drupal\Core\Database\Connection::transactionManager(),!11974Draft: Issue #3495165 by catch, joeyroth, berdir, texas-bronius: Better warning...,!11934Issue #3520997: DefaultLazyPluginCollection unnecessarily instantiates plugins when sorting collection,!11887Issue #3520065: The migrate Row class API is incomplete,!11636Draft: Issue #3515643 by macsim: fieldNameExists method is inconsistent,!11515Issue #3480419 by mondrake, smustgrave, catch: Method...,!11380Issue #3490698 by catch, spokje: Bump MINIMUM_STABILITY back to 'stable' when...,!11281Use Drupal Core Leadership terminology in MAINTAINERS.txt,!11239Issue #3507548: Allow workspace changes listing to show all items, without a pager,!11238Fix issue #3051797,!11213Issue #3506743 by tomislav.matokovic: Increasing the color contrast for the navigation block title against the background of the navigation sidebar to at least 4.5:1,!11147Draft: Try to avoid manually setting required cache contexts,!11108Issue #3490298 by nicxvan: Profiles can be missed in OOP hooks,!11093Drupal on MongoDB 11.1.x,!11017Issue #3502540: Add date filter for moderated content.,!11009Issue #3486972 migrate feed icon,!10999Cleaning up Taxonomy hooks and updating baseline.,!10977Issue #3501457: Fix path used in a A11y Test Admin,!10881Issue #3489329 by mfb, casey: symfony/http-foundation commit 32310ff breaks PathValidator
Pipeline #373195 canceled
Pipeline: drupal

#373196

    ...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
    use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Controller\ControllerBase;
    use Drupal\Core\EventSubscriber\MainContentViewSubscriber; use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
    use Drupal\Core\Menu\LocalActionManagerInterface; use Drupal\Core\Menu\LocalActionManagerInterface;
    use Drupal\Core\Plugin\Context\LazyContextRepository; use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
    use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Routing\RouteMatchInterface;
    use Drupal\Core\Url; use Drupal\Core\Url;
    use Symfony\Component\DependencyInjection\ContainerInterface;
    use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
    /** /**
    ...@@ -51,32 +50,20 @@ class BlockLibraryController extends ControllerBase { ...@@ -51,32 +50,20 @@ class BlockLibraryController extends ControllerBase {
    * *
    * @param \Drupal\Core\Block\BlockManagerInterface $block_manager * @param \Drupal\Core\Block\BlockManagerInterface $block_manager
    * The block manager. * The block manager.
    * @param \Drupal\Core\Plugin\Context\LazyContextRepository $context_repository * @param \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository
    * The context repository. * The context repository.
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    * The current route match. * The current route match.
    * @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager * @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager
    * The local action manager. * The local action manager.
    */ */
    public function __construct(BlockManagerInterface $block_manager, LazyContextRepository $context_repository, RouteMatchInterface $route_match, LocalActionManagerInterface $local_action_manager) { public function __construct(BlockManagerInterface $block_manager, ContextRepositoryInterface $context_repository, RouteMatchInterface $route_match, LocalActionManagerInterface $local_action_manager) {
    $this->blockManager = $block_manager; $this->blockManager = $block_manager;
    $this->routeMatch = $route_match; $this->routeMatch = $route_match;
    $this->localActionManager = $local_action_manager; $this->localActionManager = $local_action_manager;
    $this->contextRepository = $context_repository; $this->contextRepository = $context_repository;
    } }
    /**
    * {@inheritdoc}
    */
    public static function create(ContainerInterface $container) {
    return new static(
    $container->get('plugin.manager.block'),
    $container->get('context.repository'),
    $container->get('current_route_match'),
    $container->get('plugin.manager.menu.local_action')
    );
    }
    /** /**
    * Shows a list of blocks that can be added to a theme's layout. * Shows a list of blocks that can be added to a theme's layout.
    * *
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment