jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use preg_match() in PHP test harness code

Browse source 
ereg() and eregi() were deprecated in PHP 5.3.0 and removed in PHP 7.0.0,
and preg_match() has been available since PHP4.
This commit is contained in:
Olly Betts 2016-08-31 16:36:13 +12:00
commit 888e9c6fec
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Examples/test-suite/php/tests.php
View file

@ -35,8 +35,9 @@ class check {
foreach($_original_functions[internal] as $func) unset($df[$func]); foreach($_original_functions[internal] as $func) unset($df[$func]);
// Now chop out any get/set accessors // Now chop out any get/set accessors
foreach(array_keys($df) as $func) foreach(array_keys($df) as $func)
if ((GETSET && ereg('_[gs]et$',$func)) || ereg('^new_', $func) if ((GETSET && preg_match('/_[gs]et$/', $func)) ||
|| ereg('_(alter|get)_newobject$', $func)) preg_match('/^new_/', $func) ||
preg_match('/_(alter|get)_newobject$/', $func))
$extrags[]=$func; $extrags[]=$func;
else $extra[]=$func; else $extra[]=$func;
// $extra=array_keys($df); // $extra=array_keys($df);
@ -52,7 +53,8 @@ class check {
if (GETSET) { if (GETSET) {
$_extra=array(); $_extra=array();
foreach(check::get_extra_functions(false,1) as $global) { foreach(check::get_extra_functions(false,1) as $global) {
if (ereg('^(.*)_[sg]et$',$global,$match)) $_extra[$match[1]]=1; if (preg_match('/^(.*)_[sg]et$/', $global, $match))
$_extra[$match[1]] = 1;
} }
$extra=array_keys($_extra); $extra=array_keys($_extra);
} else { } else {
@ -61,7 +63,8 @@ class check {
$df=array_flip(array_keys($GLOBALS)); $df=array_flip(array_keys($GLOBALS));
foreach($_original_globals as $func) unset($df[$func]); foreach($_original_globals as $func) unset($df[$func]);
// MASK xxxx_LOADED__ variables // MASK xxxx_LOADED__ variables
foreach(array_keys($df) as $func) if (ereg('_LOADED__$',$func)) unset($df[$func]); foreach(array_keys($df) as $func)
if (preg_match('/_LOADED__$/', $func)) unset($df[$func]);
$extra=array_keys($df); $extra=array_keys($df);
} }
} }
@ -185,7 +188,8 @@ class check {
} }
function functionref($a,$type,$message) { function functionref($a,$type,$message) {
if (! eregi("^_[a-f0-9]+$type$",$a)) return check::fail($message); if (! preg_match("/^_[a-f0-9]+$type$/i", $a))
return check::fail($message);
return TRUE; return TRUE;
} }
@ -196,7 +200,8 @@ class check {
function resource($a,$b,$message) { function resource($a,$b,$message) {
$resource=trim(check::var_dump($a)); $resource=trim(check::var_dump($a));
if (! eregi("^resource\([0-9]+\) of type \($b\)",$resource)) return check::fail($message); if (! preg_match("/^resource\([0-9]+\) of type \($b\)/i", $resource))
return check::fail($message);
return TRUE; return TRUE;
} }