Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-08-15 18:36:45 +0300
committerLukas Reschke <lukas@statuscode.ch>2016-08-15 18:36:45 +0300
commit910176c540de634981c753224629cc4459312ded (patch)
tree2d5ed6d4e6cebaac08ce6d82d157cfc10e60ebb8 /settings
parentd6992e3f9f5bdd8d3a6ad5ea47381944a914ac66 (diff)
Fix CheckSetupController tests
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/CheckSetupController.php22
1 files changed, 14 insertions, 8 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 13e7e443621..19d0e01a687 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -234,20 +234,26 @@ class CheckSetupController extends Controller {
}
/**
+ * Whether the version is outdated
+ *
+ * @return bool
+ */
+ protected function isPhpOutdated() {
+ if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
* Whether the php version is still supported (at time of release)
* according to: https://secure.php.net/supported-versions.php
*
* @return array
*/
private function isPhpSupported() {
- $eol = false;
-
- //PHP 5.4 is EOL on 14 Sep 2015
- if (version_compare(PHP_VERSION, '5.5.0') === -1) {
- $eol = true;
- }
-
- return ['eol' => $eol, 'version' => PHP_VERSION];
+ return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
}
/**