clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6' into PHP-7.0

Browse Source 
* PHP-5.6:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)
This commit is contained in:
Stanislav Malyshev 2015-10-18 14:51:13 -07:00
commit 6a4803026d
2 changed files with 111 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/snmp/snmp.c
View File

@ -338,7 +338,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_snmp_void, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_setSecurity, 0, 0, 8)
ZEND_ARG_INFO(0, session)
ZEND_ARG_INFO(0, sec_level)
ZEND_ARG_INFO(0, auth_protocol)
ZEND_ARG_INFO(0, auth_passphrase)
@ -346,7 +345,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_setSecurity, 0, 0, 8)
ZEND_ARG_INFO(0, priv_passphrase)
ZEND_ARG_INFO(0, contextName)
ZEND_ARG_INFO(0, contextEngineID)
ZEND_ARG_INFO(0, )
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get, 0, 0, 1)
@ -2305,16 +2303,16 @@ static void free_php_snmp_properties(zval *el) /* {{{ */
/* {{{ php_snmp_class_methods[] */
static zend_function_entry php_snmp_class_methods[] = {
PHP_ME(snmp, __construct, arginfo_snmp_create, ZEND_ACC_PUBLIC)
PHP_ME(snmp, close, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_ME(snmp, setSecurity, arginfo_snmp_setSecurity, ZEND_ACC_PUBLIC)
PHP_ME(snmp, __construct, arginfo_snmp_create, ZEND_ACC_PUBLIC)
PHP_ME(snmp, close, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_ME(snmp, setSecurity, arginfo_snmp_setSecurity, ZEND_ACC_PUBLIC)
PHP_ME(snmp, get, arginfo_snmp_get, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getnext, arginfo_snmp_get, ZEND_ACC_PUBLIC)
PHP_ME(snmp, walk, arginfo_snmp_walk, ZEND_ACC_PUBLIC)
PHP_ME(snmp, set, arginfo_snmp_set, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_ME(snmp, get, arginfo_snmp_get, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getnext, arginfo_snmp_get, ZEND_ACC_PUBLIC)
PHP_ME(snmp, walk, arginfo_snmp_walk, ZEND_ACC_PUBLIC)
PHP_ME(snmp, set, arginfo_snmp_set, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_FE_END
};

102
ext/snmp/tests/reflection.phpt Normal file
View File

@ -0,0 +1,102 @@
--TEST--
Test SNMP Reflection
--SKIPIF--
<?php if (!extension_loaded('snmp')) die ("skip no snmp extension"); ?>
--FILE--
<?php
/* ALL PHP_ME user callable methods of SNMP class should appear here */
reflection::export(new reflectionmethod('snmp', '__construct'));
reflection::export(new reflectionmethod('snmp', 'close'));
reflection::export(new reflectionmethod('snmp', 'setSecurity'));
reflection::export(new reflectionmethod('snmp', 'get'));
reflection::export(new reflectionmethod('snmp', 'getnext'));
reflection::export(new reflectionmethod('snmp', 'walk'));
reflection::export(new reflectionmethod('snmp', 'set'));
reflection::export(new reflectionmethod('snmp', 'getErrno'));
reflection::export(new reflectionmethod('snmp', 'getError'));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
Method [ <internal:snmp, ctor> public method __construct ] {
- Parameters [5] {
Parameter #0 [ <required> $version ]
Parameter #1 [ <required> $host ]
Parameter #2 [ <required> $community ]
Parameter #3 [ <optional> $timeout ]
Parameter #4 [ <optional> $retries ]
}
}
Method [ <internal:snmp> public method close ] {
- Parameters [0] {
}
}
Method [ <internal:snmp> public method setSecurity ] {
- Parameters [7] {
Parameter #0 [ <required> $sec_level ]
Parameter #1 [ <required> $auth_protocol ]
Parameter #2 [ <required> $auth_passphrase ]
Parameter #3 [ <required> $priv_protocol ]
Parameter #4 [ <required> $priv_passphrase ]
Parameter #5 [ <required> $contextName ]
Parameter #6 [ <required> $contextEngineID ]
}
}
Method [ <internal:snmp> public method get ] {
- Parameters [2] {
Parameter #0 [ <required> $object_id ]
Parameter #1 [ <optional> $use_orignames ]
}
}
Method [ <internal:snmp> public method getnext ] {
- Parameters [2] {
Parameter #0 [ <required> $object_id ]
Parameter #1 [ <optional> $use_orignames ]
}
}
Method [ <internal:snmp> public method walk ] {
- Parameters [4] {
Parameter #0 [ <required> $object_id ]
Parameter #1 [ <required> $suffix_keys ]
Parameter #2 [ <required> $max_repetitions ]
Parameter #3 [ <required> $non_repeaters ]
}
}
Method [ <internal:snmp> public method set ] {
- Parameters [3] {
Parameter #0 [ <required> $object_id ]
Parameter #1 [ <required> $type ]
Parameter #2 [ <required> $value ]
}
}
Method [ <internal:snmp> public method getErrno ] {
- Parameters [0] {
}
}
Method [ <internal:snmp> public method getError ] {
- Parameters [0] {
}
}
===DONE===