From becc395cde8088719ced6ad0ec9e715c4b8b20fd Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Tue, 8 Mar 2022 11:55:54 +0200
Subject: [PATCH] Move working tests up a folder

---
 tests/{experimental => }/add_bykey.phpt       |  6 +-
 .../addserver_unixdomain.phpt                 |  2 +-
 tests/{experimental => }/append_bykey.phpt    |  4 +-
 tests/{experimental => }/cas_bykey.phpt       |  4 +-
 tests/{experimental => }/cas_invalid_key.phpt |  6 +-
 tests/{experimental => }/delete_bykey.phpt    |  6 +-
 .../deletemulti_nonstringkeys.phpt            |  4 +-
 tests/experimental/get_bykey_cas.phpt         | 70 -------------------
 tests/{experimental => }/fetch.phpt           |  4 +-
 .../fetch_badunserialize.phpt                 | 15 +++-
 .../fetchall_badunserialize.phpt              | 15 +++-
 tests/{experimental => }/get.phpt             |  6 +-
 tests/{experimental => }/get_bykey.phpt       |  6 +-
 tests/get_bykey_cas.phpt                      | 61 ++++++++++++++++
 .../getdelayed_badserver.phpt                 |  2 +-
 .../getdelayed_badunserialize.phpt            | 15 +++-
 .../{experimental => }/getdelayed_bykey.phpt  |  4 +-
 .../getdelayed_bykey_cas.phpt                 | 34 +++++----
 .../getdelayed_nonstring_keys.phpt            |  4 +-
 .../getmulti_badserver.phpt                   |  8 +--
 .../getmulti_badunserialize.phpt              | 12 +++-
 tests/{experimental => }/getmulti_bykey.phpt  |  4 +-
 tests/{experimental => }/getmulti_empty.phpt  |  4 +-
 .../getmulti_partial_error.phpt               |  4 +-
 tests/{experimental => }/getversion.phpt      |  4 +-
 tests/{experimental => }/locale_float.phpt    |  4 +-
 tests/{experimental => }/moduleinfo.phpt      |  2 +-
 tests/{experimental => }/prepend_bykey.phpt   |  4 +-
 tests/{experimental => }/replace_bykey.phpt   |  4 +-
 tests/{experimental => }/set_bykey.phpt       |  6 +-
 .../set_comp_below_factor.phpt                |  4 +-
 .../set_default_serializer.phpt               |  2 +-
 .../set_invalid_serializer.phpt               |  2 +-
 .../setget_zero_factor.phpt                   |  4 +-
 tests/{experimental => }/setmulti_bykey.phpt  |  4 +-
 35 files changed, 190 insertions(+), 150 deletions(-)
 rename tests/{experimental => }/add_bykey.phpt (84%)
 rename tests/{experimental => }/addserver_unixdomain.phpt (87%)
 rename tests/{experimental => }/append_bykey.phpt (78%)
 rename tests/{experimental => }/cas_bykey.phpt (84%)
 rename tests/{experimental => }/cas_invalid_key.phpt (65%)
 rename tests/{experimental => }/delete_bykey.phpt (82%)
 rename tests/{experimental => }/deletemulti_nonstringkeys.phpt (87%)
 delete mode 100644 tests/experimental/get_bykey_cas.phpt
 rename tests/{experimental => }/fetch.phpt (93%)
 rename tests/{experimental => }/fetch_badunserialize.phpt (76%)
 rename tests/{experimental => }/fetchall_badunserialize.phpt (76%)
 rename tests/{experimental => }/get.phpt (78%)
 rename tests/{experimental => }/get_bykey.phpt (75%)
 create mode 100644 tests/get_bykey_cas.phpt
 rename tests/{experimental => }/getdelayed_badserver.phpt (87%)
 rename tests/{experimental => }/getdelayed_badunserialize.phpt (77%)
 rename tests/{experimental => }/getdelayed_bykey.phpt (89%)
 rename tests/{experimental => }/getdelayed_bykey_cas.phpt (76%)
 rename tests/{experimental => }/getdelayed_nonstring_keys.phpt (90%)
 rename tests/{experimental => }/getmulti_badserver.phpt (85%)
 rename tests/{experimental => }/getmulti_badunserialize.phpt (77%)
 rename tests/{experimental => }/getmulti_bykey.phpt (82%)
 rename tests/{experimental => }/getmulti_empty.phpt (60%)
 rename tests/{experimental => }/getmulti_partial_error.phpt (84%)
 rename tests/{experimental => }/getversion.phpt (69%)
 rename tests/{experimental => }/locale_float.phpt (80%)
 rename tests/{experimental => }/moduleinfo.phpt (86%)
 rename tests/{experimental => }/prepend_bykey.phpt (78%)
 rename tests/{experimental => }/replace_bykey.phpt (82%)
 rename tests/{experimental => }/set_bykey.phpt (83%)
 rename tests/{experimental => }/set_comp_below_factor.phpt (74%)
 rename tests/{experimental => }/set_default_serializer.phpt (95%)
 rename tests/{experimental => }/set_invalid_serializer.phpt (92%)
 rename tests/{experimental => }/setget_zero_factor.phpt (70%)
 rename tests/{experimental => }/setmulti_bykey.phpt (87%)

