diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-08-25 07:13:48 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-10-12 13:17:51 +0200 |
| commit | a25c0d580cda186d4d6ea08a7ae6a620584e2101 (patch) | |
| tree | 3848a7e8cebbbf94eeae5dd7d300a03599d4df8c /settings/Controller | |
| parent | 83b752de213571e48a1a7a422fd8c04dff2e2ff8 (diff) | |
| download | nextcloud-server-a25c0d580cda186d4d6ea08a7ae6a620584e2101.tar.gz nextcloud-server-a25c0d580cda186d4d6ea08a7ae6a620584e2101.zip | |
[stable9.1] Add missing unit tests (#25936)
* Adjust unit test execution after folder rename
* Adjust login controller tests to match current behavior
* Fix broken unit tests
Diffstat (limited to 'settings/Controller')
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 7e30616d1f5..52ef34d4ee5 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -212,12 +212,7 @@ class CheckSetupController extends Controller { * @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; - } + $eol = $this->isEndOfLive(); return ['eol' => $eol, 'version' => PHP_VERSION]; } @@ -347,4 +342,18 @@ Raw output ] ); } + + /** + * @return bool + */ + protected function isEndOfLive() { + $eol = false; + + //PHP 5.4 is EOL on 14 Sep 2015 + if (version_compare(PHP_VERSION, '5.5.0') === -1) { + $eol = true; + return $eol; + } + return $eol; + } } |