From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Nov 2008 18:00:44 +0000 (+0000)
Subject: Improve use syntax
X-Git-Tag: php-5.3.0alpha2~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cb8b8ba4029fe90cb4c4ea73b9fdf1be6796874;p=php

Improve use syntax
[DOC] use \foo\bar is the same as use foo\bar
---

diff --git a/Zend/tests/ns_078.phpt b/Zend/tests/ns_078.phpt
new file mode 100755
index 0000000000..ed6770ff47
--- /dev/null
+++ b/Zend/tests/ns_078.phpt
@@ -0,0 +1,33 @@
+--TEST--
+002: Import - different syntaxes
+--FILE--
+<?php
+namespace test\ns1;
+
+class Foo {
+  static function bar() {
+    echo __CLASS__,"\n";
+  }
+}
+
+class Foo2 {
+  static function bar() {
+    echo __CLASS__,"\n";
+  }
+}
+
+namespace xyz;
+use test\ns1\Foo;
+use test\ns1\Foo as Bar;
+use \test\ns1\Foo2;
+use \test\ns1\Foo2 as Bar2;
+
+Foo::bar();
+Bar::bar();
+Foo2::bar();
+Bar2::bar();
+--EXPECT--
+test\ns1\Foo
+test\ns1\Foo
+test\ns1\Foo2
+test\ns1\Foo2
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 33d20130a9..e613f05abc 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -183,8 +183,8 @@ use_declarations:
 use_declaration:
 		namespace_name 			{ zend_do_use(&$1, NULL, 0 TSRMLS_CC); }
 	|	namespace_name T_AS T_STRING	{ zend_do_use(&$1, &$3, 0 TSRMLS_CC); }
-	|	T_NS_SEPARATOR T_STRING { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
-	|	T_NS_SEPARATOR T_STRING T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); }
 ;
 
 constant_declaration: