Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/4177/merge
catch 2023-07-24 08:53:08 +01:00
parent 6a41cb20e9
commit 290b3d3dd0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Render/PlaceholderingRenderCache.php
View File

@ -85,7 +85,7 @@ class PlaceholderingRenderCache extends RenderCache {
*/ */
public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager, PlaceholderGeneratorInterface $placeholder_generator) { public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager, PlaceholderGeneratorInterface $placeholder_generator) {
if ($cache_factory instanceof CacheFactoryInterface) { 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'); $cache_factory = \Drupal::service('variation_cache_factory');
} }
parent::__construct($request_stack, $cache_factory, $cache_contexts_manager); parent::__construct($request_stack, $cache_factory, $cache_contexts_manager);

2
core/lib/Drupal/Core/Render/RenderCache.php
View File

@ -47,7 +47,7 @@ class RenderCache implements RenderCacheInterface {
*/ */
public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager) { public function __construct(RequestStack $request_stack, $cache_factory, CacheContextsManager $cache_contexts_manager) {
if ($cache_factory instanceof CacheFactoryInterface) { 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'); $cache_factory = \Drupal::service('variation_cache_factory');
} }
$this->requestStack = $request_stack; $this->requestStack = $request_stack;

4
core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
View File

@ -619,13 +619,13 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
* @return string * @return string
* The cache ID 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. * replacement.
* *
* @see https://www.drupal.org/node/3354596 * @see https://www.drupal.org/node/3354596
*/ */
protected function createCacheId(array $keys, array $contexts) { 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; $cid_parts = $keys;
$contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts); $contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts);