From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 13 Dec 2007 10:02:03 +0000 (+0000)
Subject: Allowed import of global classes "use ::GlobalClassName;"
X-Git-Tag: RELEASE_1_3_1~513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64e8f223556d905ff23df31ec40335528113e40c;p=php

Allowed import of global classes "use ::GlobalClassName;"
---

diff --git a/Zend/tests/ns_061.phpt b/Zend/tests/ns_061.phpt
new file mode 100644
index 0000000000..a02f63d71f
--- /dev/null
+++ b/Zend/tests/ns_061.phpt
@@ -0,0 +1,9 @@
+--TEST--
+061: use in global scope
+--FILE--
+<?php
+class A {}
+use ::A as B;
+echo get_class(new B)."\n";
+--EXPECT--
+A
diff --git a/Zend/tests/ns_062.phpt b/Zend/tests/ns_062.phpt
new file mode 100644
index 0000000000..07043dbf68
--- /dev/null
+++ b/Zend/tests/ns_062.phpt
@@ -0,0 +1,12 @@
+--TEST--
+062: use ::global class
+--FILE--
+<?php
+namespace Foo;
+use ::stdClass;
+use ::stdClass as A;
+echo get_class(new stdClass)."\n";
+echo get_class(new A)."\n";
+--EXPECT--
+stdClass
+stdClass
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b4f3d88a03..334816d1a7 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4777,7 +4777,7 @@ void zend_do_namespace(znode *name TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	char *lcname;
 	zval *name, *ns, tmp;
@@ -4804,7 +4804,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 		} else {
 			*name = *ns;
 			zval_copy_ctor(name);
-			warn = 1;
+			warn = !is_global;
 		}
 	}
 
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index a2a8dcd053..b96de1c9a2 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -510,7 +510,7 @@ void zend_do_abstract_method(znode *function_name, znode *modifiers, znode *body
 void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC);
 void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC);
 void zend_do_namespace(znode *name TSRMLS_DC);
-void zend_do_use(znode *name, znode *new_name TSRMLS_DC);
+void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC);
 void zend_do_end_compilation(TSRMLS_D);
 
 ZEND_API void function_add_ref(zend_function *function);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index a407b50133..fe260c99d8 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -168,8 +168,10 @@ top_statement:
 	|	class_declaration_statement		{ zend_do_early_binding(TSRMLS_C); }
 	|	T_HALT_COMPILER '(' ')' ';'		{ zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
 	|	T_NAMESPACE namespace_name ';'	{ zend_do_namespace(&$2 TSRMLS_CC); }
-	|	T_USE namespace_name ';'		{ zend_do_use(&$2, NULL TSRMLS_CC); }
-	|	T_USE namespace_name T_AS T_STRING ';'	{ zend_do_use(&$2, &$4 TSRMLS_CC); }
+	|	T_USE namespace_name ';'		{ zend_do_use(&$2, NULL, 0 TSRMLS_CC); }
+	|	T_USE namespace_name T_AS T_STRING ';'	{ zend_do_use(&$2, &$4, 0 TSRMLS_CC); }
+	|	T_USE T_PAAMAYIM_NEKUDOTAYIM T_STRING ';'		{ zend_do_use(&$3, NULL, 1 TSRMLS_CC); }
+	|	T_USE T_PAAMAYIM_NEKUDOTAYIM T_STRING T_AS T_STRING ';'		{ zend_do_use(&$3, &$5, 1 TSRMLS_CC); }
 	|	constant_declaration ';'
 ;