From f5c361cf44739058b79f322576a1bad2d8c142d9 Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Fri, 20 Jan 2023 11:45:08 +0100 Subject: composer run cs:fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/App/AppStore/Bundles/EducationBundle.php | 1 - lib/private/App/AppStore/Bundles/EnterpriseBundle.php | 1 - lib/private/App/AppStore/Bundles/GroupwareBundle.php | 1 - .../App/AppStore/Bundles/SocialSharingBundle.php | 1 - lib/private/App/AppStore/Fetcher/AppFetcher.php | 17 ++++++++--------- lib/private/App/AppStore/Fetcher/Fetcher.php | 2 -- 6 files changed, 8 insertions(+), 15 deletions(-) (limited to 'lib/private/App/AppStore') diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index 661cc70578f..58ffd4f83b8 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EducationBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php index 901467048a8..bb64ec391ff 100644 --- a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php +++ b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EnterpriseBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/GroupwareBundle.php b/lib/private/App/AppStore/Bundles/GroupwareBundle.php index f1e130806c4..3a46ada52ad 100644 --- a/lib/private/App/AppStore/Bundles/GroupwareBundle.php +++ b/lib/private/App/AppStore/Bundles/GroupwareBundle.php @@ -25,7 +25,6 @@ namespace OC\App\AppStore\Bundles; class GroupwareBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php index 394cce17d63..f823792745b 100644 --- a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php +++ b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class SocialSharingBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 579f350b5bb..35bec10f5ae 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -39,7 +39,6 @@ use OCP\Support\Subscription\IRegistry; use Psr\Log\LoggerInterface; class AppFetcher extends Fetcher { - /** @var CompareVersion */ private $compareVersion; @@ -117,15 +116,15 @@ class AppFetcher extends Fetcher { $minPhpVersion = $phpVersion->getMinimumVersion(); $maxPhpVersion = $phpVersion->getMaximumVersion(); $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $minPhpVersion, - '>=' - ); + PHP_VERSION, + $minPhpVersion, + '>=' + ); $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $maxPhpVersion, - '<=' - ); + PHP_VERSION, + $maxPhpVersion, + '<=' + ); $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled; } diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 788f15c183f..0eb089bbdc2 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -167,10 +167,8 @@ abstract class Fetcher { // Always get latests apps info if $allowUnstable if (!$allowUnstable && is_array($jsonBlob)) { - // No caching when the version has been updated if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) { - // If the timestamp is older than 3600 seconds request the files new if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) { return $jsonBlob['data']; -- cgit v1.2.3