summaryrefslogtreecommitdiffstats
path: root/memcached-upstream.patch
blob: 42c3b511958301cd61f25566b55dc94b0bb559e7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
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;
 	}
 }