Skip to content
Snippets Groups Projects
Commit 7e847dc5 authored by catch's avatar catch
Browse files

Issue #3070022 by gease, sokru, kfritsche, hchonov, lauriii: Introduce... 

Issue #3070022 by gease, sokru, kfritsche, hchonov, lauriii: Introduce EntityBase::getCacheTagsToInvalidateOnSave()
parent e9750b4c
No related branches found
No related tags found
29 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+ 4
− 9
View file @ 7e847dc5
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace Drupal\Core\Config\Entity; namespace Drupal\Core\Config\Entity;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\Schema\SchemaIncompleteException; use Drupal\Core\Config\Schema\SchemaIncompleteException;
use Drupal\Core\Entity\EntityBase; use Drupal\Core\Entity\EntityBase;
use Drupal\Core\Config\ConfigDuplicateUUIDException; use Drupal\Core\Config\ConfigDuplicateUUIDException;
...@@ -480,8 +479,8 @@ public function onDependencyRemoval(array $dependencies) { ...@@ -480,8 +479,8 @@ public function onDependencyRemoval(array $dependencies) {
* Override to never invalidate the entity's cache tag; the config system * Override to never invalidate the entity's cache tag; the config system
* already invalidates it. * already invalidates it.
*/ */
protected function invalidateTagsOnSave($update) { protected function getTagsToInvalidateOnSave($update) {
Cache::invalidateTags($this->getListCacheTagsToInvalidate()); return $this->getEntityType()->getListCacheTags();
} }
/** /**
...@@ -490,12 +489,8 @@ protected function invalidateTagsOnSave($update) { ...@@ -490,12 +489,8 @@ protected function invalidateTagsOnSave($update) {
* Override to never invalidate the individual entities' cache tags; the * Override to never invalidate the individual entities' cache tags; the
* config system already invalidates them. * config system already invalidates them.
*/ */
protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_type, array $entities) { protected static function getTagsToInvalidateOnDelete(EntityTypeInterface $entity_type, array $entities) {
$tags = $entity_type->getListCacheTags(); return $entity_type->getListCacheTags();
foreach ($entities as $entity) {
$tags = Cache::mergeTags($tags, $entity->getListCacheTagsToInvalidate());
}
Cache::invalidateTags($tags);
} }
/** /**
......
core/lib/Drupal/Core/Entity/EntityBase.php
+ 34
− 6
View file @ 7e847dc5
...@@ -509,12 +509,15 @@ public static function create(array $values = []) { ...@@ -509,12 +509,15 @@ public static function create(array $values = []) {
} }
/** /**
* Invalidates an entity's cache tags upon save. * Get an entity's cache tags upon save.
* *
* @param bool $update * @param bool $update
* TRUE if the entity has been updated, or FALSE if it has been inserted. * TRUE if the entity has been updated, or FALSE if it has been inserted.
*
* @return string[]
* A set of cache tags.
*/ */
protected function invalidateTagsOnSave($update) { protected function getTagsToInvalidateOnSave($update) {
// An entity was created or updated: invalidate its list cache tags. (An // An entity was created or updated: invalidate its list cache tags. (An
// updated entity may start to appear in a listing because it now meets that // updated entity may start to appear in a listing because it now meets that
// listing's filtering requirements. A newly created entity may start to // listing's filtering requirements. A newly created entity may start to
...@@ -528,18 +531,31 @@ protected function invalidateTagsOnSave($update) { ...@@ -528,18 +531,31 @@ protected function invalidateTagsOnSave($update) {
// An existing entity was updated, also invalidate its unique cache tag. // An existing entity was updated, also invalidate its unique cache tag.
$tags = Cache::mergeTags($tags, $this->getCacheTagsToInvalidate()); $tags = Cache::mergeTags($tags, $this->getCacheTagsToInvalidate());
} }
Cache::invalidateTags($tags); return $tags;
} }
/** /**
* Invalidates an entity's cache tags upon delete. * Invalidates an entity's cache tags upon save.
*
* @param bool $update
* TRUE if the entity has been updated, or FALSE if it has been inserted.
*/
protected function invalidateTagsOnSave($update) {
Cache::invalidateTags($this->getTagsToInvalidateOnSave($update));
}
/**
* Get entity's cache tags upon delete.
* *
* @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
* The entity type definition. * The entity type definition.
* @param \Drupal\Core\Entity\EntityInterface[] $entities * @param \Drupal\Core\Entity\EntityInterface[] $entities
* An array of entities. * An array of entities.
*
* @return string[]
* A set of cache tags.
*/ */
protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_type, array $entities) { protected static function getTagsToInvalidateOnDelete(EntityTypeInterface $entity_type, array $entities) {
$tags = $entity_type->getListCacheTags(); $tags = $entity_type->getListCacheTags();
foreach ($entities as $entity) { foreach ($entities as $entity) {
// An entity was deleted: invalidate its own cache tag, but also its list // An entity was deleted: invalidate its own cache tag, but also its list
...@@ -550,7 +566,19 @@ protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_typ ...@@ -550,7 +566,19 @@ protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_typ
$tags = Cache::mergeTags($tags, $entity->getCacheTagsToInvalidate()); $tags = Cache::mergeTags($tags, $entity->getCacheTagsToInvalidate());
$tags = Cache::mergeTags($tags, $entity->getListCacheTagsToInvalidate()); $tags = Cache::mergeTags($tags, $entity->getListCacheTagsToInvalidate());
} }
Cache::invalidateTags($tags); return $tags;
}
/**
* Invalidates an entity's cache tags upon delete.
*
* @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
* The entity type definition.
* @param \Drupal\Core\Entity\EntityInterface[] $entities
* An array of entities.
*/
protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_type, array $entities) {
Cache::invalidateTags(static::getTagsToInvalidateOnDelete($entity_type, $entities));
} }
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment