Commit ed3d1702 authored by Petar Bašić's avatar Petar Bašić
Browse files

Issue #3295523 by petar_basic, mostepaniukvm: Drupal 10 compatibility

parent d4905319

cache_tools.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ type: module 
name: Cache Tools

description: Module contains caching related tools.

package: Cache

core_version_requirement: ^8 || ^9
 
core_version_requirement: ^8.8 || ^9 || ^10

src/Plugin/views/cache/SanitizedCacheFieldTag.php

+4 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\cache_tools\Plugin\views\cache;



use Drupal\cache_tools\Service\CacheInvalidator;

use Drupal\cache_tools\Service\CacheSanitizer;

use Drupal\Core\Entity\EntityFieldManager;

use Drupal\Core\Entity\EntityTypeManager;
@@ -55,8 +56,8 @@ class SanitizedCacheFieldTag extends SanitizedCacheTag { 
  /**

   * {@inheritdoc}

   */

  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, CacheSanitizer $cacheSanitizer, EntityTypeManager $entityTypeManager, EntityFieldManager $fieldManager, RouteMatchInterface $routeMatch) {

    parent::__construct($configuration, $plugin_id, $plugin_definition, $cacheSanitizer);

  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, CacheSanitizer $cacheSanitizer, CacheInvalidator $cacheInvalidator, EntityTypeManager $entityTypeManager, EntityFieldManager $fieldManager, RouteMatchInterface $routeMatch) {

    parent::__construct($configuration, $plugin_id, $plugin_definition, $cacheSanitizer, $cacheInvalidator);

    $this->entityTypeManager = $entityTypeManager;

    $this->fieldManager = $fieldManager;

    $this->routeMatch = $routeMatch;
@@ -71,6 +72,7 @@ class SanitizedCacheFieldTag extends SanitizedCacheTag { 
      $plugin_id,

      $plugin_definition,

      $container->get('cache_tools.cache.sanitizer'),

      $container->get('cache_tools.cache.invalidator'),

      $container->get('entity_type.manager'),

      $container->get('entity_field.manager'),

      $container->get('current_route_match')

src/Plugin/views/cache/SanitizedCacheTag.php

+13 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\cache_tools\Plugin\views\cache;



use Drupal\cache_tools\Service\CacheInvalidator;

use Drupal\cache_tools\Service\CacheSanitizer;

use Drupal\node\Plugin\views\argument\Type;

use Drupal\views\Plugin\views\cache\Tag;
@@ -31,12 +32,20 @@ class SanitizedCacheTag extends Tag { 
   */

  protected $cacheSanitizer;



  /**

   * Cache invalidator.

   *

   * @var \Drupal\cache_tools\Service\CacheInvalidator

   */

  protected $cacheInvalidator;



  /**

   * {@inheritdoc}

   */

  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, CacheSanitizer $cacheSanitizer) {

  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, CacheSanitizer $cacheSanitizer, CacheInvalidator $cacheInvalidator) {

    parent::__construct($configuration, $plugin_id, $plugin_definition);

    $this->cacheSanitizer = $cacheSanitizer;

    $this->cacheInvalidator = $cacheInvalidator;

  }



  /**
@@ -47,7 +56,8 @@ class SanitizedCacheTag extends Tag { 
      $configuration,

      $plugin_id,

      $plugin_definition,

      $container->get('cache_tools.cache.sanitizer')

      $container->get('cache_tools.cache.sanitizer'),

      $container->get('cache_tools.cache.invalidator')

    );

  }
@@ -89,7 +99,7 @@ class SanitizedCacheTag extends Tag { 
    }

    // If no tag was found mark with general entity type tag.

    if (empty($tags)) {

      return [$this->cacheSanitizer->getPublishedEntityTypeCacheTag($view->getBaseEntityType())];

      return [$this->cacheInvalidator->getPublishedEntityTypeCacheTag($view->getBaseEntityType())];

    }

    return $tags;

  }