From 59da31bc2824ce5613f83a5daf4c418ca1df9c1e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 3 Jun 2022 17:25:21 +0200
Subject: add upstream patch for PHP 8.2

---
 memcached-upstream.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 memcached-upstream.patch

(limited to 'memcached-upstream.patch')

diff --git a/memcached-upstream.patch b/memcached-upstream.patch
new file mode 100644
index 0000000..42c3b51
--- /dev/null
+++ b/memcached-upstream.patch
@@ -0,0 +1,64 @@
+From 1f22de74379208d9758ba99a9bd7373eefeb48f2 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 28 Mar 2022 08:09:29 +0200
+Subject: [PATCH] fix #513 skip test with old and dead libmemcached
+
+---
+ tests/memcachedserver.phpt  | 1 -
+ tests/memcachedserver6.phpt | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/memcachedserver.phpt b/tests/memcachedserver.phpt
+index 7b058d70..407fcf97 100644
+--- a/tests/memcachedserver.phpt
++++ b/tests/memcachedserver.phpt
+@@ -8,7 +8,6 @@ if (!extension_loaded("memcached")) {
+ if (!class_exists("MemcachedServer")) {
+ 	die("skip memcached not built with libmemcachedprotocol support\n");
+ }
+-
+ if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x1001000) {
+        die("skip needs at least libmemcached 1.1.0\n");
+ }
+diff --git a/tests/memcachedserver6.phpt b/tests/memcachedserver6.phpt
+index a2277b4a..3d02b244 100644
+--- a/tests/memcachedserver6.phpt
++++ b/tests/memcachedserver6.phpt
+@@ -8,6 +8,9 @@ if (!extension_loaded("memcached")) {
+ if (!class_exists("MemcachedServer")) {
+ 	die("skip memcached not built with libmemcachedprotocol support\n");
+ }
++if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x1001000) {
++       die("skip needs at least libmemcached 1.1.0\n");
++}
+ ?>
+ --FILE--
+ <?php
+From fc388e65e7ceab9e6d52bc77b6306f71db981873 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 3 Jun 2022 16:56:00 +0200
+Subject: [PATCH] fix  ${var} deprecation
+
+---
+ tests/touch_binary.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/touch_binary.phpt b/tests/touch_binary.phpt
+index 382c1778..059ec74c 100644
+--- a/tests/touch_binary.phpt
++++ b/tests/touch_binary.phpt
+@@ -28,12 +28,12 @@ function status_print ($op, $mem, $expected)
+ 	$code = $mem->getResultcode();
+ 
+ 	if ($code == $expected)
+-		echo "${op} status code as expected" . PHP_EOL;
++		echo "{$op} status code as expected" . PHP_EOL;
+ 	else {
+ 		$expected = resolve_to_constant ($expected);
+ 		$code = resolve_to_constant ($code);
+ 		
+-		echo "${op} status code mismatch, expected ${expected} but got ${code}" . PHP_EOL;
++		echo "{$op} status code mismatch, expected {$expected} but got {$code}" . PHP_EOL;
+ 	}
+ }
+ 
-- 
cgit