projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Cache
/
Cache.php
diff --git
a/web/core/lib/Drupal/Core/Cache/Cache.php
b/web/core/lib/Drupal/Core/Cache/Cache.php
index f02a4e7cd718dc0c1c2efe490474a18695b9165d..9257aab3f69d04ad27c7e7d8ed590495706bf402 100644
(file)
--- a/
web/core/lib/Drupal/Core/Cache/Cache.php
+++ b/
web/core/lib/Drupal/Core/Cache/Cache.php
@@
-20,9
+20,9
@@
class Cache {
* Merges arrays of cache contexts and removes duplicates.
*
* @param array $a
* Merges arrays of cache contexts and removes duplicates.
*
* @param array $a
- *
Cache contexts array to merge.
+ * Cache contexts array to merge.
* @param array $b
* @param array $b
- *
Cache contexts array to merge.
+ * Cache contexts array to merge.
*
* @return string[]
* The merged array of cache contexts.
*
* @return string[]
* The merged array of cache contexts.
@@
-46,9
+46,9
@@
class Cache {
* they're constituted from.
*
* @param array $a
* they're constituted from.
*
* @param array $a
- *
Cache tags array to merge.
+ * Cache tags array to merge.
* @param array $b
* @param array $b
- *
Cache tags array to merge.
+ * Cache tags array to merge.
*
* @return string[]
* The merged array of cache tags.
*
* @return string[]
* The merged array of cache tags.
@@
-67,9
+67,9
@@
class Cache {
* Ensures infinite max-age (Cache::PERMANENT) is taken into account.
*
* @param int $a
* Ensures infinite max-age (Cache::PERMANENT) is taken into account.
*
* @param int $a
- *
Max age value to merge.
+ * Max age value to merge.
* @param int $b
* @param int $b
- *
Max age value to merge.
+ * Max age value to merge.
*
* @return int
* The minimum max-age value.
*
* @return int
* The minimum max-age value.