Skip to content

Update scripts/dev/check_parameters.php for new parameter parsing args, also fix deprecation errors and move from preg_replace -> preg_replace_callback #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update scripts/dev/check_parameters.php for new parameter parsing args, also fix deprecation errors and move from preg_replace -> preg_replace_callback #1521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 16 additions & 46 deletions scripts/dev/check_parameters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


define('REPORT_LEVEL', 2); // 0 reports less false-positives. up to level 5.
define('VERSION', '5.2'); // minimum is 5.2
define('VERSION', '7.0'); // minimum is 7.0
define('PHPDIR', realpath(dirname(__FILE__) . '/../..'));


Expand All @@ -33,39 +33,35 @@


$API_params = array(
'a' => array('zval**'), // array as zval*
'a' => array('zval**'), // array
'A' => array('zval**'), // array or object
'b' => array('zend_bool*'), // boolean
'C' => array('zend_class_entry**'), // class
'd' => array('double*'), // double
'f' => array('zend_fcall_info*', 'zend_fcall_info_cache*'), // function
'h' => array('HashTable**'), // array as an HashTable*
'l' => array('long*'), // long
'H' => array('HashTable**'), // array or HASH_OF(object)
'l' => array('zend_long*'), // long
//TODO 'L' => array('zend_long*, '), // long
'o' => array('zval**'), //object
'O' => array('zval**', 'zend_class_entry*'), // object of given type
'p' => array('char**', 'size_t*'), // valid path
'P' => array('zend_string**'), // valid path
'r' => array('zval**'), // resource
's' => array('char**', 'int*'), // string
's' => array('char**', 'size_t*'), // string
'S' => array('zend_string**'), // string
'z' => array('zval**'), // zval*
'Z' => array('zval***') // zval**
);

// specific to PHP >= 6
if (version_compare(VERSION, '6', 'ge')) {
$API_params['S'] = $API_params['s']; // binary string
$API_params['t'] = array('zstr*', 'int*', 'zend_uchar*'); // text
$API_params['T'] = $API_params['t'];
$API_params['u'] = array('UChar**', 'int*'); // unicode
$API_params['U'] = $API_params['u'];
}


/** reports an error, according to its level */
function error($str, $level = 0)
{
global $current_file, $current_function, $line;

if ($level <= REPORT_LEVEL) {
if (strpos($current_file,PHPDIR) === 0) {
$filename = substr($current_file, strlen(PHPDIR)+1);
$filename = substr($current_file, strlen(PHPDIR)+1);
} else {
$filename = $current_file;
}
Expand Down Expand Up @@ -243,34 +239,6 @@ function check_function($name, $txt, $offset)
}
break;

case '&':
if (version_compare(VERSION, '6', 'ge')) {
if ($last_char == 's' || ($last_last_char == 's' && $last_char == '!')) {
check_param($params, ++$j, 'UConverter*', $optional);

} else {
error("the '&' specifier cannot be applied to '$last_char'");
}
} else {
error("unknown char ('&') at column $i");
}
break;

case '+':
case '*':
if (version_compare(VERSION, '6', 'ge')) {
if ($varargs) {
error("A varargs specifier can only be used once. repeated char at column $i");
} else {
check_param($params, ++$j, 'zval****', $optional);
check_param($params, ++$j, 'int*', $optional);
$varargs = true;
}
} else {
error("unknown char ('$char') at column $i");
}
break;

default:
if (isset($API_params[$char])) {
foreach($API_params[$char] as $exp) {
Expand Down Expand Up @@ -306,8 +274,10 @@ function recurse($path)

$txt = file_get_contents($file);
// remove comments (but preserve the number of lines)
$txt = preg_replace(array('@//.*@S', '@/\*.*\*/@SsUe'), array('', 'preg_replace("/[^\r\n]+/S", "", \'$0\')'), $txt);

$txt = preg_replace('@//.*@S', '', $txt);
$txt = preg_replace_callback('@/\*.*\*/@SsU', function($matches) {
return preg_replace("/[^\r\n]+/S", "", $matches[0]);
}, $txt);

$split = preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)/S', $txt, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE);

Expand Down Expand Up @@ -352,7 +322,7 @@ function recurse($path)
for ($i = 1; $i < $argc; $i++) {
$dirs[] = $argv[$i];
}
} else {
} else {
$dirs[] = PHPDIR;
}

Expand Down