Merge pull request #8216 from nextcloud/6830_12

Nextcloud 12 is not compatible with newer than php 7.1
nextcloud · Feb 8, 2018 · 2be70b1 · 2be70b1
2 parents 80bb01c + 88e4da2
commit 2be70b1
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 29 deletions.
diff --git a/console.php b/console.php
@@ -25,28 +25,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;
-}
-
-// Show warning if PHP 7.2 is used as Nextcloud is not compatible with PHP 7.2 for now
-// @see https://github.com/nextcloud/server/pull/5791
-if (version_compare(PHP_VERSION, '7.2.0') !== -1) {
-	echo 'This version of Nextcloud is not compatible with PHP 7.2.<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '.';
-	return;
-}
-
 function exceptionHandler($exception) {
 	echo "An unhandled exception has been thrown:" . PHP_EOL;
 	echo $exception;

diff --git a/cron.php b/cron.php
@@ -30,12 +30,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
@@ -25,13 +25,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';
 
 // Show warning if PHP 7.2 is used as Nextcloud is not compatible with PHP 7.2 for now
 // @see https://github.com/nextcloud/server/pull/5791

diff --git a/lib/versioncheck.php 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', '<')) {
+	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.1 is used as Nextcloud 12 is not compatible with > PHP 7.1
+if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
+	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -27,6 +27,8 @@
  *
  */
 
+require_once __DIR__ . '/lib/versioncheck.php';
+
 try {
 
 	require_once __DIR__ . '/lib/base.php';