Revert previous change, leave it to next major release

Revert "enable namespace mode in 5.3+" This reverts commit 149f575.
taochangle · Sep 9, 2012 · 830f42f · 830f42f
1 parent fdf8d49
commit 830f42f
Show file tree

Hide file tree

Showing 32 changed files with 120 additions and 125 deletions.
diff --git a/configs/ini.c b/configs/ini.c
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: ini.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: ini.c 327425 2012-09-02 03:58:49Z laruence $ */
 
 zend_class_entry *yaf_config_ini_ce;
 
@@ -823,7 +823,7 @@ zend_function_entry yaf_config_ini_methods[] = {
 YAF_STARTUP_FUNCTION(config_ini) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Config_Ini", yaf_config_ini_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Config_Ini", "Yaf\\Config\\Ini", yaf_config_ini_methods);
 	yaf_config_ini_ce = zend_register_internal_class_ex(&ce, yaf_config_ce, NULL TSRMLS_CC);
 
 #ifdef HAVE_SPL
@@ -833,7 +833,6 @@ YAF_STARTUP_FUNCTION(config_ini) {
 #endif
 
 	yaf_config_ini_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Config\\Ini", yaf_config_ini_ce);
 
 	return SUCCESS;
 }

diff --git a/configs/simple.c b/configs/simple.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simple.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: simple.c 327425 2012-09-02 03:58:49Z laruence $ */
 
 zend_class_entry *yaf_config_simple_ce;
 
@@ -343,7 +343,7 @@ zend_function_entry yaf_config_simple_methods[] = {
 YAF_STARTUP_FUNCTION(config_simple) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Config_Simple", yaf_config_simple_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Config_Simple", "Yaf\\Config\\Simple", yaf_config_simple_methods);
 	yaf_config_simple_ce = zend_register_internal_class_ex(&ce, yaf_config_ce, NULL TSRMLS_CC);
 
 #ifdef HAVE_SPL
