mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-28 01:50:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4463 from wallabag/update-deps

Browse source 
Update deps
This commit is contained in:
Jérémy Benoist 2020-07-08 09:41:40 +02:00 committed by GitHub
parent 635b76da24 33d245b7da
commit 11fa4ac4f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 318 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
composer.json
View file

@ -53,7 +53,6 @@
"bdunogier/guzzle-site-authenticator": "^1.0.0", "bdunogier/guzzle-site-authenticator": "^1.0.0",
"craue/config-bundle": "^2.3.0", "craue/config-bundle": "^2.3.0",
"defuse/php-encryption": "^2.1", "defuse/php-encryption": "^2.1",
"doctrine/dbal": "2.9.2",
"doctrine/doctrine-bundle": "^1.9", "doctrine/doctrine-bundle": "^1.9",
"doctrine/doctrine-cache-bundle": "^1.3", "doctrine/doctrine-cache-bundle": "^1.3",
"doctrine/doctrine-migrations-bundle": "^1.3", "doctrine/doctrine-migrations-bundle": "^1.3",
@ -106,10 +105,10 @@
"m6web/redis-mock": "^5.0", "m6web/redis-mock": "^5.0",
"php-http/mock-client": "^1.0", "php-http/mock-client": "^1.0",
"phpstan/extension-installer": "^1.0", "phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.0", "phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12.0", "phpstan/phpstan-doctrine": "^0.12",
"phpstan/phpstan-phpunit": "^0.12.0", "phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-symfony": "^0.12.0", "phpstan/phpstan-symfony": "^0.12",
"symfony/maker-bundle": "^1.18", "symfony/maker-bundle": "^1.18",
"symfony/phpunit-bridge": "~5.1.1" "symfony/phpunit-bridge": "~5.1.1"
}, },

523
composer.lock generated
View file

File diff suppressed because it is too large Load diff

3
src/Wallabag/CoreBundle/Repository/TagRepository.php
View file

@ -27,8 +27,7 @@ class TagRepository extends EntityRepository
if (null !== $cacheLifeTime) { if (null !== $cacheLifeTime) {
$query->useQueryCache(true); $query->useQueryCache(true);
$query->useResultCache(true); $query->enableResultCache($cacheLifeTime);
$query->setResultCacheLifetime($cacheLifeTime);
} }
return \count($query->getArrayResult()); return \count($query->getArrayResult());

6
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View file

@ -109,8 +109,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
->getQuery(); ->getQuery();
$query->useQueryCache(true); $query->useQueryCache(true);
$query->useResultCache(true); $query->enableResultCache($this->lifeTime);
$query->setResultCacheLifetime($this->lifeTime);
return \count($query->getArrayResult()); return \count($query->getArrayResult());
} }
@ -150,8 +149,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
->getQuery(); ->getQuery();
$query->useQueryCache(true); $query->useQueryCache(true);
$query->useResultCache(true); $query->enableResultCache($this->lifeTime);
$query->setResultCacheLifetime($this->lifeTime);
$nbArchives = \count($query->getArrayResult()); $nbArchives = \count($query->getArrayResult());