diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-12-12 13:27:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-12 13:27:10 +0300 |
commit | 134bd51fe6e5cd19b610eaa6da53b2819f6db3c4 (patch) | |
tree | fe9a530465f5e6c711a3bbf6ef9b157b07d963ae | |
parent | 115e7e29cf60c49ddfebece9c25f35f3c5e5dac4 (diff) | |
parent | b8af7ee9bc9badb76bbf8d7eb4ff9dcc8744ba6c (diff) |
Merge pull request #6830 from nextcloud/nc13_no_later_72
Nextcloud 13 is not compatible with newer than php 7.2
-rw-r--r-- | console.php | 10 | ||||
-rw-r--r-- | cron.php | 7 | ||||
-rw-r--r-- | index.php | 8 | ||||
-rw-r--r-- | lib/versioncheck.php | 18 | ||||
-rw-r--r-- | ocs/providers.php | 1 | ||||
-rw-r--r-- | ocs/v1.php | 1 | ||||
-rw-r--r-- | public.php | 3 | ||||
-rw-r--r-- | remote.php | 2 | ||||
-rw-r--r-- | status.php | 2 |
9 files changed, 31 insertions, 21 deletions
diff --git a/console.php b/console.php index d6854279ca3..67856a17b3b 100644 --- a/console.php +++ b/console.php @@ -29,20 +29,14 @@ * */ +require_once __DIR__ . '/lib/versioncheck.php'; + use OC\Console\Application; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Output\ConsoleOutput; define('OC_CONSOLE', 1); -// Show warning if a PHP version below 5.6.0 is used, this has to happen here -// because base.php will already use 5.6 syntax. -if (version_compare(PHP_VERSION, '5.6.0') === -1) { - echo 'This version of Nextcloud requires at least PHP 5.6.0'.PHP_EOL; - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL; - return; -} - function exceptionHandler($exception) { echo "An unhandled exception has been thrown:" . PHP_EOL; echo $exception; @@ -34,12 +34,7 @@ * */ -// Show warning if a PHP version below 5.6.0 is used -if (version_compare(PHP_VERSION, '5.6.0') === -1) { - echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; - return; -} +require_once __DIR__ . '/lib/versioncheck.php'; try { diff --git a/index.php b/index.php index abe30d48aba..858e433b98a 100644 --- a/index.php +++ b/index.php @@ -28,13 +28,7 @@ * */ -// Show warning if a PHP version below 5.6.0 is used, this has to happen here -// because base.php will already use 5.6 syntax. -if (version_compare(PHP_VERSION, '5.6.0') === -1) { - echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; - return; -} +require_once __DIR__ . '/lib/versioncheck.php'; try { diff --git a/lib/versioncheck.php b/lib/versioncheck.php new file mode 100644 index 00000000000..23b09c28e14 --- /dev/null +++ b/lib/versioncheck.php @@ -0,0 +1,18 @@ +<?php + +// Show warning if a PHP version below 5.6.0 is used, this has to happen here +// because base.php will already use 5.6 syntax. +if (version_compare(PHP_VERSION, '5.6.0') === -1) { + http_response_code(500); + echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; + echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; + exit(-1); +} + +// Show warning if > PHP 7.2 is used as Nextcloud is not compatible with > PHP 7.2 for now +if (version_compare(PHP_VERSION, '7.3.0') !== -1) { + http_response_code(500); + echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>'; + echo 'You are currently running ' . PHP_VERSION . '.'; + exit(-1); +} diff --git a/ocs/providers.php b/ocs/providers.php index 79fc747c067..ded7680a2c7 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -23,6 +23,7 @@ * */ +require_once __DIR__ . '/../lib/versioncheck.php'; require_once __DIR__ . '/../lib/base.php'; header('Content-type: application/xml'); diff --git a/ocs/v1.php b/ocs/v1.php index 857dc0fd148..43a1c2d9e0e 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -29,6 +29,7 @@ * */ +require_once __DIR__ . '/../lib/versioncheck.php'; require_once __DIR__ . '/../lib/base.php'; if (\OCP\Util::needUpgrade() diff --git a/public.php b/public.php index 567408217d3..f8ef7a272b3 100644 --- a/public.php +++ b/public.php @@ -27,6 +27,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + +require_once __DIR__ . '/lib/versioncheck.php'; + try { require_once __DIR__ . '/lib/base.php'; diff --git a/remote.php b/remote.php index 1d83e5a7f83..8879a300296 100644 --- a/remote.php +++ b/remote.php @@ -28,6 +28,8 @@ * */ +require_once __DIR__ . '/lib/versioncheck.php'; + use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin; use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\Server; diff --git a/status.php b/status.php index f97c4410cc8..cc5d5215770 100644 --- a/status.php +++ b/status.php @@ -29,6 +29,8 @@ * */ +require_once __DIR__ . '/lib/versioncheck.php'; + try { require_once __DIR__ . '/lib/base.php'; |