Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update check for outdated php version.
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
kesselb committed Feb 24, 2020
commit f228d73b38e5f71566c8dc055f4d322c0dc22514
10 changes: 3 additions & 7 deletions apps/settings/lib/Controller/CheckSetupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,8 @@ private function isUsedTlsLibOutdated() {
*
* @return bool
*/
protected function isPhpOutdated() {
if (version_compare(PHP_VERSION, '7.1.0', '<')) {
return true;
}

return false;
protected function isPhpOutdated(): bool {
return PHP_VERSION_ID < 70300;
}

/**
Expand All @@ -276,7 +272,7 @@ protected function isPhpOutdated() {
*
* @return array
*/
private function isPhpSupported() {
private function isPhpSupported(): array {
return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
}

Expand Down
12 changes: 6 additions & 6 deletions core/js/setupchecks.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,17 +263,17 @@
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
});
}
if(data.phpSupported && data.phpSupported.eol) {
if (data.phpSupported && data.phpSupported.eol) {
messages.push({
msg: t('core', 'You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target="_blank" rel="noreferrer noopener" href="{phpLink}">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'}),
msg: t('core', 'You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target="_blank" rel="noreferrer noopener" href="{phpLink}">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it.', { version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php' }),
type: OC.SetupChecks.MESSAGE_TYPE_INFO
});
})
}
if(data.phpSupported && data.phpSupported.version.substr(0, 3) === '5.6') {
if (data.phpSupported && data.phpSupported.version.substr(0, 3) === '7.2') {
messages.push({
msg: t('core', 'You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14.'),
msg: t('core', 'Nextcloud 19 is the last release supporting PHP 7.2. Nextcloud 20 requires at least PHP 7.3.'),
type: OC.SetupChecks.MESSAGE_TYPE_INFO
});
})
}
if(!data.forwardedForHeadersWorking) {
messages.push({
Expand Down