From 43bbf0080206b157b0d3f47ab1f07ede4bc80c86 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 7 Jul 2017 18:45:42 -0700 Subject: [PATCH] In PHP 7.2, php_errormsg is deprecated --- tests/append.phpt | 2 +- tests/bad_construct.phpt | 2 +- tests/experimental/fetch_badunserialize.phpt | 2 +- tests/experimental/fetchall_badunserialize.phpt | 2 +- tests/experimental/getdelayed_badunserialize.phpt | 2 +- tests/experimental/getdelayed_cbthrows.phpt | 2 +- tests/experimental/getmulti_badunserialize.phpt | 2 +- tests/experimental/replace_bykey.phpt | 2 +- .../serializer/serializer_php_bad_serialize.phpt | 2 +- .../serializer/serializer_php_bad_unserialize.phpt | 2 +- tests/experimental/setmulti_badserialize.phpt | 2 +- tests/incrdecr.phpt | 8 ++++---- tests/incrdecr_bykey.phpt | 8 ++++---- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/append.phpt b/tests/append.phpt index c463fde..b958b39 100644 --- a/tests/append.phpt +++ b/tests/append.phpt @@ -11,7 +11,7 @@ error_reporting(0); $m->delete('foo'); $m->setOption(Memcached::OPT_COMPRESSION, true); var_dump($m->append('foo', 'a')); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; $m->setOption(Memcached::OPT_COMPRESSION, false); $m->delete('foo'); diff --git a/tests/bad_construct.phpt b/tests/bad_construct.phpt index aa9b18c..0b740e0 100644 --- a/tests/bad_construct.phpt +++ b/tests/bad_construct.phpt @@ -6,7 +6,7 @@ Memcached construct with bad arguments getDelayed(array('foo'), false)); try { var_dump($m->fetch()); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/fetchall_badunserialize.phpt b/tests/experimental/fetchall_badunserialize.phpt index e3ad331..5684763 100644 --- a/tests/experimental/fetchall_badunserialize.phpt +++ b/tests/experimental/fetchall_badunserialize.phpt @@ -42,7 +42,7 @@ var_dump($m->getDelayed(array('foo'), false)); try { var_dump($m->fetchAll()); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/getdelayed_badunserialize.phpt b/tests/experimental/getdelayed_badunserialize.phpt index 571e76e..397135a 100644 --- a/tests/experimental/getdelayed_badunserialize.phpt +++ b/tests/experimental/getdelayed_badunserialize.phpt @@ -45,7 +45,7 @@ error_reporting(0); try { var_dump($m->getDelayed(array('foo'), false, 'mycb')); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/getdelayed_cbthrows.phpt b/tests/experimental/getdelayed_cbthrows.phpt index 2b71b4b..b0427ac 100644 --- a/tests/experimental/getdelayed_cbthrows.phpt +++ b/tests/experimental/getdelayed_cbthrows.phpt @@ -24,7 +24,7 @@ error_reporting(0); try { $m->getDelayedByKey('kef', array_keys($data), false, 'myfunc'); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/getmulti_badunserialize.phpt b/tests/experimental/getmulti_badunserialize.phpt index b33d5cc..963e973 100644 --- a/tests/experimental/getmulti_badunserialize.phpt +++ b/tests/experimental/getmulti_badunserialize.phpt @@ -32,7 +32,7 @@ error_reporting(0); try { var_dump($m->getMulti(array('bar', 'foo'))); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/replace_bykey.phpt b/tests/experimental/replace_bykey.phpt index b2f7283..cddf10f 100644 --- a/tests/experimental/replace_bykey.phpt +++ b/tests/experimental/replace_bykey.phpt @@ -10,7 +10,7 @@ error_reporting(0); $m->delete('foo'); var_dump($m->replaceByKey('kef', 'foo', 'bar', 60)); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; echo $m->getResultMessage(), "\n"; var_dump($m->getByKey('kef', 'foo')); diff --git a/tests/experimental/serializer/serializer_php_bad_serialize.phpt b/tests/experimental/serializer/serializer_php_bad_serialize.phpt index 81e88b0..76d3dac 100644 --- a/tests/experimental/serializer/serializer_php_bad_serialize.phpt +++ b/tests/experimental/serializer/serializer_php_bad_serialize.phpt @@ -44,7 +44,7 @@ error_reporting(0); try { var_dump($m->set('foo', new Foo(), 10)); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } try { diff --git a/tests/experimental/serializer/serializer_php_bad_unserialize.phpt b/tests/experimental/serializer/serializer_php_bad_unserialize.phpt index 39d2cc3..341dded 100644 --- a/tests/experimental/serializer/serializer_php_bad_unserialize.phpt +++ b/tests/experimental/serializer/serializer_php_bad_unserialize.phpt @@ -40,7 +40,7 @@ var_dump($m->set('foo', new Foo(), 10)); try { var_dump($m->get('foo')); } catch (Exception $e) { - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } diff --git a/tests/experimental/setmulti_badserialize.phpt b/tests/experimental/setmulti_badserialize.phpt index 3bba314..eafc777 100644 --- a/tests/experimental/setmulti_badserialize.phpt +++ b/tests/experimental/setmulti_badserialize.phpt @@ -36,7 +36,7 @@ try { } } - echo $php_errormsg, "\n"; + echo error_get_last()["message"], "\n"; echo $e->getMessage(), "\n"; } var_dump($m->getByKey('kef', 'foo')); diff --git a/tests/incrdecr.phpt b/tests/incrdecr.phpt index b4e9469..87b410c 100644 --- a/tests/incrdecr.phpt +++ b/tests/incrdecr.phpt @@ -31,14 +31,14 @@ var_dump($m->get('foo')); error_reporting(0); echo "Negative offset\n"; -$php_errormsg = ''; +error_clear_last(); $m->increment('foo', -1); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; var_dump($m->get('foo')); -$php_errormsg = ''; +error_clear_last(); $m->decrement('foo', -1); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; var_dump($m->get('foo')); echo "Enormous offset\n"; diff --git a/tests/incrdecr_bykey.phpt b/tests/incrdecr_bykey.phpt index 8b931fa..ee08993 100644 --- a/tests/incrdecr_bykey.phpt +++ b/tests/incrdecr_bykey.phpt @@ -28,14 +28,14 @@ var_dump($m->get('foo')); error_reporting(0); echo "Negative offset\n"; -$php_errormsg = ''; +error_clear_last(); $m->incrementByKey('foo', 'foo', -1); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; var_dump($m->get('foo')); -$php_errormsg = ''; +error_clear_last(); $m->decrementByKey('foo', 'foo', -1); -echo $php_errormsg, "\n"; +echo error_get_last()["message"], "\n"; var_dump($m->get('foo')); echo "Enormous offset\n";