Commit 290b3d3d authored by catch's avatar catch
Browse files

Issue #3375454 by quietone: Fix version number in deprecation messages for #2551419

parent 6a41cb20

core/lib/Drupal/Core/Render/PlaceholderingRenderCache.php

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ class PlaceholderingRenderCache extends RenderCache { 
   */

  public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager, PlaceholderGeneratorInterface $placeholder_generator) {

    if ($cache_factory instanceof CacheFactoryInterface) {

      @trigger_error('Injecting ' . __CLASS__ . ' with the "cache_factory" service is deprecated in drupal:10.1.0, use "variation_cache_factory" instead.', E_USER_DEPRECATED);

      @trigger_error('Injecting ' . __CLASS__ . ' with the "cache_factory" service is deprecated in drupal:10.2.0, use "variation_cache_factory" instead.', E_USER_DEPRECATED);

      $cache_factory = \Drupal::service('variation_cache_factory');

    }

    parent::__construct($request_stack, $cache_factory, $cache_contexts_manager);

core/lib/Drupal/Core/Render/RenderCache.php

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class RenderCache implements RenderCacheInterface { 
   */

  public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager) {

    if ($cache_factory instanceof CacheFactoryInterface) {

      @trigger_error('Injecting ' . __CLASS__ . ' with the "cache_factory" service is deprecated in drupal:10.1.0, use "variation_cache_factory" instead.', E_USER_DEPRECATED);

      @trigger_error('Injecting ' . __CLASS__ . ' with the "cache_factory" service is deprecated in drupal:10.2.0, use "variation_cache_factory" instead.', E_USER_DEPRECATED);

      $cache_factory = \Drupal::service('variation_cache_factory');

    }

    $this->requestStack = $request_stack;

core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php

+2 −2
Original line number Diff line number Diff line
@@ -619,13 +619,13 @@ public function testReferencedEntity() { 
   * @return string

   *   The cache ID string.

   *

   * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no

   * @deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. There is no

   *   replacement.

   *

   * @see https://www.drupal.org/node/3354596

   */

  protected function createCacheId(array $keys, array $contexts) {

    @trigger_error(__FUNCTION__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See: https://www.drupal.org/project/drupal/issues/2551419.', E_USER_DEPRECATED);

    @trigger_error(__FUNCTION__ . '() is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. There is no replacement. See: https://www.drupal.org/project/drupal/issues/2551419.', E_USER_DEPRECATED);

    $cid_parts = $keys;



    $contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts);