Merge branch 'master' into implement_712

1 files changed, 14 insertions, 8 deletions

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 0441c507f34..3881952872f 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];
 	}
 
 	/**