From f046e29c6d8cbcb0865f004b724463b4616eafa6 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Fri, 7 Jul 2017 18:45:55 -0700
Subject: [PATCH 1/2] Add PHP 7.2 to Travis CI matrix

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2581b516..d12cd3c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ dist: trusty
 
 language: php
 php:
-    - 7.0
+    - 7.2.0alpha2
     - 7.1
+    - 7.0
 
 matrix:
     fast_finish: true

From 81e059e84d31e8eb0f4380401984e51fc23faea2 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Tue, 11 Jul 2017 15:32:35 -0700
Subject: [PATCH 2/2] In PHP 7.2 the session_start() error messages have
 changed a bit

See PHP Bug 71038 for details https://bugs.php.net/bug.php?id=71038
---
 package.xml                              |  1 +
 tests/session_badconf_servers-php72.phpt | 30 ++++++++++++++++++++++++
 tests/session_badconf_servers.phpt       |  7 +++---
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 tests/session_badconf_servers-php72.phpt

diff --git a/package.xml b/package.xml
index 2cc8995b..5e1961f7 100644
--- a/package.xml
+++ b/package.xml
@@ -113,6 +113,7 @@ Fixes
     <file role='test' name='session_badconf_locktime.phpt'/>
     <file role='test' name='session_badconf_prefix.phpt'/>
     <file role='test' name='session_badconf_servers.phpt'/>
+    <file role='test' name='session_badconf_servers-php72.phpt'/>
     <file role='test' name='session_basic.phpt'/>
     <file role='test' name='session_basic2.phpt'/>
     <file role='test' name='session_basic3.phpt'/>
diff --git a/tests/session_badconf_servers-php72.phpt b/tests/session_badconf_servers-php72.phpt
new file mode 100644
index 00000000..92012369
--- /dev/null
+++ b/tests/session_badconf_servers-php72.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Session bad configurations, invalid save path (server list)
+--SKIPIF--
+<?php
+include dirname(__FILE__) . "/skipif.inc";
+if (!Memcached::HAVE_SESSION) print "skip";
+if (PHP_VERSION_ID < 70200) print "skip";
+?>
+--INI--
+session.save_handler = memcached
+--FILE--
+<?php
+include dirname (__FILE__) . '/config.inc';
+ini_set ('session.save_path', MEMC_SERVER_HOST . ':' . MEMC_SERVER_PORT);
+
+error_reporting(0);
+function handler($errno, $errstr) {
+	echo "$errstr\n";
+}
+
+set_error_handler('handler', E_ALL);
+
+ini_set('memcached.sess_prefix', 'memc.sess.key.');
+ini_set('session.save_path', '');
+session_start();
+session_write_close();
+
+--EXPECT--
+session_start(): failed to parse session.save_path
+session_start(): Failed to initialize storage module: memcached (path: )
diff --git a/tests/session_badconf_servers.phpt b/tests/session_badconf_servers.phpt
index b5c0803b..57d77735 100644
--- a/tests/session_badconf_servers.phpt
+++ b/tests/session_badconf_servers.phpt
@@ -1,9 +1,10 @@
 --TEST--
 Session bad configurations, invalid save path (server list)
 --SKIPIF--
-<?php 
-include dirname(__FILE__) . "/skipif.inc"; 
+<?php
+include dirname(__FILE__) . "/skipif.inc";
 if (!Memcached::HAVE_SESSION) print "skip";
+if (PHP_VERSION_ID > 70100) print "skip";
 ?>
 --INI--
 session.save_handler = memcached
@@ -24,5 +25,5 @@ ini_set('session.save_path', '');
 session_start();
 session_write_close();
 
---EXPECTF--
+--EXPECT--
 session_start(): failed to parse session.save_path