From: Márcio Almada <marcio3w@gmail.com>
Date: Fri, 30 Jan 2015 22:54:37 +0000 (-0300)
Subject: require trailing T_NS_SEPARATOR #1005
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~767^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=344fc25b1267d7232ea1c30ea5fabf4788b2aed2;p=php

require trailing T_NS_SEPARATOR #1005
---

diff --git a/Zend/tests/ns_088.phpt b/Zend/tests/ns_088.phpt
index adcc616822..484fae38df 100644
--- a/Zend/tests/ns_088.phpt
+++ b/Zend/tests/ns_088.phpt
@@ -3,7 +3,7 @@ Nested batch use statements syntax error
 --FILE--
 <?php
 namespace Fiz\Biz\Buz {
-    use Foo\Bar\Baz {
+    use Foo\Bar\Baz\{
         A,
         B {
             C
diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt
index 52094172d3..81c4c02db9 100644
--- a/Zend/tests/ns_089.phpt
+++ b/Zend/tests/ns_089.phpt
@@ -14,7 +14,7 @@ namespace Foo\Bar\Baz {
 }
 namespace Fiz\Biz\Buz {
 
-    use Foo\Bar\Baz {
+    use Foo\Bar\Baz\{
         A,
         B,
         C as AC,
diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt
index bf460d0352..73c859544c 100644
--- a/Zend/tests/ns_090.phpt
+++ b/Zend/tests/ns_090.phpt
@@ -14,8 +14,8 @@ namespace Foo\Bar\Baz {
 }
 namespace Fiz\Biz\Buz {
 
-    use Foo\Bar\Baz { A, B, C as AC, D };
-    use Foo\Bar\Baz { function foo, function bar as buz, const FOO, const BAR AS BOZ };
+    use Foo\Bar\Baz\{ A, B, C as AC, D };
+    use Foo\Bar\Baz\{ function foo, function bar as buz, const FOO, const BAR AS BOZ };
 
     class C { function __construct() {echo __METHOD__,"\n";}}
     function bar(){echo __FUNCTION__,"\n";}
diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt
index 2338e88cad..8d93dd789e 100644
--- a/Zend/tests/ns_091.phpt
+++ b/Zend/tests/ns_091.phpt
@@ -10,7 +10,7 @@ namespace Foo\Bar\Baz {
 }
 namespace Fiz\Biz\Buz {
 
-    use Foo\Bar { A, Baz\B };
+    use Foo\Bar\{ A, Baz\B };
     new A;
     new B;
 }
diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt
index aff8c973c5..c69ada91e2 100644
--- a/Zend/tests/ns_092.phpt
+++ b/Zend/tests/ns_092.phpt
@@ -13,20 +13,20 @@ namespace Foo\Bar {
 }
 namespace Fiz\Biz\Buz {
 
-    use function Foo\Bar {
+    use function Foo\Bar\{
         fiz,
         biz,
         buz as boz,
         A // <- this one must fail
     };
 
-    use const Foo\Bar {
+    use const Foo\Bar\{
         FOO as FOZ,
         BAR,
         B // <- this one must fail
     };
 
-    use Foo\Bar { A, B, const BAR as BOZ };
+    use Foo\Bar\{ A, B, const BAR as BOZ };
 
     function buz(){ echo __FUNCTION__,"\n"; }
     const FOO = 100;
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 88d9e2fa97..a9a93b86a6 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -308,13 +308,13 @@ top_statement:
 ;
 
 batch_use_declarations:
-	namespace_name '{' use_declarations '}'
-		{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $3); }
+	namespace_name T_NS_SEPARATOR '{' use_declarations '}'
+		{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4); }
 ;
 
 mixed_batch_use_declarations:
-	namespace_name '{' inline_use_declarations '}'
-		{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $3);}
+	namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
+		{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4);}
 ;
 
 inline_use_declarations: