From bae6f66f4171001250e54bbce73b322614d2e66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Mon, 23 Mar 2015 18:49:57 +0100 Subject: [PATCH] Bump php minimum version requirement. --- .travis.yml | 1 - .../Setup/Requirements/OpcodeCacheRequirement.php | 4 ++++ .../Phrasea/Setup/Requirements/SystemRequirements.php | 11 +++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c8d7e6325..f39f11e266 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ before_script: - npm --version - travis_retry npm install - phpenv config-rm xdebug.ini - - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini - echo 'extension="memcache.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcache.ini diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php index 93d2daf03a..cf1b4b8bd8 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php @@ -19,6 +19,10 @@ class OpcodeCacheRequirement extends RequirementCollection implements Requiremen { $this->setName('Opcode Cache'); + if (version_compare(phpversion(), '5.5.0', '>=')) { + return; + } + $this->addRecommendation( extension_loaded('apc') || class_exists('xcache') || class_exists('wincache'), 'A cache opcode extension such as apc, xcache or wincache is recommended', diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php index 75cc37fa71..9c78a2b0b5 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php @@ -15,7 +15,7 @@ use Alchemy\Phrasea\Setup\RequirementCollection; class SystemRequirements extends RequirementCollection implements RequirementInterface { - const REQUIRED_PHP_VERSION = '5.4.0'; + const REQUIRED_PHP_VERSION = '5.5.0'; public function __construct() { @@ -281,11 +281,10 @@ class SystemRequirements extends RequirementCollection implements RequirementInt ); $accelerator = - (function_exists('apc_store') && ini_get('apc.enabled')) - || - function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') - || - function_exists('xcache_set') + version_compare(phpversion(), '5.5.0', '>=') + || (function_exists('apc_store') && ini_get('apc.enabled')) + || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') + || function_exists('xcache_set') ; $this->addRecommendation(