dmitry          Thu Jan 10 09:38:23 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2        zend_execute_API.c 
    /php-src/ext/reflection/tests       bug42976.phpt 
    /php-src/ext/standard/tests/general_functions       bug41970.phpt 
  Log:
  Added missing warning message
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.16&r2=1.331.2.20.2.24.2.17&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.16 
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.17
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.16 Mon Dec 31 07:17:04 2007
+++ ZendEngine2/zend_execute_API.c      Thu Jan 10 09:38:23 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.16 2007/12/31 07:17:04 
sebastian Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.17 2008/01/10 09:38:23 dmitry 
Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -944,6 +944,7 @@
 
                if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 
1)
                        && !PZVAL_IS_REF(*fci->params[i])) {
+
                        if (Z_REFCOUNT_PP(fci->params[i]) > 1) {
                                zval *new_zval;
 
@@ -958,8 +959,14 @@
                                                zval_ptr_dtor(&method_name);
                                                zval_ptr_dtor(&params_array);
                                        }
+                                       zend_error(E_WARNING, "Parameter %d to 
%s%s%s() expected to be a reference, value given",
+                                               i+1,
+                                               
EX(function_state).function->common.scope ? 
EX(function_state).function->common.scope->name : "",
+                                               
EX(function_state).function->common.scope ? "::" : "",
+                                               
EX(function_state).function->common.function_name);
                                        return FAILURE;
                                }
+
                                ALLOC_ZVAL(new_zval);
                                *new_zval = **fci->params[i];
                                zval_copy_ctor(new_zval);
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug42976.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/reflection/tests/bug42976.phpt
diff -u php-src/ext/reflection/tests/bug42976.phpt:1.1.2.1 
php-src/ext/reflection/tests/bug42976.phpt:1.1.2.2
--- php-src/ext/reflection/tests/bug42976.phpt:1.1.2.1  Sun Oct 28 13:42:24 2007
+++ php-src/ext/reflection/tests/bug42976.phpt  Thu Jan 10 09:38:23 2008
@@ -26,9 +26,13 @@
 --EXPECTF--    
 string(9) "x.changed"
 
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Parameter 1 to C::__construct() expected to be a reference, value 
given in %sbug42976.php on line 15
+
+Warning: Invocation of C's constructor failed in %sbug42976.php on line 15
 string(10) "x.original"
 
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Parameter 1 to C::__construct() expected to be a reference, value 
given in %sbug42976.php on line 18
+
+Warning: Invocation of C's constructor failed in %sbug42976.php on line 18
 string(10) "x.original"
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41970.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug41970.phpt
diff -u php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.2 
php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.3
--- php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.2  Fri Nov 
 2 19:42:51 2007
+++ php-src/ext/standard/tests/general_functions/bug41970.phpt  Thu Jan 10 
09:38:23 2008
@@ -12,13 +12,16 @@
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
+Warning: Parameter 1 to sort() expected to be a reference, value given in 
%sbug41970.php on line 5
 NULL
 
-Notice: Array to string conversion in %s on line %d
+Notice: Array to string conversion in %sbug41970.php on line 6
 int(5)
+
+Warning: Parameter 1 to sort() expected to be a reference, value given in 
%sbug41970.php on line 7
 NULL
 
-Notice: Array to string conversion in %s on line %d
+Notice: Array to string conversion in %sbug41970.php on line 8
 int(5)
 Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to