phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2024-11-26 20:14:46 +01:00
Code Issues Projects Releases Wiki Activity

Add support for static return type

Browse Source
This commit is contained in:
Nikita Popov 2020-08-09 18:51:31 +02:00
parent 98f7f39d1c
commit 7f398769a0
5 changed files with 963 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ Version 4.8.1-dev
### Added
* [PHP 8.0] Added support for named arguments, represented using a new `name` subnode on `Arg`.
* [PHP 8.0] Added support for static return type, represented like a normal class return type.
Version 4.8.0 (2020-08-09)
--------------------------

28
grammar/php7.y
View File

@ -475,13 +475,13 @@ optional_visibility_modifier:
;
parameter:
optional_visibility_modifier optional_type optional_ref optional_ellipsis plain_variable
optional_visibility_modifier optional_type_without_static optional_ref optional_ellipsis plain_variable
{ $$ = new Node\Param($5, null, $2, $3, $4, attributes(), $1);
$this->checkParam($$); }
| optional_visibility_modifier optional_type optional_ref optional_ellipsis plain_variable '=' expr
| optional_visibility_modifier optional_type_without_static optional_ref optional_ellipsis plain_variable '=' expr
{ $$ = new Node\Param($5, $7, $2, $3, $4, attributes(), $1);
$this->checkParam($$); }
| optional_visibility_modifier optional_type optional_ref optional_ellipsis error
| optional_visibility_modifier optional_type_without_static optional_ref optional_ellipsis error
{ $$ = new Node\Param(Expr\Error[], null, $2, $3, $4, attributes(), $1); }
;
@ -492,6 +492,11 @@ type_expr:
;
type:
type_without_static { $$ = $1; }
| T_STATIC { $$ = Node\Name['static']; }
;
type_without_static:
name { $$ = $this->handleBuiltinTypes($1); }
| T_ARRAY { $$ = Node\Identifier['array']; }
| T_CALLABLE { $$ = Node\Identifier['callable']; }
@ -502,9 +507,20 @@ union_type:
| union_type '|' type { push($1, $3); }
;
optional_type:
union_type_without_static:
type_without_static '|' type_without_static { init($1, $3); }
| union_type_without_static '|' type_without_static { push($1, $3); }
;
type_expr_without_static:
type_without_static { $$ = $1; }
| '?' type_without_static { $$ = Node\NullableType[$2]; }
| union_type_without_static { $$ = Node\UnionType[$1]; }
;
optional_type_without_static:
/* empty */ { $$ = null; }
| type_expr { $$ = $1; }
| type_expr_without_static { $$ = $1; }
;
optional_return_type:
@ -570,7 +586,7 @@ class_statement_list:
;
class_statement:
variable_modifiers optional_type property_declaration_list ';'
variable_modifiers optional_type_without_static property_declaration_list ';'
{ $attrs = attributes();
$$ = new Stmt\Property($1, $3, $attrs, $2); $this->checkProperty($$, #1); }
| method_modifiers T_CONST class_const_list ';'

1753
lib/PhpParser/Parser/Php7.php
View File

File diff suppressed because it is too large Load Diff

37
test/code/parser/stmt/class/staticType.test Normal file
View File

@ -0,0 +1,37 @@
Static return type
-----
<?php
class Test {
public static function create(): static {}
}
-----
!!php7
array(
0: Stmt_Class(
flags: 0
name: Identifier(
name: Test
)
extends: null
implements: array(
)
stmts: array(
0: Stmt_ClassMethod(
flags: MODIFIER_PUBLIC | MODIFIER_STATIC (9)
byRef: false
name: Identifier(
name: create
)
params: array(
)
returnType: Name(
parts: array(
0: static
)
)
stmts: array(
)
)
)
)
)

14
test/code/prettyPrinter/stmt/staticType.test Normal file
View File

@ -0,0 +1,14 @@
Static return type
-----
<?php
class Test {
public static function create(): static {}
}
-----
!!php7
class Test
{
public static function create() : static
{
}
}