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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
|
From 3d96f1aaf6e1eae26dd637a4795f8fee95b79c02 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 10 Jun 2021 10:48:12 +0200
Subject: [PATCH] Fix tests for PHP 8.1
---
tests/apc_003b.phpt | 15 ++---
tests/apc_003b_legacy.phpt | 113 +++++++++++++++++++++++++++++++++++++
tests/apc_006_php73.phpt | 1 +
tests/apc_006_php81.phpt | 83 +++++++++++++++++++++++++++
tests/bug76145.phpt | 1 +
5 files changed, 206 insertions(+), 7 deletions(-)
create mode 100644 tests/apc_003b_legacy.phpt
create mode 100644 tests/apc_006_php81.phpt
diff --git a/tests/apc_003b.phpt b/tests/apc_003b.phpt
index 18b0d20..d7a18cc 100644
--- a/tests/apc_003b.phpt
+++ b/tests/apc_003b.phpt
@@ -2,7 +2,8 @@
APC: apcu_store/fetch with objects
--SKIPIF--
<?php
- require_once(dirname(__FILE__) . '/skipif.inc');
+require_once(dirname(__FILE__) . '/skipif.inc');
+if (PHP_VERSION_ID < 80100) die("skip For PHP >= 8.1");
?>
--INI--
apc.enabled=1
@@ -68,42 +69,42 @@ object(foo)#%d (1) {
bool(true)
}
object(baz)#%d (6) {
- ["pri":"baz":private]=>
- string(3) "baz"
["pub"]=>
string(3) "bar"
["pro":protected]=>
string(3) "bar"
["pri":"bar":private]=>
string(3) "bar"
+ ["pri":"baz":private]=>
+ string(3) "baz"
["bar"]=>
bool(true)
["baz"]=>
bool(true)
}
object(baz)#%d (6) {
- ["pri":"baz":private]=>
- string(3) "baz"
["pub"]=>
string(3) "bar"
["pro":protected]=>
string(3) "bar"
["pri":"bar":private]=>
string(3) "mod"
+ ["pri":"baz":private]=>
+ string(3) "baz"
["bar"]=>
bool(true)
["baz"]=>
bool(true)
}
object(baz)#%d (6) {
- ["pri":"baz":private]=>
- string(3) "baz"
["pub"]=>
string(3) "bar"
["pro":protected]=>
string(3) "bar"
["pri":"bar":private]=>
string(3) "mod"
+ ["pri":"baz":private]=>
+ string(3) "baz"
["bar"]=>
bool(true)
["baz"]=>
diff --git a/tests/apc_003b_legacy.phpt b/tests/apc_003b_legacy.phpt
new file mode 100644
index 0000000..ca2fa08
--- /dev/null
+++ b/tests/apc_003b_legacy.phpt
@@ -0,0 +1,113 @@
+--TEST--
+APC: apcu_store/fetch with objects
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__) . '/skipif.inc');
+if (PHP_VERSION_ID >= 80100) die("skip For PHP < 8.1");
+?>
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+--FILE--
+<?php
+
+class foo { }
+$foo = new foo;
+var_dump($foo);
+apcu_store('foo',$foo);
+unset($foo);
+$bar = apcu_fetch('foo');
+var_dump($bar);
+$bar->a = true;
+var_dump($bar);
+
+class bar extends foo
+{
+ public $pub = 'bar';
+ protected $pro = 'bar';
+ private $pri = 'bar'; // we don't see this, we'd need php 5.1 new serialization
+
+ function __construct()
+ {
+ $this->bar = true;
+ }
+
+ function change()
+ {
+ $this->pri = 'mod';
+ }
+}
+
+class baz extends bar
+{
+ private $pri = 'baz';
+
+ function __construct()
+ {
+ parent::__construct();
+ $this->baz = true;
+ }
+}
+
+$baz = new baz;
+var_dump($baz);
+$baz->change();
+var_dump($baz);
+apcu_store('baz', $baz);
+unset($baz);
+var_dump(apcu_fetch('baz'));
+
+?>
+===DONE===
+--EXPECTF--
+object(foo)#%d (0) {
+}
+object(foo)#%d (0) {
+}
+object(foo)#%d (1) {
+ ["a"]=>
+ bool(true)
+}
+object(baz)#%d (6) {
+ ["pri":"baz":private]=>
+ string(3) "baz"
+ ["pub"]=>
+ string(3) "bar"
+ ["pro":protected]=>
+ string(3) "bar"
+ ["pri":"bar":private]=>
+ string(3) "bar"
+ ["bar"]=>
+ bool(true)
+ ["baz"]=>
+ bool(true)
+}
+object(baz)#%d (6) {
+ ["pri":"baz":private]=>
+ string(3) "baz"
+ ["pub"]=>
+ string(3) "bar"
+ ["pro":protected]=>
+ string(3) "bar"
+ ["pri":"bar":private]=>
+ string(3) "mod"
+ ["bar"]=>
+ bool(true)
+ ["baz"]=>
+ bool(true)
+}
+object(baz)#%d (6) {
+ ["pri":"baz":private]=>
+ string(3) "baz"
+ ["pub"]=>
+ string(3) "bar"
+ ["pro":protected]=>
+ string(3) "bar"
+ ["pri":"bar":private]=>
+ string(3) "mod"
+ ["bar"]=>
+ bool(true)
+ ["baz"]=>
+ bool(true)
+}
+===DONE===
diff --git a/tests/apc_006_php73.phpt b/tests/apc_006_php73.phpt
index 42bdfde..adc09b9 100644
--- a/tests/apc_006_php73.phpt
+++ b/tests/apc_006_php73.phpt
@@ -4,6 +4,7 @@ APC: apcu_store/fetch reference test
<?php
require_once(dirname(__FILE__) . '/skipif.inc');
if (PHP_VERSION_ID < 70300) die('skip Only for PHP >= 7.3');
+if (PHP_VERSION_ID >= 80100) die('skip Only for PHP < 8.1');
?>
--INI--
apc.enabled=1
diff --git a/tests/apc_006_php81.phpt b/tests/apc_006_php81.phpt
new file mode 100644
index 0000000..94219dc
--- /dev/null
+++ b/tests/apc_006_php81.phpt
@@ -0,0 +1,83 @@
+--TEST--
+APC: apcu_store/fetch reference test
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__) . '/skipif.inc');
+if (PHP_VERSION_ID < 80100) die('skip Only for PHP >= 8.1');
+?>
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.serializer=php
+report_memleaks=0
+--FILE--
+<?php
+
+$a = 'a';
+$b = array($a);
+$c = array('c');
+$b[] = &$c;
+$b[] = &$c;
+$d = 'd';
+$b[] = &$d;
+$b[] = &$d;
+$b[] = &$d;
+$e = 'e';
+$b[] = $e;
+$b[] = $e;
+$f = array('f');
+$f[] = &$f;
+$b[] = &$f;
+apcu_store('test', $b);
+$x = apcu_fetch('test');
+debug_zval_dump($x);
+
+?>
+===DONE===
+--EXPECTF--
+array(9) refcount(2){
+ [0]=>
+ string(1) "a" interned
+ [1]=>
+ reference refcount(2) {
+ array(1) refcount(1){
+ [0]=>
+ string(1) "c" interned
+ }
+ }
+ [2]=>
+ reference refcount(2) {
+ array(1) refcount(1){
+ [0]=>
+ string(1) "c" interned
+ }
+ }
+ [3]=>
+ reference refcount(3) {
+ string(1) "d" interned
+ }
+ [4]=>
+ reference refcount(3) {
+ string(1) "d" interned
+ }
+ [5]=>
+ reference refcount(3) {
+ string(1) "d" interned
+ }
+ [6]=>
+ string(1) "e" interned
+ [7]=>
+ string(1) "e" interned
+ [8]=>
+ reference refcount(2) {
+ array(2) refcount(1){
+ [0]=>
+ string(1) "f" interned
+ [1]=>
+ reference refcount(2) {
+ *RECURSION*
+ }
+ }
+ }
+}
+===DONE===
diff --git a/tests/bug76145.phpt b/tests/bug76145.phpt
index 8959a44..56f7e10 100644
--- a/tests/bug76145.phpt
+++ b/tests/bug76145.phpt
@@ -3,6 +3,7 @@ Bug #76145: Data corruption reading from APCu while unserializing
--INI--
apc.enabled=1
apc.enable_cli=1
+error_reporting=E_ALL&~E_DEPRECATED
--FILE--
<?php
|
