com web/gcov: ! is applicable to all params since PHP 5.5. remove some letfovers from PHP 6.: cron/check_parameters.php

Commit: 9bc868f53b7baecf4ee847b240c4650301e8d1cb Author: Nuno Lopes <nlopess@php.net> Sun, 20 Jan 2013 11:22:30 -0500 Parents: 069d7a7f0fb7e875cbe8eeeb215ac9a24810fecf Branches: master Link: http://git.php.net/?p=web/gcov.git;a=commitdiff;h=9bc868f53b7baecf4ee847b240c4650301e8d1cb Log: ! is applicable to all params since PHP 5..5. remove some letfovers from PHP 6. Changed paths: M cron/check_parameters.php Diff: diff --git a/cron/check_parameters.php b/cron/check_parameters.php index 8d66f8c..29ebe38 100644 --- a/cron/check_parameters.php +++ b/cron/check_parameters.php @@ -41,6 +41,7 @@ $API_params = array( 'f' => array('zend_fcall_info*', 'zend_fcall_info_cache*'), // function 'h' => array('HashTable**'), // array as an HashTable* 'l' => array('long*'), // long + 'L' => array('long*'), // long 'o' => array('zval**'), //object 'O' => array('zval**', 'zend_class_entry*'), // object of given type 'r' => array('zval**'), // resource @@ -242,24 +243,13 @@ function check_function($name, $txt, $offset) // nullable arguments case '!': - if (!in_array($last_char, array('a', 'C', 'f', 'h', 'o', 'O', 'p', 'r', 's', 't', 'z', 'Z'))) { + // since PHP 5.5, ! is applicable to all params + if (version_compare(VERSION, '5.5', 'lt') && + !in_array($last_char, array('a', 'A', 'C', 'f', 'h', 'H', 'o', 'O', 'p', 'r', 's', 'z', 'Z'))) { error("the '!' specifier cannot be applied to '$last_char'"); } 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, '5.3', 'ge')) {