@@ -354,7 +354,6 @@ YAF_STARTUP_FUNCTION(config_simple) {
 	zend_declare_property_bool(yaf_config_simple_ce, ZEND_STRL(YAF_CONFIG_PROPERT_NAME_READONLY), 0, ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	yaf_config_simple_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Config\\Simple", yaf_config_simple_ce);
 
 	return SUCCESS;
 }

diff --git a/php_yaf.h b/php_yaf.h
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_yaf.h 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: php_yaf.h 327561 2012-09-09 06:30:22Z laruence $ */
 
 #ifndef PHP_YAF_H
 #define PHP_YAF_H
@@ -119,6 +119,9 @@ ZEND_BEGIN_MODULE_GLOBALS(yaf)
 	zval        *active_ini_file_section;
 	zval        *ini_wanted_section;
 	uint        parsing_flag;
+#ifdef YAF_HAVE_NAMESPACE
+	zend_bool	use_namespace;
+#endif
 ZEND_END_MODULE_GLOBALS(yaf)
 
 PHP_MINIT_FUNCTION(yaf);

diff --git a/requests/http.c b/requests/http.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: http.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: http.c 327549 2012-09-09 03:02:48Z laruence $ */
 
 #include "ext/standard/url.h"
 
@@ -277,9 +277,8 @@ zend_function_entry yaf_request_http_methods[] = {
  */
 YAF_STARTUP_FUNCTION(request_http){
 	zend_class_entry ce;
-	INIT_CLASS_ENTRY(ce, "Yaf_Request_Http", yaf_request_http_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Http", "Yaf\\Request\\Http", yaf_request_http_methods);
 	yaf_request_http_ce = zend_register_internal_class_ex(&ce, yaf_request_ce, NULL TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Request\\Http", yaf_request_http_ce);
 
 	zend_declare_class_constant_string(yaf_request_ce, ZEND_STRL("SCHEME_HTTP"), "http" TSRMLS_CC);
 	zend_declare_class_constant_string(yaf_request_ce, ZEND_STRL("SCHEME_HTTPS"), "https" TSRMLS_CC);

diff --git a/requests/simple.c b/requests/simple.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simple.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: simple.c 327554 2012-09-09 04:49:24Z laruence $ */
 
 static zend_class_entry *yaf_request_simple_ce;
 
@@ -255,11 +255,9 @@ zend_function_entry yaf_request_simple_methods[] = {
  */
 YAF_STARTUP_FUNCTION(request_simple){
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Request_Simple", yaf_request_simple_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Simple", "Yaf\\Request\\Simple", yaf_request_simple_methods);
 	yaf_request_simple_ce = zend_register_internal_class_ex(&ce, yaf_request_ce, NULL TSRMLS_CC);
 	yaf_request_simple_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Request\\Simple", yaf_request_simple_ce);
 
 	zend_declare_class_constant_string(yaf_request_simple_ce, ZEND_STRL("SCHEME_HTTP"),  "http" TSRMLS_CC);
 	zend_declare_class_constant_string(yaf_request_simple_ce, ZEND_STRL("SCHEME_HTTPS"), "https" TSRMLS_CC);

diff --git a/response/cli.c b/response/cli.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: cli.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: cli.c 321289 2011-12-21 02:53:29Z laruence $ */
 
 
 zend_class_entry * yaf_response_cli_ce;
@@ -30,9 +30,10 @@ zend_function_entry yaf_response_cli_methods[] = {
 */
 YAF_STARTUP_FUNCTION(response_cli) {
 	zend_class_entry ce;
-	INIT_CLASS_ENTRY(ce, "Yaf_Response_Cli", yaf_response_cli_methods);
+
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Response_Cli", "Yaf\\Response\\Cli", yaf_response_cli_methods);
+
 	yaf_response_cli_ce = zend_register_internal_class_ex(&ce, yaf_response_ce, NULL TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Response\\Cli", yaf_response_cli_ce);
 
 	return SUCCESS;
 }

diff --git a/response/http.c b/response/http.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
  */
 
-/* $Id: http.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: http.c 321289 2011-12-21 02:53:29Z laruence $ */
 
 zend_class_entry *yaf_response_http_ce;
 
@@ -30,9 +30,9 @@ zend_function_entry yaf_response_http_methods[] = {
 YAF_STARTUP_FUNCTION(response_http) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Response_Http", yaf_response_http_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Response_Http", "Yaf\\Response\\Http", yaf_response_http_methods);
+
 	yaf_response_http_ce = zend_register_internal_class_ex(&ce, yaf_response_ce, NULL TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Response\\Http", yaf_response_http_ce);
 
 	zend_declare_property_bool(yaf_response_http_ce, ZEND_STRL(YAF_RESPONSE_PROPERTY_NAME_HEADEREXCEPTION), 1, ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_long(yaf_response_http_ce, ZEND_STRL(YAF_RESPONSE_PROPERTY_NAME_RESPONSECODE),	200, ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/routes/interface.c b/routes/interface.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: interface.c 326042 2012-06-08 10:49:59Z laruence $ */
 
 #include "ext/standard/php_smart_str.h"
 
@@ -146,10 +146,8 @@ zend_function_entry yaf_route_methods[] = {
  */
 YAF_STARTUP_FUNCTION(route) {
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Interface", yaf_route_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Interface", "Yaf\\Route_Interface", yaf_route_methods);
 	yaf_route_ce = zend_register_internal_interface(&ce TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route_Interface", yaf_route_ce);
 
 	YAF_STARTUP(route_static);
 	YAF_STARTUP(route_simple);

diff --git a/routes/map.c b/routes/map.c
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: map.c 327565 2012-09-09 07:48:24Z laruence $*/
+/* $Id: map.c 327549 2012-09-09 03:02:48Z laruence $*/
 
 zend_class_entry *yaf_route_map_ce;
 
@@ -174,10 +174,9 @@ zend_function_entry yaf_route_map_methods[] = {
 YAF_STARTUP_FUNCTION(route_map) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Map", yaf_route_map_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Map", "Yaf\\Route\\Map", yaf_route_map_methods);
 	yaf_route_map_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_map_ce TSRMLS_CC, 1, yaf_route_ce);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route\\Map", yaf_route_map_ce);
 
 	yaf_route_map_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 

diff --git a/routes/regex.c b/routes/regex.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
  */
 
-/* $Id: regex.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: regex.c 327549 2012-09-09 03:02:48Z laruence $ */
 
 zend_class_entry *yaf_route_regex_ce;
 
@@ -237,12 +237,10 @@ zend_function_entry yaf_route_regex_methods[] = {
  */
 YAF_STARTUP_FUNCTION(route_regex) {
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Regex", yaf_route_regex_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Regex", "Yaf\\Route\\Regex", yaf_route_regex_methods);
 	yaf_route_regex_ce = zend_register_internal_class_ex(&ce, yaf_route_ce, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_regex_ce TSRMLS_CC, 1, yaf_route_ce);
 	yaf_route_regex_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route\\Regex", yaf_route_regex_ce);
 
 	zend_declare_property_null(yaf_route_regex_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_MATCH),  ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(yaf_route_regex_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_ROUTE),  ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/routes/rewrite.c b/routes/rewrite.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: rewrite.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: rewrite.c 327549 2012-09-09 03:02:48Z laruence $ */
 
 zend_class_entry *yaf_route_rewrite_ce;
 
@@ -298,12 +298,10 @@ zend_function_entry yaf_route_rewrite_methods[] = {
  */
 YAF_STARTUP_FUNCTION(route_rewrite) {
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Rewrite", yaf_route_rewrite_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Rewrite", "Yaf\\Route\\Rewrite", yaf_route_rewrite_methods);
 	yaf_route_rewrite_ce = zend_register_internal_class_ex(&ce, yaf_route_ce, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_rewrite_ce TSRMLS_CC, 1, yaf_route_ce);
 	yaf_route_rewrite_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route\\Rewrite", yaf_route_rewrite_ce);
 
 	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_MATCH),  ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_ROUTE),  ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/routes/simple.c b/routes/simple.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simple.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: simple.c 327549 2012-09-09 03:02:48Z laruence $ */
 
 zend_class_entry *yaf_route_simple_ce;
 
@@ -130,10 +130,9 @@ zend_function_entry yaf_route_simple_methods[] = {
 YAF_STARTUP_FUNCTION(route_simple) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Simple", yaf_route_simple_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Simple", "Yaf\\Route\\Simple", yaf_route_simple_methods);
 	yaf_route_simple_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_simple_ce TSRMLS_CC, 1, yaf_route_ce);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route\\Simple", yaf_route_simple_ce);
 
 	yaf_route_simple_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 

diff --git a/routes/static.c b/routes/static.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
  */
 
-/* $Id: static.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: static.c 327548 2012-09-09 02:33:16Z laruence $ */
 
 zend_class_entry * yaf_route_static_ce;
 
@@ -196,10 +196,9 @@ zend_function_entry yaf_route_static_methods[] = {
 YAF_STARTUP_FUNCTION(route_static) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Static", yaf_route_static_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Static", "Yaf\\Route_Static", yaf_route_static_methods);
 	yaf_route_static_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_static_ce TSRMLS_CC, 1, yaf_router_ce);
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route_Static", yaf_route_static_ce);
 
 	return SUCCESS;
 }

diff --git a/routes/supervar.c b/routes/supervar.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: supervar.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: supervar.c 327549 2012-09-09 03:02:48Z laruence $ */
 
 #define YAF_ROUTE_SUPERVAR_PROPETY_NAME_VAR "_var_name"
 
@@ -116,12 +116,10 @@ zend_function_entry yaf_route_supervar_methods[] = {
  */
 YAF_STARTUP_FUNCTION(route_supervar) {
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Route_Supervar", yaf_route_supervar_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Supervar", "Yaf\\Route\\Supervar", yaf_route_supervar_methods);
 	yaf_route_supervar_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
 	zend_class_implements(yaf_route_supervar_ce TSRMLS_CC, 1, yaf_route_ce);
 	yaf_route_supervar_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Route\\Supervar", yaf_route_supervar_ce);
 
 	zend_declare_property_null(yaf_route_supervar_ce, ZEND_STRL(YAF_ROUTE_SUPERVAR_PROPETY_NAME_VAR),  ZEND_ACC_PROTECTED TSRMLS_CC);
 

diff --git a/views/interface.c b/views/interface.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: interface.c 327426 2012-09-02 04:01:00Z laruence $ */
 
 zend_class_entry *yaf_view_interface_ce;
 
@@ -59,9 +59,8 @@ zend_function_entry yaf_view_interface_methods[] = {
  */
 YAF_STARTUP_FUNCTION(view_interface) {
 	zend_class_entry ce;
-	INIT_CLASS_ENTRY(ce, "Yaf_View_Interface", yaf_view_interface_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_View_Interface", "Yaf\\View_Interface", yaf_view_interface_methods);
 	yaf_view_interface_ce = zend_register_internal_interface(&ce TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\View_Interface", yaf_view_interface_ce);
 
 	return SUCCESS;
 }

diff --git a/views/simple.c b/views/simple.c
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: simple.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: simple.c 327562 2012-09-09 06:54:44Z laruence $ */
 
 #include "main/php_output.h"
 
@@ -897,9 +897,8 @@ zend_function_entry yaf_view_simple_methods[] = {
 YAF_STARTUP_FUNCTION(view_simple) {
 	zend_class_entry ce;
 
-	INIT_CLASS_ENTRY(ce, "Yaf_View_Simple", yaf_view_simple_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_View_Simple", "Yaf\\View\\Simple", yaf_view_simple_methods);
 	yaf_view_simple_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
-	YAF_INIT_CLASS_ALIAS("Yaf\\View\\Simple", yaf_view_simple_ce);
 
 	zend_declare_property_null(yaf_view_simple_ce, ZEND_STRL(YAF_VIEW_PROPERTY_NAME_TPLVARS), ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(yaf_view_simple_ce, ZEND_STRL(YAF_VIEW_PROPERTY_NAME_TPLDIR),  ZEND_ACC_PROTECTED TSRMLS_CC);

diff --git a/yaf.c b/yaf.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: yaf.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: yaf.c 327514 2012-09-07 04:31:34Z laruence $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -78,6 +78,9 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("yaf.st_compatible",     "0", PHP_INI_ALL, OnUpdateBool, st_compatible, zend_yaf_globals, yaf_globals)
 /* }}} */
 	STD_PHP_INI_ENTRY("yaf.environ",        	"product", PHP_INI_SYSTEM, OnUpdateString, environ, zend_yaf_globals, yaf_globals)
+#ifdef YAF_HAVE_NAMESPACE
+	STD_PHP_INI_BOOLEAN("yaf.use_namespace",   	"0", PHP_INI_SYSTEM, OnUpdateBool, use_namespace, zend_yaf_globals, yaf_globals)
+#endif
 PHP_INI_END();
 /* }}} */
 

diff --git a/yaf_action.c b/yaf_action.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: yaf_action.c 327565 2012-09-09 07:48:24Z laruence $ */
+/* $Id: yaf_action.c 321289 2011-12-21 02:53:29Z laruence $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -61,11 +61,9 @@ zend_function_entry yaf_action_methods[] = {
 */
 YAF_STARTUP_FUNCTION(action) {
 	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "Yaf_Action_Abstract", yaf_action_methods);
+	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Action_Abstract", "Yaf\\Action_Abstract", yaf_action_methods);
 	yaf_action_ce = zend_register_internal_class_ex(&ce, yaf_controller_ce, NULL TSRMLS_CC);
 	yaf_action_ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
-	YAF_INIT_CLASS_ALIAS("Yaf\\Action_Abstract", yaf_action_ce);
 
 	zend_declare_property_null(yaf_action_ce, ZEND_STRL(YAF_ACTION_PROPERTY_NAME_CTRL),	ZEND_ACC_PROTECTED TSRMLS_CC);