From c244e720172502466e67e2e8efaffa7d54047bdc Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Fri, 18 Aug 2017 10:22:52 +0200
Subject: [PATCH] set required PHP version for master/17.1 to 5.6, recommended
 version to 7.0 and add 7.1 to Travis checks

---
 .travis.yml                   | 18 ++++--------------
 api/src/loader.php            |  2 +-
 setup/inc/class.setup.inc.php |  4 ++--
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9b3a9cf571..9a42a0d932 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 php:
-  - 5.4
-  - 5.5
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
   - hhvm
 
 matrix:
@@ -28,23 +27,14 @@ before_script:
   - sudo apt-get update -qq
   - sudo apt-get install -y myrepos libpcre3-dev
   - case $(phpenv version-name) in
-    "5.4")
-       php -m;
-       yes "" | pecl install memcache;
-       yes "" | pecl install apcu-4.0.11;
-       yes "" | pecl install igbinary;
-       echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
-       phpenv config-rm xdebug.ini;
-       php -m;
-       ;;
-    "5.5"|"5.6")
+    "5.6")
        yes "" | pecl install memcache;
        yes "" | pecl install apcu-4.0.11;
        yes "" | pecl install igbinary;
        echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
        phpenv config-rm xdebug.ini;
        ;;
-    "7")
+    "7.0"|"7.1")
        yes "" | pecl install apcu;
        echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
        phpenv config-rm xdebug.ini;
diff --git a/api/src/loader.php b/api/src/loader.php
index 3d1f855228..484be32c3b 100644
--- a/api/src/loader.php
+++ b/api/src/loader.php
@@ -30,7 +30,7 @@ if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
 	set_magic_quotes_runtime(false);
 }
 
-$egw_min_php_version = '5.4';
+$egw_min_php_version = '5.6';
 if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_php_version) < 0)
 {
 	die("EGroupware requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 0b7a66e37e..a072afe32c 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -65,13 +65,13 @@ class setup
 	 *
 	 * @var float
 	 */
-	var $required_php_version = 5.4;
+	var $required_php_version = 5.6;
 	/**
 	 * PHP Version recommended for eGroupware
 	 *
 	 * @var string
 	 */
-	var $recommended_php_version = '5.6';
+	var $recommended_php_version = '7.0';
 
 	function __construct($html=False, $translation=False)
 	{