From dfbfc510ec134f75a955e8b3a144ea02310843cd Mon Sep 17 00:00:00 2001 From: jerome mouneyrac Date: Mon, 5 Jul 2010 09:31:22 +0000 Subject: [PATCH] zend MDL-22103 port back our Zend fix --- lib/zend/Zend/Server/Reflection/Function/Abstract.php | 3 ++- lib/zend/readme_moodle.txt | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/zend/Zend/Server/Reflection/Function/Abstract.php b/lib/zend/Zend/Server/Reflection/Function/Abstract.php index 5d6e95f5729..d100c97d3a6 100644 --- a/lib/zend/Zend/Server/Reflection/Function/Abstract.php +++ b/lib/zend/Zend/Server/Reflection/Function/Abstract.php @@ -339,7 +339,8 @@ abstract class Zend_Server_Reflection_Function_Abstract require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception( 'Variable number of arguments is not supported for services (except optional parameters). ' - . 'Number of function arguments must correspond to actual number of arguments described in a docblock.'); + . 'Number of function arguments must correspond to actual number of arguments described in a docblock ' + . '(function was ' . $function->getName() . ')'); } $paramTypes = array(); diff --git a/lib/zend/readme_moodle.txt b/lib/zend/readme_moodle.txt index bc7337dc04b..6e50e27f3a9 100644 --- a/lib/zend/readme_moodle.txt +++ b/lib/zend/readme_moodle.txt @@ -1,4 +1,4 @@ -Description of Zend framework 1.9.4 import into Moodle +Description of Zend framework 1.10.6 import into Moodle Please note the zend framework is severly crippled - everything not needed in /webservice/* is removed. Do not use outside of our /webservice/* or mnet !! @@ -7,5 +7,4 @@ Do not use outside of our /webservice/* or mnet !! Changes: * lots of files removed * small fix to error reporting in reflection (MDL-21460, ZF-8980) -* regular expression fix in reflection (committed upstream, will be in 1.10) (MDL-21461, ZF-6996)