Issue #3363420 by kim.pepper: Use CallableResolver for \Drupal\Core\Render\Renderer::doCallback()

  Drupal\Core\Render\RenderCacheInterface: '@render_cache'

  renderer:

    class: Drupal\Core\Render\Renderer

    arguments: ['@controller_resolver', '@theme.manager', '@plugin.manager.element_info', '@render_placeholder_generator', '@render_cache', '@request_stack', '%renderer.config%']

    arguments: ['@callable_resolver', '@theme.manager', '@plugin.manager.element_info', '@render_placeholder_generator', '@render_cache', '@request_stack', '%renderer.config%']

  Drupal\Core\Render\RendererInterface: '@renderer'

  early_rendering_controller_wrapper_subscriber:

    class: Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber

use Drupal\Core\Security\TrustedCallbackInterface;

use Drupal\Core\Security\DoTrustedCallbackTrait;

use Drupal\Core\Theme\ThemeManagerInterface;

use Drupal\Core\Utility\CallableResolver;

use Symfony\Component\HttpFoundation\RequestStack;

/**

  protected $theme;

  /**

   * The controller resolver.

   * The callable resolver.

   *

   * @var \Drupal\Core\Controller\ControllerResolverInterface

   * @var \Drupal\Core\Utility\CallableResolver

   */

  protected $controllerResolver;

  protected CallableResolver $callableResolver;

  /**

   * The element info.

  /**

   * Constructs a new Renderer.

   *

   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver

   *   The controller resolver.

   * @param \Drupal\Core\Utility\CallableResolver|\Drupal\Core\Controller\ControllerResolverInterface $callable_resolver

   *   The callable resolver.

   * @param \Drupal\Core\Theme\ThemeManagerInterface $theme

   *   The theme manager.

   * @param \Drupal\Core\Render\ElementInfoManagerInterface $element_info

   * @param array $renderer_config

   *   The renderer configuration array.

   */

  public function __construct(ControllerResolverInterface $controller_resolver, ThemeManagerInterface $theme, ElementInfoManagerInterface $element_info, PlaceholderGeneratorInterface $placeholder_generator, RenderCacheInterface $render_cache, RequestStack $request_stack, array $renderer_config) {

    $this->controllerResolver = $controller_resolver;

  public function __construct(ControllerResolverInterface|CallableResolver $callable_resolver, ThemeManagerInterface $theme, ElementInfoManagerInterface $element_info, PlaceholderGeneratorInterface $placeholder_generator, RenderCacheInterface $render_cache, RequestStack $request_stack, array $renderer_config) {

    if ($callable_resolver instanceof ControllerResolverInterface) {

      @trigger_error('Calling ' . __METHOD__ . '() with an argument of ControllerResolverInterface is deprecated in drupal:10.2.0 and is removed in drupal:11.0.0. Use \Drupal\Core\Utility\CallableResolver instead. See https://www.drupal.org/node/3369969', E_USER_DEPRECATED);

      $callable_resolver = \Drupal::service('callable_resolver');

    }

    $this->callableResolver = $callable_resolver;

    $this->theme = $theme;

    $this->elementInfo = $element_info;

    $this->placeholderGenerator = $placeholder_generator;

   * @see \Drupal\Core\Security\TrustedCallbackInterface

   */

  protected function doCallback($callback_type, $callback, array $args) {

    if (is_string($callback)) {

      $double_colon = strpos($callback, '::');

      if ($double_colon === FALSE) {

        $callback = $this->controllerResolver->getControllerFromDefinition($callback);

      }

      elseif ($double_colon > 0) {

        $callback = explode('::', $callback, 2);

      }

    }

    $callable = $this->callableResolver->getCallableFromDefinition($callback);

    $message = sprintf('Render %s callbacks must be methods of a class that implements \Drupal\Core\Security\TrustedCallbackInterface or be an anonymous function. The callback was %s. See https://www.drupal.org/node/2966725', $callback_type, '%s');

    // Add \Drupal\Core\Render\Element\RenderCallbackInterface as an extra

    // trusted interface so that:

    // - All public methods on Render elements are considered trusted.

    // - Helper classes that contain only callback methods can implement this

    //   instead of TrustedCallbackInterface.

    return $this->doTrustedCallback($callback, $args, $message, TrustedCallbackInterface::THROW_EXCEPTION, RenderCallbackInterface::class);

    return $this->doTrustedCallback($callable, $args, $message, TrustedCallbackInterface::THROW_EXCEPTION, RenderCallbackInterface::class);

  }

  /**

use Drupal\Core\Render\RenderContext;

use Drupal\Core\Render\Renderer;

use Drupal\Core\Utility\CallableResolver;

use Drupal\Tests\UnitTestCase;

use Drupal\views\Ajax\ViewAjaxResponse;

use Drupal\views\Controller\ViewAjaxController;

    $request_stack = new RequestStack();

    $request_stack->push(new Request());

    $this->renderer = new Renderer(

      $this->createMock('\Drupal\Core\Controller\ControllerResolverInterface'),

      $this->createMock(CallableResolver::class),

      $this->createMock('\Drupal\Core\Theme\ThemeManagerInterface'),

      $element_info_manager,

      $this->createMock('\Drupal\Core\Render\PlaceholderGeneratorInterface'),

    // Mock the State service.

    $memory_state = new State(new KeyValueMemoryFactory());

    \Drupal::getContainer()->set('state', $memory_state);

    $this->controllerResolver->expects($this->any())

      ->method('getControllerFromDefinition')

      ->willReturnArgument(0);

    // Simulate the theme system/Twig: a recursive call to Renderer::render(),

    // just like the theme system or a Twig template would have done.

   */

  protected function setUp(): void {

    parent::setUp();

    $this->controllerResolver->expects($this->any())

      ->method('getControllerFromDefinition')

    $this->callableResolver->expects($this->any())

      ->method('getCallableFromDefinition')

      ->willReturnArgument(0);

  }