From 1bc7e338a4c1856c186a30a0a2357457ac46071e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 30 Aug 2016 17:50:28 +0200
Subject: [PATCH 1/4] Exclude older PHP versions from .travis.yml

---
 .travis.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05b07beac3d..ddcba167af1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: php
 php:
-  - 5.4
+  - 5.6
 
 env:
   global:
@@ -41,21 +41,17 @@ matrix:
   include:
     - php: 7.0
       env: TC=autoloader;TEST_DAV=0
-    - php: 5.4
+    - php: 5.6
       env: DB=pgsql;TC=litmus-v1
-    - php: 5.4
+    - php: 5.6
       env: DB=sqlite;TC=carddav
-    - php: 5.4
+    - php: 5.6
       env: DB=sqlite;TC=caldav
-    - php: 5.4
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 5.5
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
     - php: 5.6
       env: DB=sqlite;TC=syntax;TEST_DAV=0
     - php: 7.0
       env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 5.4
+    - php: 5.6
       env: DB=sqlite;TC=app:check-code;TEST_DAV=0
 
   fast_finish: true

From d149f2288d58e0be9d83172ecd857cdb7a9b7e6e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 30 Aug 2016 18:26:06 +0200
Subject: [PATCH 2/4] Execute only tests for modern PHP versions

---
 .drone.yml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2798176c9a2..6016ebd6981 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,18 +3,6 @@ build:
     image: nextcloudci/jsunit:1.0.6
     commands:
       - ./autotest-js.sh
-  nodb-php5.4:
-    image: nextcloudci/php5.4:1.0.7
-    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-  nodb-php5.5:
-    image: nextcloudci/php5.5:1.0.7
-    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
   nodb-php5.6:
     image: nextcloudci/php5.6:1.0.6
     commands:
@@ -27,18 +15,6 @@ build:
       - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
       - git submodule update --init
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-  sqlite-php5.4:
-    image: nextcloudci/php5.4:1.0.7
-    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
-  sqlite-php5.5:
-    image: nextcloudci/php5.5:1.0.7
-    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
   sqlite-php5.6:
     image: nextcloudci/php5.6:1.0.6
     commands:

From 4212ffbdac12ce1404f08444ddf547ea3bfd7de3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 30 Aug 2016 18:26:48 +0200
Subject: [PATCH 3/4] Show error if PHP version below 5.6 is used

---
 index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index e42a0bbd7bc..8db4bf6d4e0 100644
--- a/index.php
+++ b/index.php
@@ -25,10 +25,10 @@
  *
  */
 
-// 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/>';
+// 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 ownCloud requires at least PHP 5.6.0<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
 	return;
 }

From 5e10284e34f50830000ff293384c7f602dab0e1f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 30 Aug 2016 18:27:44 +0200
Subject: [PATCH 4/4] Proper branding

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 8db4bf6d4e0..8c3066d2409 100644
--- a/index.php
+++ b/index.php
@@ -28,7 +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 ownCloud requires at least PHP 5.6.0<br/>';
+	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;
 }