diff --git a/tests/experimental/add_bykey.phpt b/tests/add_bykey.phpt
similarity index 84%
rename from tests/experimental/add_bykey.phpt
rename to tests/add_bykey.phpt
index 195fe96d..1c1521d2 100644
--- a/tests/experimental/add_bykey.phpt
+++ b/tests/add_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::addByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->delete('foo');
@@ -15,7 +15,7 @@ echo $m->getResultMessage(), "\n";
 var_dump($m->addByKey('foo', '', 1, 10));
 echo $m->getResultMessage(), "\n";
 // This is OK for the binary protocol
-$rv = $m->addByKey('foo', ' asd ���', 1, 1);
+$rv = $m->addByKey('foo', ' asd åäö', 1, 1);
 if ($m->getOption(Memcached::OPT_BINARY_PROTOCOL)) {
 	if ($rv !== true and $m->getResultCode() !== Memcached::RES_SUCCESS) {
 		var_dump($rv);
diff --git a/tests/experimental/addserver_unixdomain.phpt b/tests/addserver_unixdomain.phpt
similarity index 87%
rename from tests/experimental/addserver_unixdomain.phpt
rename to tests/addserver_unixdomain.phpt
index 4848015d..7e16834c 100644
--- a/tests/experimental/addserver_unixdomain.phpt
+++ b/tests/addserver_unixdomain.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Memcached::addServer() unix doamin socket
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --CLEAN--
 <?php
 unlink('/tmp/memc_test_unix_socket');
diff --git a/tests/experimental/append_bykey.phpt b/tests/append_bykey.phpt
similarity index 78%
rename from tests/experimental/append_bykey.phpt
rename to tests/append_bykey.phpt
index 0e182ca4..d02c257d 100644
--- a/tests/experimental/append_bykey.phpt
+++ b/tests/append_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::appendByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 $m->setOption(Memcached::OPT_COMPRESSION, false);
 
diff --git a/tests/experimental/cas_bykey.phpt b/tests/cas_bykey.phpt
similarity index 84%
rename from tests/experimental/cas_bykey.phpt
rename to tests/cas_bykey.phpt
index 0a9da94e..32808813 100644
--- a/tests/experimental/cas_bykey.phpt
+++ b/tests/cas_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::casByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->delete('cas_test');
diff --git a/tests/experimental/cas_invalid_key.phpt b/tests/cas_invalid_key.phpt
similarity index 65%
rename from tests/experimental/cas_invalid_key.phpt
rename to tests/cas_invalid_key.phpt
index 6011c4b8..b8a815dc 100644
--- a/tests/experimental/cas_invalid_key.phpt
+++ b/tests/cas_invalid_key.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Memcached::cas() with strange key
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 error_reporting(0);
 var_dump($m->cas(0, '', true, 10));
 echo $m->getResultMessage(), "\n";
 
-var_dump($m->cas(0, ' �� jas kjjhask d ', true, 10)); # no spaces allowed
+var_dump($m->cas(0, ' äö jas kjjhask d ', true, 10)); # no spaces allowed
 echo $m->getResultMessage(), "\n";
 
 --EXPECTF--
diff --git a/tests/experimental/delete_bykey.phpt b/tests/delete_bykey.phpt
similarity index 82%
rename from tests/experimental/delete_bykey.phpt
rename to tests/delete_bykey.phpt
index 807af8ca..929ffbc1 100644
--- a/tests/experimental/delete_bykey.phpt
+++ b/tests/delete_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::deleteByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->setByKey('keffe', 'eisaleeoo', "foo");
@@ -21,7 +21,7 @@ var_dump($m->deleteByKey('keffe', ''));
 echo $m->getResultMessage(), "\n";
 var_dump($m->deleteByKey('', 'keffe'));
 echo $m->getResultMessage(), "\n";
-var_dump($m->deleteByKey('keffe', '���as�� �a�sd�f asdf')); # no spaces allowed
+var_dump($m->deleteByKey('keffe', 'äöåasäö åaösdäf asdf')); # no spaces allowed
 echo $m->getResultMessage(), "\n";
 --EXPECTF--
 string(3) "foo"
diff --git a/tests/experimental/deletemulti_nonstringkeys.phpt b/tests/deletemulti_nonstringkeys.phpt
similarity index 87%
rename from tests/experimental/deletemulti_nonstringkeys.phpt
rename to tests/deletemulti_nonstringkeys.phpt
index 2dac8920..8e275e9c 100644
--- a/tests/experimental/deletemulti_nonstringkeys.phpt
+++ b/tests/deletemulti_nonstringkeys.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Delete multi with integer keys
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(
diff --git a/tests/experimental/get_bykey_cas.phpt b/tests/experimental/get_bykey_cas.phpt
deleted file mode 100644
index 501b13a7..00000000
--- a/tests/experimental/get_bykey_cas.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-Memcached::getByKey() with CAS
---SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
---FILE--
-<?php
-include dirname(dirname(__FILE__)) . '/config.inc';
-$m = memc_get_instance ();
-
-function the_callback(Memcached $memc, $key, &$value) {
-	echo "called\n";
-	$value = "1234";
-	return 1;
-}
-
-$m->set('foo', 1, 10);
-
-$cas = null;
-var_dump($m->getByKey('foo', 'foo', null, $cas));
-var_dump($cas);
-echo $m->getResultMessage(), "\n";
-
-$cas = null;
-var_dump($m->getByKey('', 'foo', null, $cas));
-var_dump($cas);
-echo $m->getResultMessage(), "\n";
-
-$m->set('bar', "asdf", 10);
-
-$cas = null;
-var_dump($m->getByKey('foo', 'bar', null, $cas));
-var_dump($cas);
-echo $m->getResultMessage(), "\n";
-
-$m->delete('foo');
-$cas = null;
-var_dump($m->getByKey(' � foo jkh a s ���', 'foo', null, $cas));
-var_dump($cas);
-echo $m->getResultMessage(), "\n";
-
-$cas = null;
-var_dump($m->getByKey(' � foo jkh a s ���', '', null, $cas));
-var_dump($cas);
-echo $m->getResultMessage(), "\n";
-
-$m->delete('foo');
-$cas = null;
-var_dump($m->getByKey('foo', 'foo', 'the_callback', $cas));
-var_dump($cas);
-var_dump($m->getByKey('foo', 'foo'));
---EXPECTF--
-int(1)
-float(%d)
-SUCCESS
-int(1)
-float(%d)
-SUCCESS
-string(4) "asdf"
-float(%d)
-SUCCESS
-bool(false)
-float(0)
-NOT FOUND
-bool(false)
-NULL
-A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
-called
-string(4) "1234"
-float(0)
-string(4) "1234"
diff --git a/tests/experimental/fetch.phpt b/tests/fetch.phpt
similarity index 93%
rename from tests/experimental/fetch.phpt
rename to tests/fetch.phpt
index 13136c5b..68977466 100644
--- a/tests/experimental/fetch.phpt
+++ b/tests/fetch.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Memcached getDelayed() and fetch() with and without cas
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 
@@ -33,7 +33,7 @@ function simple_compare(array $data, array $actual, $has_cas) {
 }
 
 
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(
diff --git a/tests/experimental/fetch_badunserialize.phpt b/tests/fetch_badunserialize.phpt
similarity index 76%
rename from tests/experimental/fetch_badunserialize.phpt
rename to tests/fetch_badunserialize.phpt
index cf002731..58f4e0aa 100644
--- a/tests/experimental/fetch_badunserialize.phpt
+++ b/tests/fetch_badunserialize.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::fetch() with bad unserialize
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Foo implements Serializable {
@@ -31,6 +31,17 @@ class Foo implements Serializable {
 	public function unserialize($str) {
 		throw new Exception("123456");
 	}
+
+	public function __serialize() {
+		if ($this->serialize_throws) {
+			throw new Exception("1234");
+		}
+		return ["1234"];
+	}
+
+	public function __unserialize($str) {
+		throw new Exception("123456");
+	}
 }
 
 $data = new Foo();
diff --git a/tests/experimental/fetchall_badunserialize.phpt b/tests/fetchall_badunserialize.phpt
similarity index 76%
rename from tests/experimental/fetchall_badunserialize.phpt
rename to tests/fetchall_badunserialize.phpt
index 5684763f..815c9e21 100644
--- a/tests/experimental/fetchall_badunserialize.phpt
+++ b/tests/fetchall_badunserialize.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::fetch() with bad unserialize
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Foo implements Serializable {
@@ -31,6 +31,17 @@ class Foo implements Serializable {
 	public function unserialize($str) {
 		throw new Exception("123456");
 	}
+
+	public function __serialize() {
+		if ($this->serialize_throws) {
+			throw new Exception("1234");
+		}
+		return ["1234"];
+	}
+
+	public function __unserialize($str) {
+		throw new Exception("123456");
+	}
 }
 
 $data = new Foo();
diff --git a/tests/experimental/get.phpt b/tests/get.phpt
similarity index 78%
rename from tests/experimental/get.phpt
rename to tests/get.phpt
index 308bda98..71889064 100644
--- a/tests/experimental/get.phpt
+++ b/tests/get.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::get()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->delete('foo');
@@ -20,7 +20,7 @@ var_dump($m->get('foo'));
 echo $m->getResultMessage(), "\n";
 
 $m->delete('foo');
-var_dump($m->get(' � foo jkh a s ���'));
+var_dump($m->get(' ä foo jkh a s åäö'));
 echo $m->getResultMessage(), "\n";
 --EXPECT--
 bool(false)
diff --git a/tests/experimental/get_bykey.phpt b/tests/get_bykey.phpt
similarity index 75%
rename from tests/experimental/get_bykey.phpt
rename to tests/get_bykey.phpt
index a392aaeb..704e8f04 100644
--- a/tests/experimental/get_bykey.phpt
+++ b/tests/get_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->set('foo', 1, 10);
@@ -20,7 +20,7 @@ var_dump($m->getByKey('foo', 'bar'));
 echo $m->getResultMessage(), "\n";
 
 $m->delete('foo');
-var_dump($m->getByKey(' � foo jkh a s ���', 'foo'));
+var_dump($m->getByKey(' ä foo jkh a s åäö', 'foo'));
 echo $m->getResultMessage(), "\n";
 
 --EXPECTF--
diff --git a/tests/get_bykey_cas.phpt b/tests/get_bykey_cas.phpt
new file mode 100644
index 00000000..90b566c4
--- /dev/null
+++ b/tests/get_bykey_cas.phpt
@@ -0,0 +1,61 @@
+--TEST--
+Memcached::getByKey() with CAS
+--SKIPIF--
+<?php include "skipif.inc";?>
+--FILE--
+<?php
+include dirname(__FILE__) . '/config.inc';
+$m = memc_get_instance ();
+
+function the_callback(Memcached $memc, $key, &$value) {
+	echo "called\n";
+	$value = "1234";
+	return true;
+}
+
+$m->set('foo', 1, 10);
+
+$v = $m->getByKey('foo', 'foo', null, Memcached::GET_EXTENDED);
+var_dump($v['value']);
+var_dump($v['cas']);
+echo $m->getResultMessage(), "\n";
+
+$v = $m->getByKey('', 'foo', null, Memcached::GET_EXTENDED);
+var_dump($v['value']);
+var_dump($v['cas']);
+echo $m->getResultMessage(), "\n";
+
+$m->set('bar', "asdf", 10);
+
+$v = $m->getByKey('foo', 'bar', null, Memcached::GET_EXTENDED);
+var_dump($v['value']);
+var_dump($v['cas']);
+echo $m->getResultMessage(), "\n";
+
+$m->delete('foo');
+var_dump($m->getByKey(' ä foo jkh a s åäö', 'foo', null, Memcached::GET_EXTENDED));
+echo $m->getResultMessage(), "\n";
+
+var_dump($m->getByKey(' ä foo jkh a s åäö', '', null, Memcached::GET_EXTENDED));
+echo $m->getResultMessage(), "\n";
+
+$m->delete('foo');
+var_dump($m->getByKey('foo', 'foo', 'the_callback', Memcached::GET_EXTENDED));
+var_dump($m->getByKey('foo', 'foo'));
+--EXPECTF--
+int(1)
+int(%d)
+SUCCESS
+int(1)
+int(%d)
+SUCCESS
+string(4) "asdf"
+int(%d)
+SUCCESS
+bool(false)
+NOT FOUND
+bool(false)
+A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
+called
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/tests/experimental/getdelayed_badserver.phpt b/tests/getdelayed_badserver.phpt
similarity index 87%
rename from tests/experimental/getdelayed_badserver.phpt
rename to tests/getdelayed_badserver.phpt
index c4902174..5d274efb 100644
--- a/tests/experimental/getdelayed_badserver.phpt
+++ b/tests/getdelayed_badserver.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Memcached::getDelayedByKey() with bad server
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 $m = new Memcached();
diff --git a/tests/experimental/getdelayed_badunserialize.phpt b/tests/getdelayed_badunserialize.phpt
similarity index 77%
rename from tests/experimental/getdelayed_badunserialize.phpt
rename to tests/getdelayed_badunserialize.phpt
index 397135ae..fa60b9ad 100644
--- a/tests/experimental/getdelayed_badunserialize.phpt
+++ b/tests/getdelayed_badunserialize.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getDelayed() with bad unserialize
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Foo implements Serializable {
@@ -31,6 +31,17 @@ class Foo implements Serializable {
 	public function unserialize($str) {
 		throw new Exception("123456");
 	}
+
+	public function __serialize() {
+		if ($this->serialize_throws) {
+			throw new Exception("1234");
+		}
+		return ["1234"];
+	}
+
+	public function __unserialize($str) {
+		throw new Exception("123456");
+	}
 }
 
 function mycb($memc, $key, $value) {
diff --git a/tests/experimental/getdelayed_bykey.phpt b/tests/getdelayed_bykey.phpt
similarity index 89%
rename from tests/experimental/getdelayed_bykey.phpt
rename to tests/getdelayed_bykey.phpt
index a29f646b..442320a2 100644
--- a/tests/experimental/getdelayed_bykey.phpt
+++ b/tests/getdelayed_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getDelayedByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(
diff --git a/tests/experimental/getdelayed_bykey_cas.phpt b/tests/getdelayed_bykey_cas.phpt
similarity index 76%
rename from tests/experimental/getdelayed_bykey_cas.phpt
rename to tests/getdelayed_bykey_cas.phpt
index 43b19596..c38ff60f 100644
--- a/tests/experimental/getdelayed_bykey_cas.phpt
+++ b/tests/getdelayed_bykey_cas.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getDelayedByKey() with CAS
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(
@@ -33,43 +33,53 @@ $m->getDelayedByKey('kef', array_keys($data), true, 'myfunc');
 
 ?>
 --EXPECTF--
-array(3) {
+array(4) {
   ["key"]=>
   string(3) "foo"
   ["value"]=>
   string(8) "foo-data"
   ["cas"]=>
-  float(%d)
+  int(%d)
+  ["flags"]=>
+  int(0)
 }
-array(3) {
+array(4) {
   ["key"]=>
   string(3) "bar"
   ["value"]=>
   string(8) "bar-data"
   ["cas"]=>
-  float(%d)
+  int(%d)
+  ["flags"]=>
+  int(0)
 }
-array(3) {
+array(4) {
   ["key"]=>
   string(3) "baz"
   ["value"]=>
   string(8) "baz-data"
   ["cas"]=>
-  float(%d)
+  int(%d)
+  ["flags"]=>
+  int(0)
 }
-array(3) {
+array(4) {
   ["key"]=>
   string(3) "lol"
   ["value"]=>
   string(8) "lol-data"
   ["cas"]=>
-  float(%d)
+  int(%d)
+  ["flags"]=>
+  int(0)
 }
-array(3) {
+array(4) {
   ["key"]=>
   string(3) "kek"
   ["value"]=>
   string(8) "kek-data"
   ["cas"]=>
-  float(%d)
+  int(%d)
+  ["flags"]=>
+  int(0)
 }
diff --git a/tests/experimental/getdelayed_nonstring_keys.phpt b/tests/getdelayed_nonstring_keys.phpt
similarity index 90%
rename from tests/experimental/getdelayed_nonstring_keys.phpt
rename to tests/getdelayed_nonstring_keys.phpt
index 81363f3b..005d0579 100644
--- a/tests/experimental/getdelayed_nonstring_keys.phpt
+++ b/tests/getdelayed_nonstring_keys.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached getDelayed non string keys
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Bar {
diff --git a/tests/experimental/getmulti_badserver.phpt b/tests/getmulti_badserver.phpt
similarity index 85%
rename from tests/experimental/getmulti_badserver.phpt
rename to tests/getmulti_badserver.phpt
index a34825c2..47139b99 100644
--- a/tests/experimental/getmulti_badserver.phpt
+++ b/tests/getmulti_badserver.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Memcached::getMulti() bad server
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 $m = new Memcached();
@@ -22,9 +22,7 @@ switch ($m->getResultCode()) {
 }
 
 --EXPECTF--
-array(0) {
-}
+bool(false)
 NO SERVERS DEFINED
-array(0) {
-}
+bool(false)
 %d: %s
diff --git a/tests/experimental/getmulti_badunserialize.phpt b/tests/getmulti_badunserialize.phpt
similarity index 77%
rename from tests/experimental/getmulti_badunserialize.phpt
rename to tests/getmulti_badunserialize.phpt
index 963e9730..280feed3 100644
--- a/tests/experimental/getmulti_badunserialize.phpt
+++ b/tests/getmulti_badunserialize.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getMulti() with bad unserialize
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Foo implements Serializable {
@@ -23,6 +23,14 @@ class Foo implements Serializable {
 	public function unserialize($str) {
 		throw new Exception("123456");
 	}
+
+	public function __serialize() {
+		return ["1234"];
+	}
+
+	public function __unserialize($str) {
+		throw new Exception("123456");
+	}
 }
 
 var_dump($m->set('bar', "12", 10));
diff --git a/tests/experimental/getmulti_bykey.phpt b/tests/getmulti_bykey.phpt
similarity index 82%
rename from tests/experimental/getmulti_bykey.phpt
rename to tests/getmulti_bykey.phpt
index 3f7a6f78..b615dc66 100644
--- a/tests/experimental/getmulti_bykey.phpt
+++ b/tests/getmulti_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getMultiByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->set('foo', 1, 10);
diff --git a/tests/experimental/getmulti_empty.phpt b/tests/getmulti_empty.phpt
similarity index 60%
rename from tests/experimental/getmulti_empty.phpt
rename to tests/getmulti_empty.phpt
index 6279104d..3550e814 100644
--- a/tests/experimental/getmulti_empty.phpt
+++ b/tests/getmulti_empty.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getMulti() with empty array
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $v = $m->getMulti(array());
diff --git a/tests/experimental/getmulti_partial_error.phpt b/tests/getmulti_partial_error.phpt
similarity index 84%
rename from tests/experimental/getmulti_partial_error.phpt
rename to tests/getmulti_partial_error.phpt
index fa392e9e..928f49f4 100644
--- a/tests/experimental/getmulti_partial_error.phpt
+++ b/tests/getmulti_partial_error.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::getMulti() partial error
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array();
diff --git a/tests/experimental/getversion.phpt b/tests/getversion.phpt
similarity index 69%
rename from tests/experimental/getversion.phpt
rename to tests/getversion.phpt
index 55d06714..24d23843 100644
--- a/tests/experimental/getversion.phpt
+++ b/tests/getversion.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Memcached::getVersion()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 $m = new Memcached();
 var_dump($m->getVersion());
 
-include dirname(dirname(__FILE__)) . "/config.inc";
+include dirname(__FILE__) . "/config.inc";
 $m = memc_get_instance ();
 
 $stats = $m->getVersion();
diff --git a/tests/experimental/locale_float.phpt b/tests/locale_float.phpt
similarity index 80%
rename from tests/experimental/locale_float.phpt
rename to tests/locale_float.phpt
index c071d974..2f25ea73 100644
--- a/tests/experimental/locale_float.phpt
+++ b/tests/locale_float.phpt
@@ -2,14 +2,14 @@
 Float should not consider locale
 --SKIPIF--
 <?php
-include dirname(dirname(__FILE__)) . "/skipif.inc";
+include "skipif.inc";
 if (!setlocale(LC_NUMERIC, "fi_FI", 'sv_SV', 'nl_NL')) {
 	die("skip no suitable locale");
 }
 --FILE--
 <?php
 
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $memcache = memc_get_instance ();
 
 setlocale(LC_NUMERIC,
diff --git a/tests/experimental/moduleinfo.phpt b/tests/moduleinfo.phpt
similarity index 86%
rename from tests/experimental/moduleinfo.phpt
rename to tests/moduleinfo.phpt
index 8605c11a..51a5555e 100644
--- a/tests/experimental/moduleinfo.phpt
+++ b/tests/moduleinfo.phpt
@@ -2,7 +2,7 @@
 Memcached::phpinfo()
 --SKIPIF--
 <?php 
-include dirname(dirname(__FILE__)) . "/skipif.inc";
+include "skipif.inc";
 if (!Memcached::HAVE_SESSION) print "skip";
 ?>
 --FILE--
diff --git a/tests/experimental/prepend_bykey.phpt b/tests/prepend_bykey.phpt
similarity index 78%
rename from tests/experimental/prepend_bykey.phpt
rename to tests/prepend_bykey.phpt
index 87d3fd38..482899de 100644
--- a/tests/experimental/prepend_bykey.phpt
+++ b/tests/prepend_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::appendByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 $m->setOption(Memcached::OPT_COMPRESSION, false);
 
diff --git a/tests/experimental/replace_bykey.phpt b/tests/replace_bykey.phpt
similarity index 82%
rename from tests/experimental/replace_bykey.phpt
rename to tests/replace_bykey.phpt
index cddf10f0..b844824c 100644
--- a/tests/experimental/replace_bykey.phpt
+++ b/tests/replace_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::replaceByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 error_reporting(0);
 
diff --git a/tests/experimental/set_bykey.phpt b/tests/set_bykey.phpt
similarity index 83%
rename from tests/experimental/set_bykey.phpt
rename to tests/set_bykey.phpt
index e1fec459..eb61159f 100644
--- a/tests/experimental/set_bykey.phpt
+++ b/tests/set_bykey.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Memcached::setByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 var_dump($m->setByKey('foo', 'foo', 1, 10));
@@ -14,7 +14,7 @@ echo $m->getResultMessage(), "\n";
 var_dump($m->setByKey('foo', '', 1, 10));
 echo $m->getResultMessage(), "\n";
 // This is OK for the binary protocol
-$rv = $m->setByKey('foo', ' asd ���', 1, 1);
+$rv = $m->setByKey('foo', ' asd åäö', 1, 1);
 if ($m->getOption(Memcached::OPT_BINARY_PROTOCOL)) {
 	if ($rv !== true and $m->getResultCode() !== Memcached::RES_SUCCESS) {
 		var_dump($rv);
diff --git a/tests/experimental/set_comp_below_factor.phpt b/tests/set_comp_below_factor.phpt
similarity index 74%
rename from tests/experimental/set_comp_below_factor.phpt
rename to tests/set_comp_below_factor.phpt
index 12e6d6a4..80d28006 100644
--- a/tests/experimental/set_comp_below_factor.phpt
+++ b/tests/set_comp_below_factor.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Compress below factor and fail to plain.
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 ini_set('memcached.compression_threshold', 100);
diff --git a/tests/experimental/set_default_serializer.phpt b/tests/set_default_serializer.phpt
similarity index 95%
rename from tests/experimental/set_default_serializer.phpt
rename to tests/set_default_serializer.phpt
index 4886e9b7..3381ecf9 100644
--- a/tests/experimental/set_default_serializer.phpt
+++ b/tests/set_default_serializer.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Set default serializer
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 
diff --git a/tests/experimental/set_invalid_serializer.phpt b/tests/set_invalid_serializer.phpt
similarity index 92%
rename from tests/experimental/set_invalid_serializer.phpt
rename to tests/set_invalid_serializer.phpt
index 5b47a2fe..6ca07e80 100644
--- a/tests/experimental/set_invalid_serializer.phpt
+++ b/tests/set_invalid_serializer.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Set invalid serializer
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 
diff --git a/tests/experimental/setget_zero_factor.phpt b/tests/setget_zero_factor.phpt
similarity index 70%
rename from tests/experimental/setget_zero_factor.phpt
rename to tests/setget_zero_factor.phpt
index bb5fb0dc..7d7634c2 100644
--- a/tests/experimental/setget_zero_factor.phpt
+++ b/tests/setget_zero_factor.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Compress with 0 factor and get
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 ini_set('memcached.compression_factor', 0);
diff --git a/tests/experimental/setmulti_bykey.phpt b/tests/setmulti_bykey.phpt
similarity index 87%
rename from tests/experimental/setmulti_bykey.phpt
rename to tests/setmulti_bykey.phpt
index e3533c2f..6a7e56bb 100644
--- a/tests/experimental/setmulti_bykey.phpt
+++ b/tests/setmulti_bykey.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Memcached::setMultiByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 
@@ -28,7 +28,7 @@ function simple_compare(array $data, array $actual, $has_cas) {
 }
 
 
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(