[Cache] minor improvement in expiry handling
This commit is contained in:
parent
fdff819803
commit
13af58c57f
@ -74,11 +74,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
|
|||||||
$item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
|
$item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
|
||||||
|
|
||||||
if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
|
if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
|
||||||
if (\is_int($expiry = $item->metadata[CacheItem::METADATA_EXPIRY])) {
|
$item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
|
||||||
$item->expiresAt(\DateTime::createFromFormat('U', $expiry));
|
|
||||||
} else {
|
|
||||||
$item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.3F', $expiry)));
|
|
||||||
}
|
|
||||||
} elseif (0 < $defaultLifetime) {
|
} elseif (0 < $defaultLifetime) {
|
||||||
$item->expiresAfter($defaultLifetime);
|
$item->expiresAfter($defaultLifetime);
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
|
|||||||
$item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
|
$item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
|
||||||
}
|
}
|
||||||
$innerItem->set($item["\0*\0value"]);
|
$innerItem->set($item["\0*\0value"]);
|
||||||
$innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6f', 0 === $item["\0*\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);
|
$innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6F', 0 === $item["\0*\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
CacheItem::class
|
CacheItem::class
|
||||||
|
Reference in New Issue
Block a user