From b24c4806f5dfe909394933f967f5a76dafaa66b1 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Fri, 1 Apr 2022 23:27:04 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20APIHelper=EC=97=90=EC=84=9C=20tryCache?= =?UTF-8?q?=EA=B0=80=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=EC=9D=B8=20=EB=B2=84=EA=B7=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sammo/APICacheResult.php | 12 ++++++++++++ src/sammo/APIHelper.php | 4 ++-- src/sammo/BaseAPI.php | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/sammo/APICacheResult.php diff --git a/src/sammo/APICacheResult.php b/src/sammo/APICacheResult.php new file mode 100644 index 00000000..774bde4f --- /dev/null +++ b/src/sammo/APICacheResult.php @@ -0,0 +1,12 @@ +tryCache(); if ($cacheResult !== null) { - /** @var \DateTimeInterface $lastModified */ - [$lastModified, $etag] = $cacheResult; + $lastModified = $cacheResult->lastModified; + $etag = $cacheResult->etag; if ($lastModified !== null) { header("Last-Modified: " . gmdate("D, d M Y H:i:s", Util::toInt(TimeUtil::DateTimeToSeconds($lastModified, true))) . " GMT"); diff --git a/src/sammo/BaseAPI.php b/src/sammo/BaseAPI.php index 784a1193..d4919b4d 100644 --- a/src/sammo/BaseAPI.php +++ b/src/sammo/BaseAPI.php @@ -22,7 +22,7 @@ abstract class BaseAPI /** @return null|string|array */ abstract function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag); - public function tryCache():?string{ + public function tryCache():?APICacheResult{ return null; } }