Skip to content

Commit 43bbf00

Browse files
committed
In PHP 7.2, php_errormsg is deprecated
1 parent bf16783 commit 43bbf00

13 files changed

+19
-19
lines changed

Diff for: tests/append.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error_reporting(0);
1111
$m->delete('foo');
1212
$m->setOption(Memcached::OPT_COMPRESSION, true);
1313
var_dump($m->append('foo', 'a'));
14-
echo $php_errormsg, "\n";
14+
echo error_get_last()["message"], "\n";
1515

1616
$m->setOption(Memcached::OPT_COMPRESSION, false);
1717
$m->delete('foo');

Diff for: tests/bad_construct.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Memcached construct with bad arguments
66
<?php
77

88
$m = new Memcached((object)array());
9-
echo $php_errormsg, "\n";
9+
echo error_get_last()["message"], "\n";
1010
var_dump($m);
1111

1212
class extended extends Memcached {

Diff for: tests/experimental/fetch_badunserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var_dump($m->getDelayed(array('foo'), false));
4242
try {
4343
var_dump($m->fetch());
4444
} catch (Exception $e) {
45-
echo $php_errormsg, "\n";
45+
echo error_get_last()["message"], "\n";
4646
echo $e->getMessage(), "\n";
4747
}
4848

Diff for: tests/experimental/fetchall_badunserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var_dump($m->getDelayed(array('foo'), false));
4242
try {
4343
var_dump($m->fetchAll());
4444
} catch (Exception $e) {
45-
echo $php_errormsg, "\n";
45+
echo error_get_last()["message"], "\n";
4646
echo $e->getMessage(), "\n";
4747
}
4848

Diff for: tests/experimental/getdelayed_badunserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ error_reporting(0);
4545
try {
4646
var_dump($m->getDelayed(array('foo'), false, 'mycb'));
4747
} catch (Exception $e) {
48-
echo $php_errormsg, "\n";
48+
echo error_get_last()["message"], "\n";
4949
echo $e->getMessage(), "\n";
5050
}
5151

Diff for: tests/experimental/getdelayed_cbthrows.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ error_reporting(0);
2424
try {
2525
$m->getDelayedByKey('kef', array_keys($data), false, 'myfunc');
2626
} catch (Exception $e) {
27-
echo $php_errormsg, "\n";
27+
echo error_get_last()["message"], "\n";
2828
echo $e->getMessage(), "\n";
2929
}
3030

Diff for: tests/experimental/getmulti_badunserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ error_reporting(0);
3232
try {
3333
var_dump($m->getMulti(array('bar', 'foo')));
3434
} catch (Exception $e) {
35-
echo $php_errormsg, "\n";
35+
echo error_get_last()["message"], "\n";
3636
echo $e->getMessage(), "\n";
3737
}
3838

Diff for: tests/experimental/replace_bykey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error_reporting(0);
1010

1111
$m->delete('foo');
1212
var_dump($m->replaceByKey('kef', 'foo', 'bar', 60));
13-
echo $php_errormsg, "\n";
13+
echo error_get_last()["message"], "\n";
1414
echo $m->getResultMessage(), "\n";
1515
var_dump($m->getByKey('kef', 'foo'));
1616

Diff for: tests/experimental/serializer/serializer_php_bad_serialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ error_reporting(0);
4444
try {
4545
var_dump($m->set('foo', new Foo(), 10));
4646
} catch (Exception $e) {
47-
echo $php_errormsg, "\n";
47+
echo error_get_last()["message"], "\n";
4848
echo $e->getMessage(), "\n";
4949
}
5050
try {

Diff for: tests/experimental/serializer/serializer_php_bad_unserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var_dump($m->set('foo', new Foo(), 10));
4040
try {
4141
var_dump($m->get('foo'));
4242
} catch (Exception $e) {
43-
echo $php_errormsg, "\n";
43+
echo error_get_last()["message"], "\n";
4444
echo $e->getMessage(), "\n";
4545
}
4646

Diff for: tests/experimental/setmulti_badserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ try {
3636
}
3737
}
3838

39-
echo $php_errormsg, "\n";
39+
echo error_get_last()["message"], "\n";
4040
echo $e->getMessage(), "\n";
4141
}
4242
var_dump($m->getByKey('kef', 'foo'));

Diff for: tests/incrdecr.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ var_dump($m->get('foo'));
3131
error_reporting(0);
3232

3333
echo "Negative offset\n";
34-
$php_errormsg = '';
34+
error_clear_last();
3535
$m->increment('foo', -1);
36-
echo $php_errormsg, "\n";
36+
echo error_get_last()["message"], "\n";
3737
var_dump($m->get('foo'));
3838

39-
$php_errormsg = '';
39+
error_clear_last();
4040
$m->decrement('foo', -1);
41-
echo $php_errormsg, "\n";
41+
echo error_get_last()["message"], "\n";
4242
var_dump($m->get('foo'));
4343

4444
echo "Enormous offset\n";

Diff for: tests/incrdecr_bykey.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ var_dump($m->get('foo'));
2828
error_reporting(0);
2929

3030
echo "Negative offset\n";
31-
$php_errormsg = '';
31+
error_clear_last();
3232
$m->incrementByKey('foo', 'foo', -1);
33-
echo $php_errormsg, "\n";
33+
echo error_get_last()["message"], "\n";
3434
var_dump($m->get('foo'));
3535

36-
$php_errormsg = '';
36+
error_clear_last();
3737
$m->decrementByKey('foo', 'foo', -1);
38-
echo $php_errormsg, "\n";
38+
echo error_get_last()["message"], "\n";
3939
var_dump($m->get('foo'));
4040

4141
echo "Enormous offset\n";

0 commit comments

Comments
 (0)