diff --git a/group.info.yml b/group.info.yml index 6ee2d46..5ebce80 100644 --- a/group.info.yml +++ b/group.info.yml @@ -7,7 +7,6 @@ configure: 'group.settings' dependencies: - 'drupal:options' - 'entity:entity' - - 'variationcache:variationcache' # Information added by Drupal.org packaging script on 2023-08-30 version: '8.x-1.6' diff --git a/group.services.yml b/group.services.yml index a823b22..076355b 100644 --- a/group.services.yml +++ b/group.services.yml @@ -176,10 +176,10 @@ services: # See https://www.drupal.org/project/drupal/issues/2551419 # @todo Rename to variation_cache.group_permission in 8.2.0. variation_cache.group_default: - class: Drupal\variationcache\Cache\VariationCacheInterface + class: Drupal\Core\Cache\VariationCacheInterface factory: variation_cache_factory:get arguments: [group_permission] variation_cache.corefix_static_no_serialize: - class: Drupal\variationcache\Cache\VariationCacheInterface + class: Drupal\Core\Cache\VariationCacheInterface factory: variation_cache_factory:get arguments: [corefix_static_no_serialize] diff --git a/src/Access/ChainGroupPermissionCalculator.php b/src/Access/ChainGroupPermissionCalculator.php index c06fae6..32beefe 100644 --- a/src/Access/ChainGroupPermissionCalculator.php +++ b/src/Access/ChainGroupPermissionCalculator.php @@ -4,9 +4,9 @@ namespace Drupal\group\Access; use Drupal\Core\Cache\CacheableMetadata; use Drupal\Core\Cache\CacheBackendInterface; +use Drupal\Core\Cache\VariationCacheInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AccountSwitcherInterface; -use Drupal\variationcache\Cache\VariationCacheInterface; /** * Collects group permissions for an account. @@ -23,14 +23,14 @@ class ChainGroupPermissionCalculator implements ChainGroupPermissionCalculatorIn /** * The variation cache backend to use as a persistent cache. * - * @var \Drupal\variationcache\Cache\VariationCacheInterface + * @var \Drupal\Core\Cache\VariationCacheInterface */ protected $cache; /** * The variation cache backend to use as a static cache. * - * @var \Drupal\variationcache\Cache\VariationCacheInterface + * @var \Drupal\Core\Cache\VariationCacheInterface */ protected $static; @@ -51,9 +51,9 @@ class ChainGroupPermissionCalculator implements ChainGroupPermissionCalculatorIn /** * Constructs a ChainGroupPermissionCalculator object. * - * @param \Drupal\variationcache\Cache\VariationCacheInterface $cache + * @param \Drupal\Core\Cache\VariationCacheInterface $cache * The variation cache to use as a persistent cache. - * @param \Drupal\variationcache\Cache\VariationCacheInterface $static + * @param \Drupal\Core\Cache\VariationCacheInterface $static * The variation cache to use as a static cache. * @param \Drupal\Core\Cache\CacheBackendInterface $regular_static * The regular cache backend to use as a static cache.