From 260614d225ad68cf4bb1bc31c2480b2ccd169d56 Mon Sep 17 00:00:00 2001
From: James Hogarth <james.hogarth@gmail.com>
Date: Tue, 21 Feb 2017 14:30:00 +0000
Subject: import of srpm from review

---
 nextcloud-10.0.3-dont-check-php-version.patch | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 nextcloud-10.0.3-dont-check-php-version.patch

(limited to 'nextcloud-10.0.3-dont-check-php-version.patch')

diff --git a/nextcloud-10.0.3-dont-check-php-version.patch b/nextcloud-10.0.3-dont-check-php-version.patch
new file mode 100644
index 0000000..a0dbb17
--- /dev/null
+++ b/nextcloud-10.0.3-dont-check-php-version.patch
@@ -0,0 +1,69 @@
+diff --git a/console.php b/console.php
+index b2724db..149c265 100644
+--- a/console.php
++++ b/console.php
+@@ -31,22 +31,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
+ 
+ define('OC_CONSOLE', 1);
+ 
+-// Show warning if a PHP version below 5.4.0 is used, this has to happen here
+-// because base.php will already use 5.4 syntax.
+-if (version_compare(PHP_VERSION, '5.4.0') === -1) {
+-	echo 'This version of Nextcloud requires at least PHP 5.4.0'.PHP_EOL;
+-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL;
+-	return;
+-}
+-
+-// Show warning if PHP 7.1 is used as Nextcloud is not compatible with PHP 7.1 for now
+-// @see https://github.com/nextcloud/docker-ci/issues/10
+-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+-	echo 'This version of Nextcloud is not compatible with PHP 7.1.<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/index.php b/index.php
+index e72d38c..29920d7 100644
+--- a/index.php
++++ b/index.php
+@@ -25,22 +25,6 @@
+  *
+  */
+ 
+-// Show warning if a PHP version below 5.4.0 is used, this has to happen here
+-// because base.php will already use 5.4 syntax.
+-if (version_compare(PHP_VERSION, '5.4.0') === -1) {
+-	echo 'This version of Nextcloud requires at least PHP 5.4.0<br/>';
+-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+-	return;
+-}
+-
+-// Show warning if PHP 7.1 is used as Nextcloud is not compatible with PHP 7.1 for now
+-// @see https://github.com/nextcloud/docker-ci/issues/10
+-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+-	echo 'This version of Nextcloud is not compatible with PHP 7.1.<br/>';
+-	echo 'You are currently running ' . PHP_VERSION . '.';
+-	return;
+-}
+-
+ try {
+ 
+ 	require_once __DIR__ . '/lib/base.php';
+diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
+index 86b9b76..ac42177 100644
+--- a/settings/Controller/CheckSetupController.php
++++ b/settings/Controller/CheckSetupController.php
+@@ -212,9 +212,7 @@ class CheckSetupController extends Controller {
+ 	 * @return bool
+ 	 */
+ 	protected function isPhpOutdated() {
+-		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+-			return true;
+-		}
++    // PHP supported in distribution
+ 		return false;
+ 	}
+ 
-- 
cgit