From 92cb8acae9f4f6251d55ad9f105908e4344749b7 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 15 Jun 2018 07:33:35 +0200 Subject: Release wallabag 2.3.3 --- var/SymfonyRequirements.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'var/SymfonyRequirements.php') diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 3b14a402..4a1fcc62 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -389,7 +389,7 @@ class SymfonyRequirements extends RequirementCollection { /* mandatory requirements follow */ - $installedPhpVersion = phpversion(); + $installedPhpVersion = PHP_VERSION; $requiredPhpVersion = $this->getPhpRequiredVersion(); $this->addRecommendation( @@ -448,15 +448,8 @@ class SymfonyRequirements extends RequirementCollection } if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { - $timezones = array(); - foreach (DateTimeZone::listAbbreviations() as $abbreviations) { - foreach ($abbreviations as $abbreviation) { - $timezones[$abbreviation['timezone_id']] = true; - } - } - $this->addRequirement( - isset($timezones[@date_default_timezone_get()]), + in_array(@date_default_timezone_get(), DateTimeZone::listIdentifiers(), true), sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' ); @@ -731,7 +724,7 @@ class SymfonyRequirements extends RequirementCollection 'Install and/or enable a PHP accelerator (highly recommended).' ); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) { $this->addRecommendation( $this->getRealpathCacheSize() >= 5 * 1024 * 1024, 'realpath_cache_size should be at least 5M in php.ini', -- cgit v1.2.3