Merge pull request #1468 from sjinks/issue-1467

Fix #1467
phalcon · Oct 29, 2013 · 9312edc · 9312edc
2 parents 177d4bc + 6a40a3e
commit 9312edc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/ext/debug.c b/ext/debug.c
@@ -1021,7 +1021,7 @@ PHP_METHOD(Phalcon_Debug, onUncaughtException){
 	/** 
 	 * Globally block the debug component to avoid other exceptions must be shown
 	 */
-	phalcon_update_static_property_ce(phalcon_debug_ce, SL("_isActive"), PHALCON_GLOBAL(z_true) TSRMLS_CC);
+	zend_update_static_property_bool(phalcon_debug_ce, SL("_isActive"), 1 TSRMLS_CC);
 
 	PHALCON_INIT_VAR(class_name);
 	phalcon_get_class(class_name, exception, 0 TSRMLS_CC);
@@ -1252,7 +1252,7 @@ PHP_METHOD(Phalcon_Debug, onUncaughtException){
 	/** 
 	 * Unlock the exception renderer
 	 */
-	phalcon_update_static_property_ce(phalcon_debug_ce, SL("_isActive"), PHALCON_GLOBAL(z_false) TSRMLS_CC);
+	zend_update_static_property_bool(phalcon_debug_ce, SL("_isActive"), 0 TSRMLS_CC);
 	RETURN_MM_TRUE;
 }
 

diff --git a/ext/di.c b/ext/di.c
@@ -624,5 +624,5 @@ PHP_METHOD(Phalcon_DI, getDefault){
  */
 PHP_METHOD(Phalcon_DI, reset){
 
-	phalcon_update_static_property_ce(phalcon_di_ce, SL("_default"), PHALCON_GLOBAL(z_null) TSRMLS_CC);
+	zend_update_static_property_null(phalcon_di_ce, SL("_default") TSRMLS_CC);
 }
diff --git a/ext/mvc/router/route.c b/ext/mvc/router/route.c
@@ -704,5 +704,5 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getConverters){
  */
 PHP_METHOD(Phalcon_Mvc_Router_Route, reset){
 
-	phalcon_update_static_property_ce(phalcon_mvc_router_route_ce, SL("_uniqueId"), PHALCON_GLOBAL(z_zero) TSRMLS_CC);
+	zend_update_static_property_long(phalcon_mvc_router_route_ce, SL("_uniqueId"), 0 TSRMLS_CC);
 }
diff --git a/ext/tests/issue-1467.phpt b/ext/tests/issue-1467.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Phalcon\DI::reset() is buggy - https://github.com/phalcon/cphalcon/issues/1467
+--SKIPIF--
+<?php include('skipif.inc');
+--FILE--
+<?php
+\Phalcon\Di::reset();
+$di = new \Phalcon\DI\FactoryDefault();
+?>
+--EXPECT--