From 87e0ac33ad13cf8c1a35f2b81087f4726c7840bd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 23 Nov 2017 12:55:38 +0100
Subject: v9.1.7

---
 owncloud-9.1.4-dont_warn_about_php_versions.patch | 78 -----------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 owncloud-9.1.4-dont_warn_about_php_versions.patch

(limited to 'owncloud-9.1.4-dont_warn_about_php_versions.patch')

diff --git a/owncloud-9.1.4-dont_warn_about_php_versions.patch b/owncloud-9.1.4-dont_warn_about_php_versions.patch
deleted file mode 100644
index bef22bb..0000000
--- a/owncloud-9.1.4-dont_warn_about_php_versions.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/console.php b/console.php
-index 2bb3a2b..0df5343 100644
---- a/console.php
-+++ b/console.php
-@@ -33,22 +33,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 ownCloud 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 ownCloud is not compatible with PHP 7.1 until
--// version 10.0.0.
--if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
--	echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
--	echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.';
--	return;
--}
--
- function exceptionHandler($exception) {
- 	echo "An unhandled exception has been thrown:" . PHP_EOL;
- 	echo $exception;
-diff --git a/index.php b/index.php
-index ad33ad9..1210e4b 100644
---- a/index.php
-+++ b/index.php
-@@ -24,28 +24,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 ownCloud 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 ownCloud is not compatible with PHP 7.1 until
--// version 10.0.0.
--if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
--	echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
--	echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.';
--	return;
--}
--
--// running oC on Windows is unsupported since 8.1, this has to happen here because
--// is seems that the autoloader on Windows fails later and just throws an exception.
--if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
--	echo 'ownCloud Server does not support Microsoft Windows.';
--	return;
--}
- 
- try {
- 	
-diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
-index 52ef34d..bdb2a3a 100644
---- a/settings/Controller/CheckSetupController.php
-+++ b/settings/Controller/CheckSetupController.php
-@@ -349,11 +349,8 @@ Raw output
- 	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;
--		}
-+    // Red Hat support PHP so don't EOL
-+
- 		return $eol;
- 	}
- }
-- 
cgit