From: Jeremy Benoist Date: Sun, 29 Mar 2020 09:39:49 +0000 (+0200) Subject: Cleanup cookie jar X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=b12e23ad8a80097da47061c9329d418eee4607d0 Cleanup cookie jar As of latest Guzzle release, it's fixed so we can removed that code. --- diff --git a/src/Wallabag/CoreBundle/Helper/FileCookieJar.php b/src/Wallabag/CoreBundle/Helper/FileCookieJar.php index 9a63e949..4b4dca10 100644 --- a/src/Wallabag/CoreBundle/Helper/FileCookieJar.php +++ b/src/Wallabag/CoreBundle/Helper/FileCookieJar.php @@ -9,7 +9,6 @@ use Psr\Log\LoggerInterface; /** * Overidden Cookie behavior to: - * - fix multiple concurrent writes (see https://github.com/guzzle/guzzle/pull/1884) * - ignore error when the cookie file is malformatted (resulting in clearing it). */ class FileCookieJar extends BaseFileCookieJar @@ -27,29 +26,6 @@ class FileCookieJar extends BaseFileCookieJar $this->logger = $logger; } - /** - * Saves the cookies to a file. - * - * @param string $filename File to save - * - * @throws \RuntimeException if the file cannot be found or created - */ - public function save($filename) - { - $json = []; - foreach ($this as $cookie) { - if ($cookie->getExpires() && !$cookie->getDiscard()) { - $json[] = $cookie->toArray(); - } - } - - if (false === file_put_contents($filename, json_encode($json), LOCK_EX)) { - // @codeCoverageIgnoreStart - throw new \RuntimeException("Unable to save file {$filename}"); - // @codeCoverageIgnoreEnd - } - } - /** * Load cookies from a JSON formatted file. *