mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 06:21:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes a syntactical inconsistency with group use and leading \

Browse Source 
discussion: http://news.php.net/php.internals/87774
This commit is contained in:
Márcio Almada 2015-08-18 19:16:06 -03:00
parent 32462a8076
commit 7568d5cb89
3 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/tests/ns_094.phpt
View File

@ -3,7 +3,7 @@ Type group use declarations should not allow override on inner itens
--FILE--
<?php
// should not throw syntax errors
// should throw syntax errors
use const Foo\Bar\{
A,

51
Zend/tests/ns_095.phpt Normal file
View File

@ -0,0 +1,51 @@
--TEST--
Absolute namespaces should be allowed
--FILE--
<?php
namespace Foo\Bar {
class ClassA{}
class ClassB{}
class ClassC{}
function fn_a(){ return __FUNCTION__; }
function fn_b(){ return __FUNCTION__; }
function fn_c(){ return __FUNCTION__; }
const CONST_A = 1;
const CONST_B = 2;
const CONST_C = 3;
}
namespace Baz {
use \Foo\Bar\{ClassA, ClassB, ClassC};
use function \Foo\Bar\{fn_a, fn_b, fn_c};
use const \Foo\Bar\{CONST_A, CONST_B, CONST_C};
var_dump(ClassA::class);
var_dump(ClassB::class);
var_dump(ClassC::class);
var_dump(fn_a());
var_dump(fn_b());
var_dump(fn_c());
var_dump(CONST_A);
var_dump(CONST_B);
var_dump(CONST_C);
echo "\nDone\n";
}
?>
--EXPECTF--
string(14) "Foo\Bar\ClassA"
string(14) "Foo\Bar\ClassB"
string(14) "Foo\Bar\ClassC"
string(12) "Foo\Bar\fn_a"
string(12) "Foo\Bar\fn_b"
string(12) "Foo\Bar\fn_c"
int(1)
int(2)
int(3)
Done

12
Zend/zend_language_parser.y
View File

@ -335,13 +335,17 @@ use_type:
;
group_use_declaration:
namespace_name T_NS_SEPARATOR '{' use_declarations '}'
{$$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4); }
namespace_name T_NS_SEPARATOR '{' use_declarations '}'
{ $$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4); }
| T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' use_declarations '}'
{ $$ = zend_ast_create(ZEND_AST_GROUP_USE, $2, $5); }
;
mixed_group_use_declaration:
namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
{$$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4);}
namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
{ $$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4);}
| T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
{ $$ = zend_ast_create(ZEND_AST_GROUP_USE, $2, $5); }
;
inline_use_declarations: