mirror of
https://github.com/nikic/PHP-Parser.git
synced 2025-07-11 09:26:37 +02:00
Compare commits
54 Commits
Author | SHA1 | Date | |
---|---|---|---|
0ed4c8949a | |||
8a21ec3182 | |||
4d36e9c16f | |||
4e1b88d21c | |||
d4d4e3e155 | |||
32cdab9a03 | |||
c2403aa729 | |||
051ad218f8 | |||
1bcbb2179f | |||
05c01865ea | |||
2a5e81f7ca | |||
e453389866 | |||
402b6cf345 | |||
54103d8387 | |||
a6303e50c9 | |||
44fc92194b | |||
844c228bf2 | |||
6d2584bdf1 | |||
21a61ece15 | |||
8f8e47b6c1 | |||
0aad06bce3 | |||
80a680bf59 | |||
cfc54e30a4 | |||
05e84f7201 | |||
73ccbabbe7 | |||
19526a33fb | |||
1d0748ad35 | |||
c9e5a13d68 | |||
ba788aa98b | |||
11e2663a5b | |||
11e2dcd96c | |||
0ffddce52d | |||
6bb5176bc4 | |||
cad49f8ed3 | |||
570e980a20 | |||
a50b4310f7 | |||
8863f92b58 | |||
3182d12b55 | |||
1df465cd90 | |||
f59bbe44bf | |||
2e11deec46 | |||
a4fe65bf60 | |||
e072fd2c30 | |||
7027899d7f | |||
2f1fd784fe | |||
0ef6c55a3f | |||
8216e878be | |||
617d0220b9 | |||
a951e9e24d | |||
b30e7e73d5 | |||
ff24d1d61a | |||
e55f8c6b30 | |||
3ee592b6aa | |||
3fe2422e34 |
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1,5 +1,6 @@
|
|||||||
/.github export-ignore
|
/.github export-ignore
|
||||||
/doc export-ignore
|
/doc export-ignore
|
||||||
|
/grammar export-ignore
|
||||||
/test export-ignore
|
/test export-ignore
|
||||||
/test_old export-ignore
|
/test_old export-ignore
|
||||||
.editorconfig export-ignore
|
.editorconfig export-ignore
|
||||||
|
28
.github/workflows/main.yml
vendored
28
.github/workflows/main.yml
vendored
@ -5,17 +5,17 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tests_70:
|
tests_71:
|
||||||
runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
name: "PHP 7.0 Unit Tests"
|
name: "PHP 7.1 Unit Tests"
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
uses: "actions/checkout@v2"
|
uses: "actions/checkout@v3"
|
||||||
- name: "Install PHP"
|
- name: "Install PHP"
|
||||||
uses: "shivammathur/setup-php@v2"
|
uses: "shivammathur/setup-php@v2"
|
||||||
with:
|
with:
|
||||||
coverage: "xdebug"
|
coverage: "xdebug"
|
||||||
php-version: "7.0"
|
php-version: "7.1"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Install dependencies"
|
- name: "Install dependencies"
|
||||||
run: |
|
run: |
|
||||||
@ -34,23 +34,22 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version:
|
php-version:
|
||||||
- "7.1"
|
|
||||||
- "7.2"
|
- "7.2"
|
||||||
- "7.3"
|
- "7.3"
|
||||||
- "7.4"
|
- "7.4"
|
||||||
- "8.0"
|
- "8.0"
|
||||||
- "8.1"
|
- "8.1"
|
||||||
include:
|
- "8.2"
|
||||||
- php-version: "8.1"
|
- "8.3"
|
||||||
flags: "--ignore-platform-req=php"
|
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
uses: "actions/checkout@v2"
|
uses: "actions/checkout@v3"
|
||||||
- name: "Install PHP"
|
- name: "Install PHP"
|
||||||
uses: "shivammathur/setup-php@v2"
|
uses: "shivammathur/setup-php@v2"
|
||||||
with:
|
with:
|
||||||
coverage: "none"
|
coverage: "none"
|
||||||
php-version: "${{ matrix.php-version }}"
|
php-version: "${{ matrix.php-version }}"
|
||||||
|
ini-file: "development"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Install dependencies"
|
- name: "Install dependencies"
|
||||||
run: "composer update --no-progress --prefer-dist ${{ matrix.flags }}"
|
run: "composer update --no-progress --prefer-dist ${{ matrix.flags }}"
|
||||||
@ -61,28 +60,29 @@ jobs:
|
|||||||
name: "PHP 7.3 Code on PHP 8.0 Integration Tests"
|
name: "PHP 7.3 Code on PHP 8.0 Integration Tests"
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
uses: "actions/checkout@v2"
|
uses: "actions/checkout@v3"
|
||||||
- name: "Install PHP"
|
- name: "Install PHP"
|
||||||
uses: "shivammathur/setup-php@v2"
|
uses: "shivammathur/setup-php@v2"
|
||||||
with:
|
with:
|
||||||
coverage: "none"
|
coverage: "none"
|
||||||
php-version: "8.0"
|
php-version: "8.0"
|
||||||
|
ini-file: "development"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Install PHP 8 dependencies"
|
- name: "Install PHP 8 dependencies"
|
||||||
run: "composer update --no-progress --prefer-dist"
|
run: "composer update --no-progress --prefer-dist"
|
||||||
- name: "Tests"
|
- name: "Tests"
|
||||||
run: "test_old/run-php-src.sh 7.3.21"
|
run: "test_old/run-php-src.sh 7.3.21"
|
||||||
test_old_80_70:
|
test_old_80_71:
|
||||||
runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
name: "PHP 8.1 Code on PHP 7.0 Integration Tests"
|
name: "PHP 8.1 Code on PHP 7.1 Integration Tests"
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout"
|
- name: "Checkout"
|
||||||
uses: "actions/checkout@v2"
|
uses: "actions/checkout@v3"
|
||||||
- name: "Install PHP"
|
- name: "Install PHP"
|
||||||
uses: "shivammathur/setup-php@v2"
|
uses: "shivammathur/setup-php@v2"
|
||||||
with:
|
with:
|
||||||
coverage: "none"
|
coverage: "none"
|
||||||
php-version: "7.0"
|
php-version: "7.1"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Install PHP 8 dependencies"
|
- name: "Install PHP 8 dependencies"
|
||||||
run: "composer update --no-progress --prefer-dist"
|
run: "composer update --no-progress --prefer-dist"
|
||||||
|
130
CHANGELOG.md
130
CHANGELOG.md
@ -1,7 +1,131 @@
|
|||||||
Version 4.14.1-dev
|
Version 4.19.2 (2024-09-17)
|
||||||
------------------
|
---------------------------
|
||||||
|
|
||||||
Nothing yet.
|
### Added
|
||||||
|
|
||||||
|
* Added support for passing enum values to various builder methods, like `BuilderFactory::val()`.
|
||||||
|
|
||||||
|
Version 4.19.1 (2024-03-17)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed "Optional parameter before required parameter" deprecation warning introduced in
|
||||||
|
previous version.
|
||||||
|
|
||||||
|
Version 4.19.0 (2024-03-16)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* Do not use implicitly nullable parameters, which are deprecated in PHP 8.4.
|
||||||
|
* Remove support for running on PHP 7.0, which does not support explicitly nullable parameters.
|
||||||
|
|
||||||
|
Version 4.18.0 (2023-12-10)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* Added methods `ParserFactory::createForNewestSupportedVersion()` and
|
||||||
|
`ParserFactory::createForHostVersion()` for forward-compatibility with PHP-Parser 5.0.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed missing name resolution of class constant types.
|
||||||
|
* Fixed class members being dropped if an error is encountered while parsing a later class member
|
||||||
|
(when error recovery is enabeld).
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* The `grammar/` directory has been excluded from exported git archives.
|
||||||
|
|
||||||
|
Version 4.17.1 (2023-08-13)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed phpdoc mismatches for `ClassConst::$type` introduced in previous release.
|
||||||
|
|
||||||
|
Version 4.17.0 (2023-08-13)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* [PHP 8.3] Added support for typed class constants.
|
||||||
|
* [PHP 8.3] Added supprot for dynamic class constant fetch.
|
||||||
|
* [PHP 8.3] Added support for readonly anonymous classes.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed missing required parentheses when pretty printing new with an expression class name.
|
||||||
|
* Fixed missing required parentheses when pretty printing `(CONST)::$x` and similar.
|
||||||
|
|
||||||
|
Version 4.16.0 (2023-06-25)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* Added `Name::getParts()` method for forward-compatibility with PHP-Parser 5.
|
||||||
|
|
||||||
|
### Deprecated
|
||||||
|
|
||||||
|
* Deprecated direct access to `Name::$parts`, which will be removed in PHP-Parser 5.
|
||||||
|
|
||||||
|
Version 4.15.5 (2023-05-19)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* Added `makePrivate()`, `makeProtected()`, `makePublic()` and `makeReadonly()` methods to
|
||||||
|
`Builder\Param` to allow the creation of promoted parameters.
|
||||||
|
|
||||||
|
Version 4.15.4 (2023-03-05)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed formatting-preservation for alternative if syntax with trailing comments.
|
||||||
|
|
||||||
|
Version 4.15.3 (2023-01-16)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Support readonly property with PHP 8.2 DNF type.
|
||||||
|
* Fixed PHP attribute group and PHP-Parser attribute mixup in EnumCase builder.
|
||||||
|
|
||||||
|
Version 4.15.2 (2022-11-12)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed parsing of large hex float literals that contain an "e" character.
|
||||||
|
* Fixed tests to pass on 32-bit.
|
||||||
|
* Fixed generation of invalid code when using formatting-preserving pretty printer with code that
|
||||||
|
uses inline HTML.
|
||||||
|
|
||||||
|
Version 4.15.1 (2022-09-04)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Fixed formatting preservation when adding *multiple* attributes to a class/method/etc that
|
||||||
|
previously had none. This fixes a regression in the 4.15.0 release.
|
||||||
|
|
||||||
|
Version 4.15.0 (2022-09-03)
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* PHP 8.2: Added support for `true` type.
|
||||||
|
* PHP 8.2: Added support for DNF types.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* Support `readonly` as a function name.
|
||||||
|
* Added `__serialize` and `__unserialize` to magic method list.
|
||||||
|
* Fixed bounds check in `Name::slice()`.
|
||||||
|
* Fixed formatting preservation when adding attributes to a class/method/etc that previously had none.
|
||||||
|
|
||||||
Version 4.14.0 (2022-05-31)
|
Version 4.14.0 (2022-05-31)
|
||||||
---------------------------
|
---------------------------
|
||||||
|
@ -3,10 +3,10 @@ PHP Parser
|
|||||||
|
|
||||||
[](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
|
[](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
|
||||||
|
|
||||||
This is a PHP 5.2 to PHP 8.1 parser written in PHP. Its purpose is to simplify static code analysis and
|
This is a PHP 5.2 to PHP 8.2 parser written in PHP. Its purpose is to simplify static code analysis and
|
||||||
manipulation.
|
manipulation.
|
||||||
|
|
||||||
[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.1).
|
[**Documentation for version 4.x**][doc_4_x] (stable; for running on PHP >= 7.1; for parsing PHP 5.2 to PHP 8.2).
|
||||||
|
|
||||||
[Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
|
[Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
|
||||||
|
|
||||||
@ -222,4 +222,4 @@ Component documentation:
|
|||||||
* Parent and sibling references
|
* Parent and sibling references
|
||||||
|
|
||||||
[doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
|
[doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
|
||||||
[doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc
|
[doc_4_x]: https://github.com/nikic/PHP-Parser/tree/4.x/doc
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.0",
|
"php": ">=7.1",
|
||||||
"ext-tokenizer": "*"
|
"ext-tokenizer": "*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
@ -34,7 +34,7 @@ The parser supports parsing PHP 5.2-8.0, with the following exceptions:
|
|||||||
|
|
||||||
As the parser is based on the tokens returned by `token_get_all` (which is only able to lex the PHP
|
As the parser is based on the tokens returned by `token_get_all` (which is only able to lex the PHP
|
||||||
version it runs on), additionally a wrapper for emulating tokens from newer versions is provided.
|
version it runs on), additionally a wrapper for emulating tokens from newer versions is provided.
|
||||||
This allows to parse PHP 7.4 source code running on PHP 7.0, for example. This emulation is somewhat
|
This allows to parse PHP 7.4 source code running on PHP 7.1, for example. This emulation is somewhat
|
||||||
hacky and not perfect, but it should work well on any sane code.
|
hacky and not perfect, but it should work well on any sane code.
|
||||||
|
|
||||||
What output does it produce?
|
What output does it produce?
|
||||||
|
@ -264,8 +264,13 @@ optional_ellipsis:
|
|||||||
| T_ELLIPSIS { $$ = true; }
|
| T_ELLIPSIS { $$ = true; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
identifier_maybe_readonly:
|
||||||
|
identifier { $$ = $1; }
|
||||||
|
| T_READONLY { $$ = Node\Identifier[$1]; }
|
||||||
|
;
|
||||||
|
|
||||||
function_declaration_statement:
|
function_declaration_statement:
|
||||||
T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type '{' inner_statement_list '}'
|
T_FUNCTION optional_ref identifier_maybe_readonly '(' parameter_list ')' optional_return_type '{' inner_statement_list '}'
|
||||||
{ $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; }
|
{ $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; }
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -464,7 +469,7 @@ static_var:
|
|||||||
;
|
;
|
||||||
|
|
||||||
class_statement_list_ex:
|
class_statement_list_ex:
|
||||||
class_statement_list_ex class_statement { if ($2 !== null) { push($1, $2); } }
|
class_statement_list_ex class_statement { if ($2 !== null) { push($1, $2); } else { $$ = $1; } }
|
||||||
| /* empty */ { init(); }
|
| /* empty */ { init(); }
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -721,8 +726,13 @@ lexical_var:
|
|||||||
optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; }
|
optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
name_readonly:
|
||||||
|
T_READONLY { $$ = Name[$1]; }
|
||||||
|
;
|
||||||
|
|
||||||
function_call:
|
function_call:
|
||||||
name argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
name argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
||||||
|
| name_readonly argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
||||||
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex argument_list
|
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex argument_list
|
||||||
{ $$ = Expr\StaticCall[$1, $3, $4]; }
|
{ $$ = Expr\StaticCall[$1, $3, $4]; }
|
||||||
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}' argument_list
|
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}' argument_list
|
||||||
@ -998,7 +1008,7 @@ array_pair:
|
|||||||
| expr { $$ = Expr\ArrayItem[$1, null, false]; }
|
| expr { $$ = Expr\ArrayItem[$1, null, false]; }
|
||||||
| expr T_DOUBLE_ARROW ampersand variable { $$ = Expr\ArrayItem[$4, $1, true]; }
|
| expr T_DOUBLE_ARROW ampersand variable { $$ = Expr\ArrayItem[$4, $1, true]; }
|
||||||
| ampersand variable { $$ = Expr\ArrayItem[$2, null, true]; }
|
| ampersand variable { $$ = Expr\ArrayItem[$2, null, true]; }
|
||||||
| T_ELLIPSIS expr { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
|
| T_ELLIPSIS expr { $$ = new Expr\ArrayItem($2, null, false, attributes(), true); }
|
||||||
;
|
;
|
||||||
|
|
||||||
encaps_list:
|
encaps_list:
|
||||||
|
@ -221,7 +221,10 @@ non_empty_class_const_list:
|
|||||||
;
|
;
|
||||||
|
|
||||||
class_const:
|
class_const:
|
||||||
identifier_maybe_reserved '=' expr { $$ = Node\Const_[$1, $3]; }
|
T_STRING '=' expr
|
||||||
|
{ $$ = Node\Const_[new Node\Identifier($1, stackAttributes(#1)), $3]; }
|
||||||
|
| semi_reserved '=' expr
|
||||||
|
{ $$ = Node\Const_[new Node\Identifier($1, stackAttributes(#1)), $3]; }
|
||||||
;
|
;
|
||||||
|
|
||||||
inner_statement_list_ex:
|
inner_statement_list_ex:
|
||||||
@ -350,15 +353,23 @@ block_or_error:
|
|||||||
| error { $$ = []; }
|
| error { $$ = []; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
identifier_maybe_readonly:
|
||||||
|
identifier_not_reserved { $$ = $1; }
|
||||||
|
| T_READONLY { $$ = Node\Identifier[$1]; }
|
||||||
|
;
|
||||||
|
|
||||||
function_declaration_statement:
|
function_declaration_statement:
|
||||||
T_FUNCTION optional_ref identifier_not_reserved '(' parameter_list ')' optional_return_type block_or_error
|
T_FUNCTION optional_ref identifier_maybe_readonly '(' parameter_list ')' optional_return_type block_or_error
|
||||||
{ $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $8, 'attrGroups' => []]]; }
|
{ $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $8, 'attrGroups' => []]]; }
|
||||||
| attributes T_FUNCTION optional_ref identifier_not_reserved '(' parameter_list ')' optional_return_type block_or_error
|
| attributes T_FUNCTION optional_ref identifier_maybe_readonly '(' parameter_list ')' optional_return_type block_or_error
|
||||||
{ $$ = Stmt\Function_[$4, ['byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9, 'attrGroups' => $1]]; }
|
{ $$ = Stmt\Function_[$4, ['byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9, 'attrGroups' => $1]]; }
|
||||||
;
|
;
|
||||||
|
|
||||||
class_declaration_statement:
|
class_declaration_statement:
|
||||||
optional_attributes class_entry_type identifier_not_reserved extends_from implements_list '{' class_statement_list '}'
|
class_entry_type identifier_not_reserved extends_from implements_list '{' class_statement_list '}'
|
||||||
|
{ $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6, 'attrGroups' => []]];
|
||||||
|
$this->checkClass($$, #2); }
|
||||||
|
| attributes class_entry_type identifier_not_reserved extends_from implements_list '{' class_statement_list '}'
|
||||||
{ $$ = Stmt\Class_[$3, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]];
|
{ $$ = Stmt\Class_[$3, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]];
|
||||||
$this->checkClass($$, #3); }
|
$this->checkClass($$, #3); }
|
||||||
| optional_attributes T_INTERFACE identifier_not_reserved interface_extends_list '{' class_statement_list '}'
|
| optional_attributes T_INTERFACE identifier_not_reserved interface_extends_list '{' class_statement_list '}'
|
||||||
@ -510,7 +521,8 @@ new_elseif_list:
|
|||||||
;
|
;
|
||||||
|
|
||||||
new_elseif:
|
new_elseif:
|
||||||
T_ELSEIF '(' expr ')' ':' inner_statement_list { $$ = Stmt\ElseIf_[$3, $6]; }
|
T_ELSEIF '(' expr ')' ':' inner_statement_list
|
||||||
|
{ $$ = Stmt\ElseIf_[$3, $6]; $this->fixupAlternativeElse($$); }
|
||||||
;
|
;
|
||||||
|
|
||||||
else_single:
|
else_single:
|
||||||
@ -520,7 +532,8 @@ else_single:
|
|||||||
|
|
||||||
new_else_single:
|
new_else_single:
|
||||||
/* empty */ { $$ = null; }
|
/* empty */ { $$ = null; }
|
||||||
| T_ELSE ':' inner_statement_list { $$ = Stmt\Else_[$3]; }
|
| T_ELSE ':' inner_statement_list
|
||||||
|
{ $$ = Stmt\Else_[$3]; $this->fixupAlternativeElse($$); }
|
||||||
;
|
;
|
||||||
|
|
||||||
foreach_variable:
|
foreach_variable:
|
||||||
@ -571,7 +584,7 @@ type_expr:
|
|||||||
type { $$ = $1; }
|
type { $$ = $1; }
|
||||||
| '?' type { $$ = Node\NullableType[$2]; }
|
| '?' type { $$ = Node\NullableType[$2]; }
|
||||||
| union_type { $$ = Node\UnionType[$1]; }
|
| union_type { $$ = Node\UnionType[$1]; }
|
||||||
| intersection_type { $$ = Node\IntersectionType[$1]; }
|
| intersection_type { $$ = $1; }
|
||||||
;
|
;
|
||||||
|
|
||||||
type:
|
type:
|
||||||
@ -585,34 +598,52 @@ type_without_static:
|
|||||||
| T_CALLABLE { $$ = Node\Identifier['callable']; }
|
| T_CALLABLE { $$ = Node\Identifier['callable']; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
union_type_element:
|
||||||
|
type { $$ = $1; }
|
||||||
|
| '(' intersection_type ')' { $$ = $2; }
|
||||||
|
;
|
||||||
|
|
||||||
union_type:
|
union_type:
|
||||||
type '|' type { init($1, $3); }
|
union_type_element '|' union_type_element { init($1, $3); }
|
||||||
| union_type '|' type { push($1, $3); }
|
| union_type '|' union_type_element { push($1, $3); }
|
||||||
|
;
|
||||||
|
|
||||||
|
union_type_without_static_element:
|
||||||
|
type_without_static { $$ = $1; }
|
||||||
|
| '(' intersection_type_without_static ')' { $$ = $2; }
|
||||||
;
|
;
|
||||||
|
|
||||||
union_type_without_static:
|
union_type_without_static:
|
||||||
type_without_static '|' type_without_static { init($1, $3); }
|
union_type_without_static_element '|' union_type_without_static_element { init($1, $3); }
|
||||||
| union_type_without_static '|' type_without_static { push($1, $3); }
|
| union_type_without_static '|' union_type_without_static_element { push($1, $3); }
|
||||||
|
;
|
||||||
|
|
||||||
|
intersection_type_list:
|
||||||
|
type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type { init($1, $3); }
|
||||||
|
| intersection_type_list T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type
|
||||||
|
{ push($1, $3); }
|
||||||
;
|
;
|
||||||
|
|
||||||
intersection_type:
|
intersection_type:
|
||||||
type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type { init($1, $3); }
|
intersection_type_list { $$ = Node\IntersectionType[$1]; }
|
||||||
| intersection_type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type
|
;
|
||||||
|
|
||||||
|
intersection_type_without_static_list:
|
||||||
|
type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
|
||||||
|
{ init($1, $3); }
|
||||||
|
| intersection_type_without_static_list T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
|
||||||
{ push($1, $3); }
|
{ push($1, $3); }
|
||||||
;
|
;
|
||||||
|
|
||||||
intersection_type_without_static:
|
intersection_type_without_static:
|
||||||
type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
|
intersection_type_without_static_list { $$ = Node\IntersectionType[$1]; }
|
||||||
{ init($1, $3); }
|
|
||||||
| intersection_type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
|
|
||||||
{ push($1, $3); }
|
|
||||||
;
|
;
|
||||||
|
|
||||||
type_expr_without_static:
|
type_expr_without_static:
|
||||||
type_without_static { $$ = $1; }
|
type_without_static { $$ = $1; }
|
||||||
| '?' type_without_static { $$ = Node\NullableType[$2]; }
|
| '?' type_without_static { $$ = Node\NullableType[$2]; }
|
||||||
| union_type_without_static { $$ = Node\UnionType[$1]; }
|
| union_type_without_static { $$ = Node\UnionType[$1]; }
|
||||||
| intersection_type_without_static { $$ = Node\IntersectionType[$1]; }
|
| intersection_type_without_static { $$ = $1; }
|
||||||
;
|
;
|
||||||
|
|
||||||
optional_type_without_static:
|
optional_type_without_static:
|
||||||
@ -677,7 +708,7 @@ static_var:
|
|||||||
;
|
;
|
||||||
|
|
||||||
class_statement_list_ex:
|
class_statement_list_ex:
|
||||||
class_statement_list_ex class_statement { if ($2 !== null) { push($1, $2); } }
|
class_statement_list_ex class_statement { if ($2 !== null) { push($1, $2); } else { $$ = $1; } }
|
||||||
| /* empty */ { init(); }
|
| /* empty */ { init(); }
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -694,6 +725,9 @@ class_statement:
|
|||||||
| optional_attributes method_modifiers T_CONST class_const_list semi
|
| optional_attributes method_modifiers T_CONST class_const_list semi
|
||||||
{ $$ = new Stmt\ClassConst($4, $2, attributes(), $1);
|
{ $$ = new Stmt\ClassConst($4, $2, attributes(), $1);
|
||||||
$this->checkClassConst($$, #2); }
|
$this->checkClassConst($$, #2); }
|
||||||
|
| optional_attributes method_modifiers T_CONST type_expr class_const_list semi
|
||||||
|
{ $$ = new Stmt\ClassConst($5, $2, attributes(), $1, $4);
|
||||||
|
$this->checkClassConst($$, #2); }
|
||||||
| optional_attributes method_modifiers T_FUNCTION optional_ref identifier_maybe_reserved '(' parameter_list ')'
|
| optional_attributes method_modifiers T_FUNCTION optional_ref identifier_maybe_reserved '(' parameter_list ')'
|
||||||
optional_return_type method_body
|
optional_return_type method_body
|
||||||
{ $$ = Stmt\ClassMethod[$5, ['type' => $2, 'byRef' => $4, 'params' => $7, 'returnType' => $9, 'stmts' => $10, 'attrGroups' => $1]];
|
{ $$ = Stmt\ClassMethod[$5, ['type' => $2, 'byRef' => $4, 'params' => $7, 'returnType' => $9, 'stmts' => $10, 'attrGroups' => $1]];
|
||||||
@ -915,8 +949,8 @@ expr:
|
|||||||
;
|
;
|
||||||
|
|
||||||
anonymous_class:
|
anonymous_class:
|
||||||
optional_attributes T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
|
optional_attributes class_entry_type ctor_arguments extends_from implements_list '{' class_statement_list '}'
|
||||||
{ $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
|
{ $$ = array(Stmt\Class_[null, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
|
||||||
$this->checkClass($$[0], -1); }
|
$this->checkClass($$[0], -1); }
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -944,8 +978,13 @@ lexical_var:
|
|||||||
optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; }
|
optional_ref plain_variable { $$ = Expr\ClosureUse[$2, $1]; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
name_readonly:
|
||||||
|
T_READONLY { $$ = Name[$1]; }
|
||||||
|
;
|
||||||
|
|
||||||
function_call:
|
function_call:
|
||||||
name argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
name argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
||||||
|
| name_readonly argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
||||||
| callable_expr argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
| callable_expr argument_list { $$ = Expr\FuncCall[$1, $2]; }
|
||||||
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
|
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
|
||||||
{ $$ = Expr\StaticCall[$1, $3, $4]; }
|
{ $$ = Expr\StaticCall[$1, $3, $4]; }
|
||||||
@ -1007,6 +1046,8 @@ constant:
|
|||||||
class_constant:
|
class_constant:
|
||||||
class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_maybe_reserved
|
class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_maybe_reserved
|
||||||
{ $$ = Expr\ClassConstFetch[$1, $3]; }
|
{ $$ = Expr\ClassConstFetch[$1, $3]; }
|
||||||
|
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}'
|
||||||
|
{ $$ = Expr\ClassConstFetch[$1, $4]; }
|
||||||
/* We interpret an isolated FOO:: as an unfinished class constant fetch. It could also be
|
/* We interpret an isolated FOO:: as an unfinished class constant fetch. It could also be
|
||||||
an unfinished static property fetch or unfinished scoped call. */
|
an unfinished static property fetch or unfinished scoped call. */
|
||||||
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM error
|
| class_name_or_var T_PAAMAYIM_NEKUDOTAYIM error
|
||||||
@ -1161,7 +1202,7 @@ array_pair:
|
|||||||
| expr T_DOUBLE_ARROW expr { $$ = Expr\ArrayItem[$3, $1, false]; }
|
| expr T_DOUBLE_ARROW expr { $$ = Expr\ArrayItem[$3, $1, false]; }
|
||||||
| expr T_DOUBLE_ARROW ampersand variable { $$ = Expr\ArrayItem[$4, $1, true]; }
|
| expr T_DOUBLE_ARROW ampersand variable { $$ = Expr\ArrayItem[$4, $1, true]; }
|
||||||
| expr T_DOUBLE_ARROW list_expr { $$ = Expr\ArrayItem[$3, $1, false]; }
|
| expr T_DOUBLE_ARROW list_expr { $$ = Expr\ArrayItem[$3, $1, false]; }
|
||||||
| T_ELLIPSIS expr { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
|
| T_ELLIPSIS expr { $$ = new Expr\ArrayItem($2, null, false, attributes(), true); }
|
||||||
| /* empty */ { $$ = null; }
|
| /* empty */ { $$ = null; }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -19,12 +19,14 @@ class ClassConst implements PhpParser\Builder
|
|||||||
|
|
||||||
/** @var Node\AttributeGroup[] */
|
/** @var Node\AttributeGroup[] */
|
||||||
protected $attributeGroups = [];
|
protected $attributeGroups = [];
|
||||||
|
/** @var Identifier|Node\Name|Node\ComplexType */
|
||||||
|
protected $type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a class constant builder
|
* Creates a class constant builder
|
||||||
*
|
*
|
||||||
* @param string|Identifier $name Name
|
* @param string|Identifier $name Name
|
||||||
* @param Node\Expr|bool|null|int|float|string|array $value Value
|
* @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value
|
||||||
*/
|
*/
|
||||||
public function __construct($name, $value) {
|
public function __construct($name, $value) {
|
||||||
$this->constants = [new Const_($name, BuilderHelpers::normalizeValue($value))];
|
$this->constants = [new Const_($name, BuilderHelpers::normalizeValue($value))];
|
||||||
@ -34,7 +36,7 @@ class ClassConst implements PhpParser\Builder
|
|||||||
* Add another constant to const group
|
* Add another constant to const group
|
||||||
*
|
*
|
||||||
* @param string|Identifier $name Name
|
* @param string|Identifier $name Name
|
||||||
* @param Node\Expr|bool|null|int|float|string|array $value Value
|
* @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value
|
||||||
*
|
*
|
||||||
* @return $this The builder instance (for fluid interface)
|
* @return $this The builder instance (for fluid interface)
|
||||||
*/
|
*/
|
||||||
@ -116,6 +118,19 @@ class ClassConst implements PhpParser\Builder
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the constant type.
|
||||||
|
*
|
||||||
|
* @param string|Node\Name|Identifier|Node\ComplexType $type
|
||||||
|
*
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setType($type) {
|
||||||
|
$this->type = BuilderHelpers::normalizeType($type);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the built class node.
|
* Returns the built class node.
|
||||||
*
|
*
|
||||||
@ -126,7 +141,8 @@ class ClassConst implements PhpParser\Builder
|
|||||||
$this->constants,
|
$this->constants,
|
||||||
$this->flags,
|
$this->flags,
|
||||||
$this->attributes,
|
$this->attributes,
|
||||||
$this->attributeGroups
|
$this->attributeGroups,
|
||||||
|
$this->type
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,8 +78,8 @@ class EnumCase implements PhpParser\Builder
|
|||||||
return new Stmt\EnumCase(
|
return new Stmt\EnumCase(
|
||||||
$this->name,
|
$this->name,
|
||||||
$this->value,
|
$this->value,
|
||||||
$this->attributes,
|
$this->attributeGroups,
|
||||||
$this->attributeGroups
|
$this->attributes
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,8 @@ class Param implements PhpParser\Builder
|
|||||||
|
|
||||||
protected $variadic = false;
|
protected $variadic = false;
|
||||||
|
|
||||||
|
protected $flags = 0;
|
||||||
|
|
||||||
/** @var Node\AttributeGroup[] */
|
/** @var Node\AttributeGroup[] */
|
||||||
protected $attributeGroups = [];
|
protected $attributeGroups = [];
|
||||||
|
|
||||||
@ -95,6 +97,50 @@ class Param implements PhpParser\Builder
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes the (promoted) parameter public.
|
||||||
|
*
|
||||||
|
* @return $this The builder instance (for fluid interface)
|
||||||
|
*/
|
||||||
|
public function makePublic() {
|
||||||
|
$this->flags = BuilderHelpers::addModifier($this->flags, Node\Stmt\Class_::MODIFIER_PUBLIC);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes the (promoted) parameter protected.
|
||||||
|
*
|
||||||
|
* @return $this The builder instance (for fluid interface)
|
||||||
|
*/
|
||||||
|
public function makeProtected() {
|
||||||
|
$this->flags = BuilderHelpers::addModifier($this->flags, Node\Stmt\Class_::MODIFIER_PROTECTED);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes the (promoted) parameter private.
|
||||||
|
*
|
||||||
|
* @return $this The builder instance (for fluid interface)
|
||||||
|
*/
|
||||||
|
public function makePrivate() {
|
||||||
|
$this->flags = BuilderHelpers::addModifier($this->flags, Node\Stmt\Class_::MODIFIER_PRIVATE);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes the (promoted) parameter readonly.
|
||||||
|
*
|
||||||
|
* @return $this The builder instance (for fluid interface)
|
||||||
|
*/
|
||||||
|
public function makeReadonly() {
|
||||||
|
$this->flags = BuilderHelpers::addModifier($this->flags, Node\Stmt\Class_::MODIFIER_READONLY);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds an attribute group.
|
* Adds an attribute group.
|
||||||
*
|
*
|
||||||
@ -116,7 +162,7 @@ class Param implements PhpParser\Builder
|
|||||||
public function getNode() : Node {
|
public function getNode() : Node {
|
||||||
return new Node\Param(
|
return new Node\Param(
|
||||||
new Node\Expr\Variable($this->name),
|
new Node\Expr\Variable($this->name),
|
||||||
$this->default, $this->type, $this->byRef, $this->variadic, [], 0, $this->attributeGroups
|
$this->default, $this->type, $this->byRef, $this->variadic, [], $this->flags, $this->attributeGroups
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -213,7 +213,7 @@ class BuilderFactory
|
|||||||
/**
|
/**
|
||||||
* Creates node a for a literal value.
|
* Creates node a for a literal value.
|
||||||
*
|
*
|
||||||
* @param Expr|bool|null|int|float|string|array $value $value
|
* @param Expr|bool|null|int|float|string|array|\UnitEnum $value $value
|
||||||
*
|
*
|
||||||
* @return Expr
|
* @return Expr
|
||||||
*/
|
*/
|
||||||
@ -349,15 +349,15 @@ class BuilderFactory
|
|||||||
/**
|
/**
|
||||||
* Creates a class constant fetch node.
|
* Creates a class constant fetch node.
|
||||||
*
|
*
|
||||||
* @param string|Name|Expr $class Class name
|
* @param string|Name|Expr $class Class name
|
||||||
* @param string|Identifier $name Constant name
|
* @param string|Identifier|Expr $name Constant name
|
||||||
*
|
*
|
||||||
* @return Expr\ClassConstFetch
|
* @return Expr\ClassConstFetch
|
||||||
*/
|
*/
|
||||||
public function classConstFetch($class, $name): Expr\ClassConstFetch {
|
public function classConstFetch($class, $name): Expr\ClassConstFetch {
|
||||||
return new Expr\ClassConstFetch(
|
return new Expr\ClassConstFetch(
|
||||||
BuilderHelpers::normalizeNameOrExpr($class),
|
BuilderHelpers::normalizeNameOrExpr($class),
|
||||||
BuilderHelpers::normalizeIdentifier($name)
|
BuilderHelpers::normalizeIdentifierOrExpr($name)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ use PhpParser\Node\ComplexType;
|
|||||||
use PhpParser\Node\Expr;
|
use PhpParser\Node\Expr;
|
||||||
use PhpParser\Node\Identifier;
|
use PhpParser\Node\Identifier;
|
||||||
use PhpParser\Node\Name;
|
use PhpParser\Node\Name;
|
||||||
|
use PhpParser\Node\Name\FullyQualified;
|
||||||
use PhpParser\Node\NullableType;
|
use PhpParser\Node\NullableType;
|
||||||
use PhpParser\Node\Scalar;
|
use PhpParser\Node\Scalar;
|
||||||
use PhpParser\Node\Stmt;
|
use PhpParser\Node\Stmt;
|
||||||
@ -178,7 +179,20 @@ final class BuilderHelpers
|
|||||||
}
|
}
|
||||||
|
|
||||||
$builtinTypes = [
|
$builtinTypes = [
|
||||||
'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object', 'mixed', 'never',
|
'array',
|
||||||
|
'callable',
|
||||||
|
'bool',
|
||||||
|
'int',
|
||||||
|
'float',
|
||||||
|
'string',
|
||||||
|
'iterable',
|
||||||
|
'void',
|
||||||
|
'object',
|
||||||
|
'null',
|
||||||
|
'false',
|
||||||
|
'mixed',
|
||||||
|
'never',
|
||||||
|
'true',
|
||||||
];
|
];
|
||||||
|
|
||||||
$lowerType = strtolower($type);
|
$lowerType = strtolower($type);
|
||||||
@ -202,7 +216,7 @@ final class BuilderHelpers
|
|||||||
* Normalizes a value: Converts nulls, booleans, integers,
|
* Normalizes a value: Converts nulls, booleans, integers,
|
||||||
* floats, strings and arrays into their respective nodes
|
* floats, strings and arrays into their respective nodes
|
||||||
*
|
*
|
||||||
* @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
|
* @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value The value to normalize
|
||||||
*
|
*
|
||||||
* @return Expr The normalized value
|
* @return Expr The normalized value
|
||||||
*/
|
*/
|
||||||
@ -256,6 +270,10 @@ final class BuilderHelpers
|
|||||||
return new Expr\Array_($items);
|
return new Expr\Array_($items);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($value instanceof \UnitEnum) {
|
||||||
|
return new Expr\ClassConstFetch(new FullyQualified(\get_class($value)), new Identifier($value->name));
|
||||||
|
}
|
||||||
|
|
||||||
throw new \LogicException('Invalid value');
|
throw new \LogicException('Invalid value');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ class ConstExprEvaluator
|
|||||||
*
|
*
|
||||||
* @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
|
* @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
|
||||||
*/
|
*/
|
||||||
public function __construct(callable $fallbackEvaluator = null) {
|
public function __construct(?callable $fallbackEvaluator = null) {
|
||||||
$this->fallbackEvaluator = $fallbackEvaluator ?? function(Expr $expr) {
|
$this->fallbackEvaluator = $fallbackEvaluator ?? function(Expr $expr) {
|
||||||
throw new ConstExprEvaluationException(
|
throw new ConstExprEvaluationException(
|
||||||
"Expression of type {$expr->getType()} cannot be evaluated"
|
"Expression of type {$expr->getType()} cannot be evaluated"
|
||||||
|
@ -19,6 +19,8 @@ class PrintableNewAnonClassNode extends Expr
|
|||||||
{
|
{
|
||||||
/** @var Node\AttributeGroup[] PHP attribute groups */
|
/** @var Node\AttributeGroup[] PHP attribute groups */
|
||||||
public $attrGroups;
|
public $attrGroups;
|
||||||
|
/** @var int Modifiers */
|
||||||
|
public $flags;
|
||||||
/** @var Node\Arg[] Arguments */
|
/** @var Node\Arg[] Arguments */
|
||||||
public $args;
|
public $args;
|
||||||
/** @var null|Node\Name Name of extended class */
|
/** @var null|Node\Name Name of extended class */
|
||||||
@ -29,11 +31,12 @@ class PrintableNewAnonClassNode extends Expr
|
|||||||
public $stmts;
|
public $stmts;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
array $attrGroups, array $args, Node\Name $extends = null, array $implements,
|
array $attrGroups, int $flags, array $args, ?Node\Name $extends, array $implements,
|
||||||
array $stmts, array $attributes
|
array $stmts, array $attributes
|
||||||
) {
|
) {
|
||||||
parent::__construct($attributes);
|
parent::__construct($attributes);
|
||||||
$this->attrGroups = $attrGroups;
|
$this->attrGroups = $attrGroups;
|
||||||
|
$this->flags = $flags;
|
||||||
$this->args = $args;
|
$this->args = $args;
|
||||||
$this->extends = $extends;
|
$this->extends = $extends;
|
||||||
$this->implements = $implements;
|
$this->implements = $implements;
|
||||||
@ -46,7 +49,7 @@ class PrintableNewAnonClassNode extends Expr
|
|||||||
// We don't assert that $class->name is null here, to allow consumers to assign unique names
|
// We don't assert that $class->name is null here, to allow consumers to assign unique names
|
||||||
// to anonymous classes for their own purposes. We simplify ignore the name here.
|
// to anonymous classes for their own purposes. We simplify ignore the name here.
|
||||||
return new self(
|
return new self(
|
||||||
$class->attrGroups, $newNode->args, $class->extends, $class->implements,
|
$class->attrGroups, $class->flags, $newNode->args, $class->extends, $class->implements,
|
||||||
$class->stmts, $newNode->getAttributes()
|
$class->stmts, $newNode->getAttributes()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -56,6 +59,6 @@ class PrintableNewAnonClassNode extends Expr
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getSubNodeNames() : array {
|
public function getSubNodeNames() : array {
|
||||||
return ['attrGroups', 'args', 'extends', 'implements', 'stmts'];
|
return ['attrGroups', 'flags', 'args', 'extends', 'implements', 'stmts'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -206,6 +206,11 @@ class TokenStream
|
|||||||
|| $this->haveTokenInRange($startPos, $endPos, '}');
|
|| $this->haveTokenInRange($startPos, $endPos, '}');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function haveTagInRange(int $startPos, int $endPos): bool {
|
||||||
|
return $this->haveTokenInRange($startPos, $endPos, \T_OPEN_TAG)
|
||||||
|
|| $this->haveTokenInRange($startPos, $endPos, \T_CLOSE_TAG);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get indentation before token position.
|
* Get indentation before token position.
|
||||||
*
|
*
|
||||||
|
@ -69,7 +69,7 @@ class Lexer
|
|||||||
* @param ErrorHandler|null $errorHandler Error handler to use for lexing errors. Defaults to
|
* @param ErrorHandler|null $errorHandler Error handler to use for lexing errors. Defaults to
|
||||||
* ErrorHandler\Throwing
|
* ErrorHandler\Throwing
|
||||||
*/
|
*/
|
||||||
public function startLexing(string $code, ErrorHandler $errorHandler = null) {
|
public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
|
||||||
if (null === $errorHandler) {
|
if (null === $errorHandler) {
|
||||||
$errorHandler = new ErrorHandler\Throwing();
|
$errorHandler = new ErrorHandler\Throwing();
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ use PhpParser\Lexer\TokenEmulator\FnTokenEmulator;
|
|||||||
use PhpParser\Lexer\TokenEmulator\MatchTokenEmulator;
|
use PhpParser\Lexer\TokenEmulator\MatchTokenEmulator;
|
||||||
use PhpParser\Lexer\TokenEmulator\NullsafeTokenEmulator;
|
use PhpParser\Lexer\TokenEmulator\NullsafeTokenEmulator;
|
||||||
use PhpParser\Lexer\TokenEmulator\NumericLiteralSeparatorEmulator;
|
use PhpParser\Lexer\TokenEmulator\NumericLiteralSeparatorEmulator;
|
||||||
|
use PhpParser\Lexer\TokenEmulator\ReadonlyFunctionTokenEmulator;
|
||||||
use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator;
|
use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator;
|
||||||
use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
|
use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
|
||||||
use PhpParser\Lexer\TokenEmulator\TokenEmulator;
|
use PhpParser\Lexer\TokenEmulator\TokenEmulator;
|
||||||
@ -24,6 +25,7 @@ class Emulative extends Lexer
|
|||||||
const PHP_7_4 = '7.4dev';
|
const PHP_7_4 = '7.4dev';
|
||||||
const PHP_8_0 = '8.0dev';
|
const PHP_8_0 = '8.0dev';
|
||||||
const PHP_8_1 = '8.1dev';
|
const PHP_8_1 = '8.1dev';
|
||||||
|
const PHP_8_2 = '8.2dev';
|
||||||
|
|
||||||
/** @var mixed[] Patches used to reverse changes introduced in the code */
|
/** @var mixed[] Patches used to reverse changes introduced in the code */
|
||||||
private $patches = [];
|
private $patches = [];
|
||||||
@ -41,7 +43,7 @@ class Emulative extends Lexer
|
|||||||
*/
|
*/
|
||||||
public function __construct(array $options = [])
|
public function __construct(array $options = [])
|
||||||
{
|
{
|
||||||
$this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_1;
|
$this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_2;
|
||||||
unset($options['phpVersion']);
|
unset($options['phpVersion']);
|
||||||
|
|
||||||
parent::__construct($options);
|
parent::__construct($options);
|
||||||
@ -57,6 +59,7 @@ class Emulative extends Lexer
|
|||||||
new EnumTokenEmulator(),
|
new EnumTokenEmulator(),
|
||||||
new ReadonlyTokenEmulator(),
|
new ReadonlyTokenEmulator(),
|
||||||
new ExplicitOctalEmulator(),
|
new ExplicitOctalEmulator(),
|
||||||
|
new ReadonlyFunctionTokenEmulator(),
|
||||||
];
|
];
|
||||||
|
|
||||||
// Collect emulators that are relevant for the PHP version we're running
|
// Collect emulators that are relevant for the PHP version we're running
|
||||||
@ -71,7 +74,7 @@ class Emulative extends Lexer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function startLexing(string $code, ErrorHandler $errorHandler = null) {
|
public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
|
||||||
$emulators = array_filter($this->emulators, function($emulator) use($code) {
|
$emulators = array_filter($this->emulators, function($emulator) use($code) {
|
||||||
return $emulator->isEmulationNeeded($code);
|
return $emulator->isEmulationNeeded($code);
|
||||||
});
|
});
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace PhpParser\Lexer\TokenEmulator;
|
||||||
|
|
||||||
|
use PhpParser\Lexer\Emulative;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* In PHP 8.1, "readonly(" was special cased in the lexer in order to support functions with
|
||||||
|
* name readonly. In PHP 8.2, this may conflict with readonly properties having a DNF type. For
|
||||||
|
* this reason, PHP 8.2 instead treats this as T_READONLY and then handles it specially in the
|
||||||
|
* parser. This emulator only exists to handle this special case, which is skipped by the
|
||||||
|
* PHP 8.1 ReadonlyTokenEmulator.
|
||||||
|
*/
|
||||||
|
class ReadonlyFunctionTokenEmulator extends KeywordEmulator {
|
||||||
|
public function getKeywordString(): string {
|
||||||
|
return 'readonly';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getKeywordToken(): int {
|
||||||
|
return \T_READONLY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPhpVersion(): string {
|
||||||
|
return Emulative::PHP_8_2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reverseEmulate(string $code, array $tokens): array {
|
||||||
|
// Don't bother
|
||||||
|
return $tokens;
|
||||||
|
}
|
||||||
|
}
|
@ -36,7 +36,7 @@ class NameContext
|
|||||||
*
|
*
|
||||||
* @param Name|null $namespace Null is the global namespace
|
* @param Name|null $namespace Null is the global namespace
|
||||||
*/
|
*/
|
||||||
public function startNamespace(Name $namespace = null) {
|
public function startNamespace(?Name $namespace = null) {
|
||||||
$this->namespace = $namespace;
|
$this->namespace = $namespace;
|
||||||
$this->origAliases = $this->aliases = [
|
$this->origAliases = $this->aliases = [
|
||||||
Stmt\Use_::TYPE_NORMAL => [],
|
Stmt\Use_::TYPE_NORMAL => [],
|
||||||
|
@ -27,7 +27,7 @@ class Arg extends NodeAbstract
|
|||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
Expr $value, bool $byRef = false, bool $unpack = false, array $attributes = [],
|
Expr $value, bool $byRef = false, bool $unpack = false, array $attributes = [],
|
||||||
Identifier $name = null
|
?Identifier $name = null
|
||||||
) {
|
) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->name = $name;
|
$this->name = $name;
|
||||||
|
@ -18,7 +18,7 @@ class ArrayDimFetch extends Expr
|
|||||||
* @param null|Expr $dim Array index / dim
|
* @param null|Expr $dim Array index / dim
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Expr $var, Expr $dim = null, array $attributes = []) {
|
public function __construct(Expr $var, ?Expr $dim = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->var = $var;
|
$this->var = $var;
|
||||||
$this->dim = $dim;
|
$this->dim = $dim;
|
||||||
|
@ -23,7 +23,7 @@ class ArrayItem extends Expr
|
|||||||
* @param bool $byRef Whether to assign by reference
|
* @param bool $byRef Whether to assign by reference
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Expr $value, Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
|
public function __construct(Expr $value, ?Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->key = $key;
|
$this->key = $key;
|
||||||
$this->value = $value;
|
$this->value = $value;
|
||||||
|
@ -10,15 +10,15 @@ class ClassConstFetch extends Expr
|
|||||||
{
|
{
|
||||||
/** @var Name|Expr Class name */
|
/** @var Name|Expr Class name */
|
||||||
public $class;
|
public $class;
|
||||||
/** @var Identifier|Error Constant name */
|
/** @var Identifier|Expr|Error Constant name */
|
||||||
public $name;
|
public $name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a class const fetch node.
|
* Constructs a class const fetch node.
|
||||||
*
|
*
|
||||||
* @param Name|Expr $class Class name
|
* @param Name|Expr $class Class name
|
||||||
* @param string|Identifier|Error $name Constant name
|
* @param string|Identifier|Expr|Error $name Constant name
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct($class, $name, array $attributes = []) {
|
public function __construct($class, $name, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
@ -29,7 +29,7 @@ class ClassConstFetch extends Expr
|
|||||||
public function getSubNodeNames() : array {
|
public function getSubNodeNames() : array {
|
||||||
return ['class', 'name'];
|
return ['class', 'name'];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getType() : string {
|
public function getType() : string {
|
||||||
return 'Expr_ClassConstFetch';
|
return 'Expr_ClassConstFetch';
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ class Exit_ extends Expr
|
|||||||
* @param null|Expr $expr Expression
|
* @param null|Expr $expr Expression
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Expr $expr = null, array $attributes = []) {
|
public function __construct(?Expr $expr = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->expr = $expr;
|
$this->expr = $expr;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ class Yield_ extends Expr
|
|||||||
* @param null|Expr $key Key expression
|
* @param null|Expr $key Key expression
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Expr $value = null, Expr $key = null, array $attributes = []) {
|
public function __construct(?Expr $value = null, ?Expr $key = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->key = $key;
|
$this->key = $key;
|
||||||
$this->value = $value;
|
$this->value = $value;
|
||||||
|
@ -6,7 +6,10 @@ use PhpParser\NodeAbstract;
|
|||||||
|
|
||||||
class Name extends NodeAbstract
|
class Name extends NodeAbstract
|
||||||
{
|
{
|
||||||
/** @var string[] Parts of the name */
|
/**
|
||||||
|
* @var string[] Parts of the name
|
||||||
|
* @deprecated Use getParts() instead
|
||||||
|
*/
|
||||||
public $parts;
|
public $parts;
|
||||||
|
|
||||||
private static $specialClassNames = [
|
private static $specialClassNames = [
|
||||||
@ -30,6 +33,15 @@ class Name extends NodeAbstract
|
|||||||
return ['parts'];
|
return ['parts'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get parts of name (split by the namespace separator).
|
||||||
|
*
|
||||||
|
* @return string[] Parts of name
|
||||||
|
*/
|
||||||
|
public function getParts(): array {
|
||||||
|
return $this->parts;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the first part of the name, i.e. everything before the first namespace separator.
|
* Gets the first part of the name, i.e. everything before the first namespace separator.
|
||||||
*
|
*
|
||||||
@ -150,7 +162,7 @@ class Name extends NodeAbstract
|
|||||||
*
|
*
|
||||||
* @return static|null Sliced name
|
* @return static|null Sliced name
|
||||||
*/
|
*/
|
||||||
public function slice(int $offset, int $length = null) {
|
public function slice(int $offset, ?int $length = null) {
|
||||||
$numParts = count($this->parts);
|
$numParts = count($this->parts);
|
||||||
|
|
||||||
$realOffset = $offset < 0 ? $offset + $numParts : $offset;
|
$realOffset = $offset < 0 ? $offset + $numParts : $offset;
|
||||||
@ -162,7 +174,7 @@ class Name extends NodeAbstract
|
|||||||
$realLength = $numParts - $realOffset;
|
$realLength = $numParts - $realOffset;
|
||||||
} else {
|
} else {
|
||||||
$realLength = $length < 0 ? $length + $numParts - $realOffset : $length;
|
$realLength = $length < 0 ? $length + $numParts - $realOffset : $length;
|
||||||
if ($realLength < 0 || $realLength > $numParts) {
|
if ($realLength < 0 || $realLength > $numParts - $realOffset) {
|
||||||
throw new \OutOfBoundsException(sprintf('Length %d is out of bounds', $length));
|
throw new \OutOfBoundsException(sprintf('Length %d is out of bounds', $length));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ class Param extends NodeAbstract
|
|||||||
* @param AttributeGroup[] $attrGroups PHP attribute groups
|
* @param AttributeGroup[] $attrGroups PHP attribute groups
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
$var, Expr $default = null, $type = null,
|
$var, ?Expr $default = null, $type = null,
|
||||||
bool $byRef = false, bool $variadic = false,
|
bool $byRef = false, bool $variadic = false,
|
||||||
array $attributes = [],
|
array $attributes = [],
|
||||||
int $flags = 0,
|
int $flags = 0,
|
||||||
|
@ -47,13 +47,7 @@ class DNumber extends Scalar
|
|||||||
public static function parse(string $str) : float {
|
public static function parse(string $str) : float {
|
||||||
$str = str_replace('_', '', $str);
|
$str = str_replace('_', '', $str);
|
||||||
|
|
||||||
// if string contains any of .eE just cast it to float
|
// Check whether this is one of the special integer notations.
|
||||||
if (false !== strpbrk($str, '.eE')) {
|
|
||||||
return (float) $str;
|
|
||||||
}
|
|
||||||
|
|
||||||
// otherwise it's an integer notation that overflowed into a float
|
|
||||||
// if it starts with 0 it's one of the special integer notations
|
|
||||||
if ('0' === $str[0]) {
|
if ('0' === $str[0]) {
|
||||||
// hex
|
// hex
|
||||||
if ('x' === $str[1] || 'X' === $str[1]) {
|
if ('x' === $str[1] || 'X' === $str[1]) {
|
||||||
@ -65,10 +59,12 @@ class DNumber extends Scalar
|
|||||||
return bindec($str);
|
return bindec($str);
|
||||||
}
|
}
|
||||||
|
|
||||||
// oct
|
// oct, but only if the string does not contain any of '.eE'.
|
||||||
// substr($str, 0, strcspn($str, '89')) cuts the string at the first invalid digit (8 or 9)
|
if (false === strpbrk($str, '.eE')) {
|
||||||
// so that only the digits before that are used
|
// substr($str, 0, strcspn($str, '89')) cuts the string at the first invalid digit
|
||||||
return octdec(substr($str, 0, strcspn($str, '89')));
|
// (8 or 9) so that only the digits before that are used.
|
||||||
|
return octdec(substr($str, 0, strcspn($str, '89')));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// dec
|
// dec
|
||||||
|
@ -15,7 +15,7 @@ class Break_ extends Node\Stmt
|
|||||||
* @param null|Node\Expr $num Number of loops to break
|
* @param null|Node\Expr $num Number of loops to break
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Node\Expr $num = null, array $attributes = []) {
|
public function __construct(?Node\Expr $num = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->num = $num;
|
$this->num = $num;
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ class Catch_ extends Node\Stmt
|
|||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
array $types, Expr\Variable $var = null, array $stmts = [], array $attributes = []
|
array $types, ?Expr\Variable $var = null, array $stmts = [], array $attributes = []
|
||||||
) {
|
) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->types = $types;
|
$this->types = $types;
|
||||||
|
@ -10,31 +10,36 @@ class ClassConst extends Node\Stmt
|
|||||||
public $flags;
|
public $flags;
|
||||||
/** @var Node\Const_[] Constant declarations */
|
/** @var Node\Const_[] Constant declarations */
|
||||||
public $consts;
|
public $consts;
|
||||||
/** @var Node\AttributeGroup[] */
|
/** @var Node\AttributeGroup[] PHP attribute groups */
|
||||||
public $attrGroups;
|
public $attrGroups;
|
||||||
|
/** @var Node\Identifier|Node\Name|Node\ComplexType|null Type declaration */
|
||||||
|
public $type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a class const list node.
|
* Constructs a class const list node.
|
||||||
*
|
*
|
||||||
* @param Node\Const_[] $consts Constant declarations
|
* @param Node\Const_[] $consts Constant declarations
|
||||||
* @param int $flags Modifiers
|
* @param int $flags Modifiers
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
* @param Node\AttributeGroup[] $attrGroups PHP attribute groups
|
* @param Node\AttributeGroup[] $attrGroups PHP attribute groups
|
||||||
|
* @param null|string|Node\Identifier|Node\Name|Node\ComplexType $type Type declaration
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
array $consts,
|
array $consts,
|
||||||
int $flags = 0,
|
int $flags = 0,
|
||||||
array $attributes = [],
|
array $attributes = [],
|
||||||
array $attrGroups = []
|
array $attrGroups = [],
|
||||||
|
$type = null
|
||||||
) {
|
) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->flags = $flags;
|
$this->flags = $flags;
|
||||||
$this->consts = $consts;
|
$this->consts = $consts;
|
||||||
$this->attrGroups = $attrGroups;
|
$this->attrGroups = $attrGroups;
|
||||||
|
$this->type = \is_string($type) ? new Node\Identifier($type) : $type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getSubNodeNames() : array {
|
public function getSubNodeNames() : array {
|
||||||
return ['attrGroups', 'flags', 'consts'];
|
return ['attrGroups', 'flags', 'type', 'consts'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,21 +23,23 @@ class ClassMethod extends Node\Stmt implements FunctionLike
|
|||||||
public $attrGroups;
|
public $attrGroups;
|
||||||
|
|
||||||
private static $magicNames = [
|
private static $magicNames = [
|
||||||
'__construct' => true,
|
'__construct' => true,
|
||||||
'__destruct' => true,
|
'__destruct' => true,
|
||||||
'__call' => true,
|
'__call' => true,
|
||||||
'__callstatic' => true,
|
'__callstatic' => true,
|
||||||
'__get' => true,
|
'__get' => true,
|
||||||
'__set' => true,
|
'__set' => true,
|
||||||
'__isset' => true,
|
'__isset' => true,
|
||||||
'__unset' => true,
|
'__unset' => true,
|
||||||
'__sleep' => true,
|
'__sleep' => true,
|
||||||
'__wakeup' => true,
|
'__wakeup' => true,
|
||||||
'__tostring' => true,
|
'__tostring' => true,
|
||||||
'__set_state' => true,
|
'__set_state' => true,
|
||||||
'__clone' => true,
|
'__clone' => true,
|
||||||
'__invoke' => true,
|
'__invoke' => true,
|
||||||
'__debuginfo' => true,
|
'__debuginfo' => true,
|
||||||
|
'__serialize' => true,
|
||||||
|
'__unserialize' => true,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@ class Continue_ extends Node\Stmt
|
|||||||
* @param null|Node\Expr $num Number of loops to continue
|
* @param null|Node\Expr $num Number of loops to continue
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Node\Expr $num = null, array $attributes = []) {
|
public function __construct(?Node\Expr $num = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->num = $num;
|
$this->num = $num;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ class Declare_ extends Node\Stmt
|
|||||||
* @param Node\Stmt[]|null $stmts Statements
|
* @param Node\Stmt[]|null $stmts Statements
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(array $declares, array $stmts = null, array $attributes = []) {
|
public function __construct(array $declares, ?array $stmts = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->declares = $declares;
|
$this->declares = $declares;
|
||||||
$this->stmts = $stmts;
|
$this->stmts = $stmts;
|
||||||
|
@ -20,7 +20,7 @@ class EnumCase extends Node\Stmt
|
|||||||
* @param AttributeGroup[] $attrGroups PHP attribute groups
|
* @param AttributeGroup[] $attrGroups PHP attribute groups
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct($name, Node\Expr $expr = null, array $attrGroups = [], array $attributes = []) {
|
public function __construct($name, ?Node\Expr $expr = null, array $attrGroups = [], array $attributes = []) {
|
||||||
parent::__construct($attributes);
|
parent::__construct($attributes);
|
||||||
$this->name = \is_string($name) ? new Node\Identifier($name) : $name;
|
$this->name = \is_string($name) ? new Node\Identifier($name) : $name;
|
||||||
$this->expr = $expr;
|
$this->expr = $expr;
|
||||||
|
@ -22,7 +22,7 @@ class Namespace_ extends Node\Stmt
|
|||||||
* @param null|Node\Stmt[] $stmts Statements
|
* @param null|Node\Stmt[] $stmts Statements
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Node\Name $name = null, $stmts = [], array $attributes = []) {
|
public function __construct(?Node\Name $name = null, $stmts = [], array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->name = $name;
|
$this->name = $name;
|
||||||
$this->stmts = $stmts;
|
$this->stmts = $stmts;
|
||||||
|
@ -18,7 +18,7 @@ class PropertyProperty extends Node\Stmt
|
|||||||
* @param null|Node\Expr $default Default value
|
* @param null|Node\Expr $default Default value
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct($name, Node\Expr $default = null, array $attributes = []) {
|
public function __construct($name, ?Node\Expr $default = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->name = \is_string($name) ? new Node\VarLikeIdentifier($name) : $name;
|
$this->name = \is_string($name) ? new Node\VarLikeIdentifier($name) : $name;
|
||||||
$this->default = $default;
|
$this->default = $default;
|
||||||
|
@ -15,7 +15,7 @@ class Return_ extends Node\Stmt
|
|||||||
* @param null|Node\Expr $expr Expression
|
* @param null|Node\Expr $expr Expression
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(Node\Expr $expr = null, array $attributes = []) {
|
public function __construct(?Node\Expr $expr = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->expr = $expr;
|
$this->expr = $expr;
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ class StaticVar extends Node\Stmt
|
|||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
Expr\Variable $var, Node\Expr $default = null, array $attributes = []
|
Expr\Variable $var, ?Node\Expr $default = null, array $attributes = []
|
||||||
) {
|
) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->var = $var;
|
$this->var = $var;
|
||||||
|
@ -21,7 +21,7 @@ class TryCatch extends Node\Stmt
|
|||||||
* @param null|Finally_ $finally Optional finally node
|
* @param null|Finally_ $finally Optional finally node
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(array $stmts, array $catches, Finally_ $finally = null, array $attributes = []) {
|
public function __construct(array $stmts, array $catches, ?Finally_ $finally = null, array $attributes = []) {
|
||||||
$this->attributes = $attributes;
|
$this->attributes = $attributes;
|
||||||
$this->stmts = $stmts;
|
$this->stmts = $stmts;
|
||||||
$this->catches = $catches;
|
$this->catches = $catches;
|
||||||
|
@ -4,13 +4,13 @@ namespace PhpParser\Node;
|
|||||||
|
|
||||||
class UnionType extends ComplexType
|
class UnionType extends ComplexType
|
||||||
{
|
{
|
||||||
/** @var (Identifier|Name)[] Types */
|
/** @var (Identifier|Name|IntersectionType)[] Types */
|
||||||
public $types;
|
public $types;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a union type.
|
* Constructs a union type.
|
||||||
*
|
*
|
||||||
* @param (Identifier|Name)[] $types Types
|
* @param (Identifier|Name|IntersectionType)[] $types Types
|
||||||
* @param array $attributes Additional attributes
|
* @param array $attributes Additional attributes
|
||||||
*/
|
*/
|
||||||
public function __construct(array $types, array $attributes = []) {
|
public function __construct(array $types, array $attributes = []) {
|
||||||
|
@ -39,7 +39,7 @@ class NodeDumper
|
|||||||
*
|
*
|
||||||
* @return string Dumped value
|
* @return string Dumped value
|
||||||
*/
|
*/
|
||||||
public function dump($node, string $code = null) : string {
|
public function dump($node, ?string $code = null) : string {
|
||||||
$this->code = $code;
|
$this->code = $code;
|
||||||
return $this->dumpRecursive($node);
|
return $this->dumpRecursive($node);
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ class NameResolver extends NodeVisitorAbstract
|
|||||||
* @param ErrorHandler|null $errorHandler Error handler
|
* @param ErrorHandler|null $errorHandler Error handler
|
||||||
* @param array $options Options
|
* @param array $options Options
|
||||||
*/
|
*/
|
||||||
public function __construct(ErrorHandler $errorHandler = null, array $options = []) {
|
public function __construct(?ErrorHandler $errorHandler = null, array $options = []) {
|
||||||
$this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
|
$this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
|
||||||
$this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
|
$this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
|
||||||
$this->replaceNodes = $options['replaceNodes'] ?? true;
|
$this->replaceNodes = $options['replaceNodes'] ?? true;
|
||||||
@ -118,6 +118,9 @@ class NameResolver extends NodeVisitorAbstract
|
|||||||
$this->addNamespacedName($const);
|
$this->addNamespacedName($const);
|
||||||
}
|
}
|
||||||
} else if ($node instanceof Stmt\ClassConst) {
|
} else if ($node instanceof Stmt\ClassConst) {
|
||||||
|
if (null !== $node->type) {
|
||||||
|
$node->type = $this->resolveType($node->type);
|
||||||
|
}
|
||||||
$this->resolveAttrGroups($node);
|
$this->resolveAttrGroups($node);
|
||||||
} else if ($node instanceof Stmt\EnumCase) {
|
} else if ($node instanceof Stmt\EnumCase) {
|
||||||
$this->resolveAttrGroups($node);
|
$this->resolveAttrGroups($node);
|
||||||
@ -161,7 +164,7 @@ class NameResolver extends NodeVisitorAbstract
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) {
|
private function addAlias(Stmt\UseUse $use, int $type, ?Name $prefix = null) {
|
||||||
// Add prefix for group uses
|
// Add prefix for group uses
|
||||||
$name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
|
$name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
|
||||||
// Type is determined either by individual element or whole use declaration
|
// Type is determined either by individual element or whole use declaration
|
||||||
|
@ -14,5 +14,5 @@ interface Parser
|
|||||||
* @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
|
* @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
|
||||||
* the parser was unable to recover from an error).
|
* the parser was unable to recover from an error).
|
||||||
*/
|
*/
|
||||||
public function parse(string $code, ErrorHandler $errorHandler = null);
|
public function parse(string $code, ?ErrorHandler $errorHandler = null);
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ class Multiple implements Parser
|
|||||||
$this->parsers = $parsers;
|
$this->parsers = $parsers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function parse(string $code, ErrorHandler $errorHandler = null) {
|
public function parse(string $code, ?ErrorHandler $errorHandler = null) {
|
||||||
if (null === $errorHandler) {
|
if (null === $errorHandler) {
|
||||||
$errorHandler = new ErrorHandler\Throwing;
|
$errorHandler = new ErrorHandler\Throwing;
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -16,9 +16,12 @@ use PhpParser\Node\Scalar\String_;
|
|||||||
use PhpParser\Node\Stmt\Class_;
|
use PhpParser\Node\Stmt\Class_;
|
||||||
use PhpParser\Node\Stmt\ClassConst;
|
use PhpParser\Node\Stmt\ClassConst;
|
||||||
use PhpParser\Node\Stmt\ClassMethod;
|
use PhpParser\Node\Stmt\ClassMethod;
|
||||||
|
use PhpParser\Node\Stmt\Else_;
|
||||||
|
use PhpParser\Node\Stmt\ElseIf_;
|
||||||
use PhpParser\Node\Stmt\Enum_;
|
use PhpParser\Node\Stmt\Enum_;
|
||||||
use PhpParser\Node\Stmt\Interface_;
|
use PhpParser\Node\Stmt\Interface_;
|
||||||
use PhpParser\Node\Stmt\Namespace_;
|
use PhpParser\Node\Stmt\Namespace_;
|
||||||
|
use PhpParser\Node\Stmt\Nop;
|
||||||
use PhpParser\Node\Stmt\Property;
|
use PhpParser\Node\Stmt\Property;
|
||||||
use PhpParser\Node\Stmt\TryCatch;
|
use PhpParser\Node\Stmt\TryCatch;
|
||||||
use PhpParser\Node\Stmt\UseUse;
|
use PhpParser\Node\Stmt\UseUse;
|
||||||
@ -152,7 +155,7 @@ abstract class ParserAbstract implements Parser
|
|||||||
* @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
|
* @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
|
||||||
* the parser was unable to recover from an error).
|
* the parser was unable to recover from an error).
|
||||||
*/
|
*/
|
||||||
public function parse(string $code, ErrorHandler $errorHandler = null) {
|
public function parse(string $code, ?ErrorHandler $errorHandler = null) {
|
||||||
$this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing;
|
$this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing;
|
||||||
|
|
||||||
$this->lexer->startLexing($code, $this->errorHandler);
|
$this->lexer->startLexing($code, $this->errorHandler);
|
||||||
@ -664,6 +667,7 @@ abstract class ParserAbstract implements Parser
|
|||||||
'false' => true,
|
'false' => true,
|
||||||
'mixed' => true,
|
'mixed' => true,
|
||||||
'never' => true,
|
'never' => true,
|
||||||
|
'true' => true,
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!$name->isUnqualified()) {
|
if (!$name->isUnqualified()) {
|
||||||
@ -875,6 +879,24 @@ abstract class ParserAbstract implements Parser
|
|||||||
return $attributes;
|
return $attributes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @param ElseIf_|Else_ $node */
|
||||||
|
protected function fixupAlternativeElse($node) {
|
||||||
|
// Make sure a trailing nop statement carrying comments is part of the node.
|
||||||
|
$numStmts = \count($node->stmts);
|
||||||
|
if ($numStmts !== 0 && $node->stmts[$numStmts - 1] instanceof Nop) {
|
||||||
|
$nopAttrs = $node->stmts[$numStmts - 1]->getAttributes();
|
||||||
|
if (isset($nopAttrs['endLine'])) {
|
||||||
|
$node->setAttribute('endLine', $nopAttrs['endLine']);
|
||||||
|
}
|
||||||
|
if (isset($nopAttrs['endFilePos'])) {
|
||||||
|
$node->setAttribute('endFilePos', $nopAttrs['endFilePos']);
|
||||||
|
}
|
||||||
|
if (isset($nopAttrs['endTokenPos'])) {
|
||||||
|
$node->setAttribute('endTokenPos', $nopAttrs['endTokenPos']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected function checkClassModifier($a, $b, $modifierPos) {
|
protected function checkClassModifier($a, $b, $modifierPos) {
|
||||||
try {
|
try {
|
||||||
Class_::verifyClassModifier($a, $b);
|
Class_::verifyClassModifier($a, $b);
|
||||||
|
@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
namespace PhpParser;
|
namespace PhpParser;
|
||||||
|
|
||||||
|
use PhpParser\Lexer\Emulative;
|
||||||
|
use PhpParser\Parser\Php7;
|
||||||
|
|
||||||
class ParserFactory
|
class ParserFactory
|
||||||
{
|
{
|
||||||
const PREFER_PHP7 = 1;
|
const PREFER_PHP7 = 1;
|
||||||
@ -18,7 +21,7 @@ class ParserFactory
|
|||||||
*
|
*
|
||||||
* @return Parser The parser instance
|
* @return Parser The parser instance
|
||||||
*/
|
*/
|
||||||
public function create(int $kind, Lexer $lexer = null, array $parserOptions = []) : Parser {
|
public function create(int $kind, ?Lexer $lexer = null, array $parserOptions = []) : Parser {
|
||||||
if (null === $lexer) {
|
if (null === $lexer) {
|
||||||
$lexer = new Lexer\Emulative();
|
$lexer = new Lexer\Emulative();
|
||||||
}
|
}
|
||||||
@ -41,4 +44,33 @@ class ParserFactory
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a parser targeting the newest version supported by this library. Code for older
|
||||||
|
* versions will be accepted if there have been no relevant backwards-compatibility breaks in
|
||||||
|
* PHP.
|
||||||
|
*
|
||||||
|
* All supported lexer attributes (comments, startLine, endLine, startTokenPos, endTokenPos,
|
||||||
|
* startFilePos, endFilePos) will be enabled.
|
||||||
|
*/
|
||||||
|
public function createForNewestSupportedVersion(): Parser {
|
||||||
|
return new Php7(new Emulative($this->getLexerOptions()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a parser targeting the host PHP version, that is the PHP version we're currently
|
||||||
|
* running on. This parser will not use any token emulation.
|
||||||
|
*
|
||||||
|
* All supported lexer attributes (comments, startLine, endLine, startTokenPos, endTokenPos,
|
||||||
|
* startFilePos, endFilePos) will be enabled.
|
||||||
|
*/
|
||||||
|
public function createForHostVersion(): Parser {
|
||||||
|
return new Php7(new Lexer($this->getLexerOptions()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getLexerOptions(): array {
|
||||||
|
return ['usedAttributes' => [
|
||||||
|
'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos', 'startFilePos', 'endFilePos',
|
||||||
|
]];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,15 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function pUnionType(Node\UnionType $node) {
|
protected function pUnionType(Node\UnionType $node) {
|
||||||
return $this->pImplode($node->types, '|');
|
$types = [];
|
||||||
|
foreach ($node->types as $typeNode) {
|
||||||
|
if ($typeNode instanceof Node\IntersectionType) {
|
||||||
|
$types[] = '('. $this->p($typeNode) . ')';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$types[] = $this->p($typeNode);
|
||||||
|
}
|
||||||
|
return implode('|', $types);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function pIntersectionType(Node\IntersectionType $node) {
|
protected function pIntersectionType(Node\IntersectionType $node) {
|
||||||
@ -521,7 +529,7 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function pExpr_StaticCall(Expr\StaticCall $node) {
|
protected function pExpr_StaticCall(Expr\StaticCall $node) {
|
||||||
return $this->pDereferenceLhs($node->class) . '::'
|
return $this->pStaticDereferenceLhs($node->class) . '::'
|
||||||
. ($node->name instanceof Expr
|
. ($node->name instanceof Expr
|
||||||
? ($node->name instanceof Expr\Variable
|
? ($node->name instanceof Expr\Variable
|
||||||
? $this->p($node->name)
|
? $this->p($node->name)
|
||||||
@ -598,7 +606,7 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
|
protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
|
||||||
return $this->pDereferenceLhs($node->class) . '::' . $this->p($node->name);
|
return $this->pStaticDereferenceLhs($node->class) . '::' . $this->pObjectProperty($node->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
|
protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
|
||||||
@ -610,7 +618,7 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
|
protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
|
||||||
return $this->pDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
|
return $this->pStaticDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function pExpr_ShellExec(Expr\ShellExec $node) {
|
protected function pExpr_ShellExec(Expr\ShellExec $node) {
|
||||||
@ -806,7 +814,9 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
protected function pStmt_ClassConst(Stmt\ClassConst $node) {
|
protected function pStmt_ClassConst(Stmt\ClassConst $node) {
|
||||||
return $this->pAttrGroups($node->attrGroups)
|
return $this->pAttrGroups($node->attrGroups)
|
||||||
. $this->pModifiers($node->flags)
|
. $this->pModifiers($node->flags)
|
||||||
. 'const ' . $this->pCommaSeparated($node->consts) . ';';
|
. 'const '
|
||||||
|
. (null !== $node->type ? $this->p($node->type) . ' ' : '')
|
||||||
|
. $this->pCommaSeparated($node->consts) . ';';
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function pStmt_Function(Stmt\Function_ $node) {
|
protected function pStmt_Function(Stmt\Function_ $node) {
|
||||||
@ -1059,6 +1069,14 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function pStaticDereferenceLhs(Node $node) {
|
||||||
|
if (!$this->staticDereferenceLhsRequiresParens($node)) {
|
||||||
|
return $this->p($node);
|
||||||
|
} else {
|
||||||
|
return '(' . $this->p($node) . ')';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected function pCallLhs(Node $node) {
|
protected function pCallLhs(Node $node) {
|
||||||
if (!$this->callLhsRequiresParens($node)) {
|
if (!$this->callLhsRequiresParens($node)) {
|
||||||
return $this->p($node);
|
return $this->p($node);
|
||||||
@ -1067,9 +1085,12 @@ class Standard extends PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function pNewVariable(Node $node) {
|
protected function pNewVariable(Node $node): string {
|
||||||
// TODO: This is not fully accurate.
|
if (!$this->newOperandRequiresParens($node)) {
|
||||||
return $this->pDereferenceLhs($node);
|
return $this->p($node);
|
||||||
|
} else {
|
||||||
|
return '(' . $this->p($node) . ')';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,6 +21,8 @@ abstract class PrettyPrinterAbstract
|
|||||||
const FIXUP_BRACED_NAME = 4; // Name operand that may require bracing
|
const FIXUP_BRACED_NAME = 4; // Name operand that may require bracing
|
||||||
const FIXUP_VAR_BRACED_NAME = 5; // Name operand that may require ${} bracing
|
const FIXUP_VAR_BRACED_NAME = 5; // Name operand that may require ${} bracing
|
||||||
const FIXUP_ENCAPSED = 6; // Encapsed string part
|
const FIXUP_ENCAPSED = 6; // Encapsed string part
|
||||||
|
const FIXUP_NEW = 7; // New/instanceof operand
|
||||||
|
const FIXUP_STATIC_DEREF_LHS = 8; // LHS of static dereferencing operation
|
||||||
|
|
||||||
protected $precedenceMap = [
|
protected $precedenceMap = [
|
||||||
// [precedence, associativity]
|
// [precedence, associativity]
|
||||||
@ -774,7 +776,8 @@ abstract class PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($skipRemovedNode) {
|
if ($skipRemovedNode) {
|
||||||
if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
|
if ($isStmtList && ($this->origTokens->haveBracesInRange($pos, $itemStartPos) ||
|
||||||
|
$this->origTokens->haveTagInRange($pos, $itemStartPos))) {
|
||||||
// We'd remove the brace of a code block.
|
// We'd remove the brace of a code block.
|
||||||
// TODO: Preserve formatting.
|
// TODO: Preserve formatting.
|
||||||
$this->setIndentLevel($origIndentLevel);
|
$this->setIndentLevel($origIndentLevel);
|
||||||
@ -877,7 +880,8 @@ abstract class PrettyPrinterAbstract
|
|||||||
$pos, $itemStartPos, $indentAdjustment);
|
$pos, $itemStartPos, $indentAdjustment);
|
||||||
$skipRemovedNode = true;
|
$skipRemovedNode = true;
|
||||||
} else {
|
} else {
|
||||||
if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
|
if ($isStmtList && ($this->origTokens->haveBracesInRange($pos, $itemStartPos) ||
|
||||||
|
$this->origTokens->haveTagInRange($pos, $itemStartPos))) {
|
||||||
// We'd remove the brace of a code block.
|
// We'd remove the brace of a code block.
|
||||||
// TODO: Preserve formatting.
|
// TODO: Preserve formatting.
|
||||||
return null;
|
return null;
|
||||||
@ -923,11 +927,14 @@ abstract class PrettyPrinterAbstract
|
|||||||
foreach ($delayedAdd as $delayedAddNode) {
|
foreach ($delayedAdd as $delayedAddNode) {
|
||||||
if (!$first) {
|
if (!$first) {
|
||||||
$result .= $insertStr;
|
$result .= $insertStr;
|
||||||
|
if ($insertNewline) {
|
||||||
|
$result .= $this->nl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$result .= $this->p($delayedAddNode, true);
|
$result .= $this->p($delayedAddNode, true);
|
||||||
$first = false;
|
$first = false;
|
||||||
}
|
}
|
||||||
$result .= $extraRight;
|
$result .= $extraRight === "\n" ? $this->nl : $extraRight;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
@ -972,6 +979,19 @@ abstract class PrettyPrinterAbstract
|
|||||||
return '(' . $this->p($subNode) . ')';
|
return '(' . $this->p($subNode) . ')';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case self::FIXUP_STATIC_DEREF_LHS:
|
||||||
|
if ($this->staticDereferenceLhsRequiresParens($subNode)
|
||||||
|
&& !$this->origTokens->haveParens($subStartPos, $subEndPos)
|
||||||
|
) {
|
||||||
|
return '(' . $this->p($subNode) . ')';
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case self::FIXUP_NEW:
|
||||||
|
if ($this->newOperandRequiresParens($subNode)
|
||||||
|
&& !$this->origTokens->haveParens($subStartPos, $subEndPos)) {
|
||||||
|
return '(' . $this->p($subNode) . ')';
|
||||||
|
}
|
||||||
|
break;
|
||||||
case self::FIXUP_BRACED_NAME:
|
case self::FIXUP_BRACED_NAME:
|
||||||
case self::FIXUP_VAR_BRACED_NAME:
|
case self::FIXUP_VAR_BRACED_NAME:
|
||||||
if ($subNode instanceof Expr
|
if ($subNode instanceof Expr
|
||||||
@ -1042,13 +1062,26 @@ abstract class PrettyPrinterAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines whether the LHS of a dereferencing operation must be wrapped in parenthesis.
|
* Determines whether the LHS of an array/object operation must be wrapped in parentheses.
|
||||||
*
|
*
|
||||||
* @param Node $node LHS of dereferencing operation
|
* @param Node $node LHS of dereferencing operation
|
||||||
*
|
*
|
||||||
* @return bool Whether parentheses are required
|
* @return bool Whether parentheses are required
|
||||||
*/
|
*/
|
||||||
protected function dereferenceLhsRequiresParens(Node $node) : bool {
|
protected function dereferenceLhsRequiresParens(Node $node) : bool {
|
||||||
|
// A constant can occur on the LHS of an array/object deref, but not a static deref.
|
||||||
|
return $this->staticDereferenceLhsRequiresParens($node)
|
||||||
|
&& !$node instanceof Expr\ConstFetch;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether the LHS of a static operation must be wrapped in parentheses.
|
||||||
|
*
|
||||||
|
* @param Node $node LHS of dereferencing operation
|
||||||
|
*
|
||||||
|
* @return bool Whether parentheses are required
|
||||||
|
*/
|
||||||
|
protected function staticDereferenceLhsRequiresParens(Node $node): bool {
|
||||||
return !($node instanceof Expr\Variable
|
return !($node instanceof Expr\Variable
|
||||||
|| $node instanceof Node\Name
|
|| $node instanceof Node\Name
|
||||||
|| $node instanceof Expr\ArrayDimFetch
|
|| $node instanceof Expr\ArrayDimFetch
|
||||||
@ -1061,10 +1094,31 @@ abstract class PrettyPrinterAbstract
|
|||||||
|| $node instanceof Expr\StaticCall
|
|| $node instanceof Expr\StaticCall
|
||||||
|| $node instanceof Expr\Array_
|
|| $node instanceof Expr\Array_
|
||||||
|| $node instanceof Scalar\String_
|
|| $node instanceof Scalar\String_
|
||||||
|| $node instanceof Expr\ConstFetch
|
|
||||||
|| $node instanceof Expr\ClassConstFetch);
|
|| $node instanceof Expr\ClassConstFetch);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether an expression used in "new" or "instanceof" requires parentheses.
|
||||||
|
*
|
||||||
|
* @param Node $node New or instanceof operand
|
||||||
|
*
|
||||||
|
* @return bool Whether parentheses are required
|
||||||
|
*/
|
||||||
|
protected function newOperandRequiresParens(Node $node): bool {
|
||||||
|
if ($node instanceof Node\Name || $node instanceof Expr\Variable) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ($node instanceof Expr\ArrayDimFetch || $node instanceof Expr\PropertyFetch ||
|
||||||
|
$node instanceof Expr\NullsafePropertyFetch
|
||||||
|
) {
|
||||||
|
return $this->newOperandRequiresParens($node->var);
|
||||||
|
}
|
||||||
|
if ($node instanceof Expr\StaticPropertyFetch) {
|
||||||
|
return $this->newOperandRequiresParens($node->class);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Print modifiers, including trailing whitespace.
|
* Print modifiers, including trailing whitespace.
|
||||||
*
|
*
|
||||||
@ -1166,7 +1220,7 @@ abstract class PrettyPrinterAbstract
|
|||||||
Expr\PostDec::class => ['var' => self::FIXUP_PREC_LEFT],
|
Expr\PostDec::class => ['var' => self::FIXUP_PREC_LEFT],
|
||||||
Expr\Instanceof_::class => [
|
Expr\Instanceof_::class => [
|
||||||
'expr' => self::FIXUP_PREC_LEFT,
|
'expr' => self::FIXUP_PREC_LEFT,
|
||||||
'class' => self::FIXUP_PREC_RIGHT, // TODO: FIXUP_NEW_VARIABLE
|
'class' => self::FIXUP_NEW,
|
||||||
],
|
],
|
||||||
Expr\Ternary::class => [
|
Expr\Ternary::class => [
|
||||||
'cond' => self::FIXUP_PREC_LEFT,
|
'cond' => self::FIXUP_PREC_LEFT,
|
||||||
@ -1174,10 +1228,13 @@ abstract class PrettyPrinterAbstract
|
|||||||
],
|
],
|
||||||
|
|
||||||
Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS],
|
Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS],
|
||||||
Expr\StaticCall::class => ['class' => self::FIXUP_DEREF_LHS],
|
Expr\StaticCall::class => ['class' => self::FIXUP_STATIC_DEREF_LHS],
|
||||||
Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS],
|
Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS],
|
||||||
Expr\ClassConstFetch::class => ['var' => self::FIXUP_DEREF_LHS],
|
Expr\ClassConstFetch::class => [
|
||||||
Expr\New_::class => ['class' => self::FIXUP_DEREF_LHS], // TODO: FIXUP_NEW_VARIABLE
|
'class' => self::FIXUP_STATIC_DEREF_LHS,
|
||||||
|
'name' => self::FIXUP_BRACED_NAME,
|
||||||
|
],
|
||||||
|
Expr\New_::class => ['class' => self::FIXUP_NEW],
|
||||||
Expr\MethodCall::class => [
|
Expr\MethodCall::class => [
|
||||||
'var' => self::FIXUP_DEREF_LHS,
|
'var' => self::FIXUP_DEREF_LHS,
|
||||||
'name' => self::FIXUP_BRACED_NAME,
|
'name' => self::FIXUP_BRACED_NAME,
|
||||||
@ -1187,7 +1244,7 @@ abstract class PrettyPrinterAbstract
|
|||||||
'name' => self::FIXUP_BRACED_NAME,
|
'name' => self::FIXUP_BRACED_NAME,
|
||||||
],
|
],
|
||||||
Expr\StaticPropertyFetch::class => [
|
Expr\StaticPropertyFetch::class => [
|
||||||
'class' => self::FIXUP_DEREF_LHS,
|
'class' => self::FIXUP_STATIC_DEREF_LHS,
|
||||||
'name' => self::FIXUP_VAR_BRACED_NAME,
|
'name' => self::FIXUP_VAR_BRACED_NAME,
|
||||||
],
|
],
|
||||||
Expr\PropertyFetch::class => [
|
Expr\PropertyFetch::class => [
|
||||||
@ -1273,6 +1330,7 @@ abstract class PrettyPrinterAbstract
|
|||||||
'Param->default' => $stripEquals,
|
'Param->default' => $stripEquals,
|
||||||
'Stmt_Break->num' => $stripBoth,
|
'Stmt_Break->num' => $stripBoth,
|
||||||
'Stmt_Catch->var' => $stripLeft,
|
'Stmt_Catch->var' => $stripLeft,
|
||||||
|
'Stmt_ClassConst->type' => $stripRight,
|
||||||
'Stmt_ClassMethod->returnType' => $stripColon,
|
'Stmt_ClassMethod->returnType' => $stripColon,
|
||||||
'Stmt_Class->extends' => ['left' => \T_EXTENDS],
|
'Stmt_Class->extends' => ['left' => \T_EXTENDS],
|
||||||
'Stmt_Enum->scalarType' => $stripColon,
|
'Stmt_Enum->scalarType' => $stripColon,
|
||||||
@ -1314,6 +1372,7 @@ abstract class PrettyPrinterAbstract
|
|||||||
'Stmt_Break->num' => [\T_BREAK, false, ' ', null],
|
'Stmt_Break->num' => [\T_BREAK, false, ' ', null],
|
||||||
'Stmt_Catch->var' => [null, false, ' ', null],
|
'Stmt_Catch->var' => [null, false, ' ', null],
|
||||||
'Stmt_ClassMethod->returnType' => [')', false, ' : ', null],
|
'Stmt_ClassMethod->returnType' => [')', false, ' : ', null],
|
||||||
|
'Stmt_ClassConst->type' => [\T_CONST, false, ' ', null],
|
||||||
'Stmt_Class->extends' => [null, false, ' extends ', null],
|
'Stmt_Class->extends' => [null, false, ' extends ', null],
|
||||||
'Stmt_Enum->scalarType' => [null, false, ' : ', null],
|
'Stmt_Enum->scalarType' => [null, false, ' : ', null],
|
||||||
'Stmt_EnumCase->expr' => [null, false, ' = ', null],
|
'Stmt_EnumCase->expr' => [null, false, ' = ', null],
|
||||||
@ -1454,6 +1513,16 @@ abstract class PrettyPrinterAbstract
|
|||||||
'Stmt_ClassMethod->params' => ['(', '', ''],
|
'Stmt_ClassMethod->params' => ['(', '', ''],
|
||||||
'Stmt_Interface->extends' => [null, ' extends ', ''],
|
'Stmt_Interface->extends' => [null, ' extends ', ''],
|
||||||
'Stmt_Function->params' => ['(', '', ''],
|
'Stmt_Function->params' => ['(', '', ''],
|
||||||
|
'Stmt_Interface->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_Class->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_ClassConst->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_ClassMethod->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_Function->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_Property->attrGroups' => [null, '', "\n"],
|
||||||
|
'Stmt_Trait->attrGroups' => [null, '', "\n"],
|
||||||
|
'Expr_ArrowFunction->attrGroups' => [null, '', ' '],
|
||||||
|
'Expr_Closure->attrGroups' => [null, '', ' '],
|
||||||
|
'Expr_PrintableNewAnonClass->attrGroups' => [\T_NEW, ' ', ''],
|
||||||
|
|
||||||
/* These cannot be empty to start with:
|
/* These cannot be empty to start with:
|
||||||
* Expr_Isset->vars
|
* Expr_Isset->vars
|
||||||
@ -1493,6 +1562,7 @@ abstract class PrettyPrinterAbstract
|
|||||||
'Stmt_ClassMethod->flags' => \T_FUNCTION,
|
'Stmt_ClassMethod->flags' => \T_FUNCTION,
|
||||||
'Stmt_Class->flags' => \T_CLASS,
|
'Stmt_Class->flags' => \T_CLASS,
|
||||||
'Stmt_Property->flags' => \T_VARIABLE,
|
'Stmt_Property->flags' => \T_VARIABLE,
|
||||||
|
'Expr_PrintableNewAnonClass->flags' => \T_CLASS,
|
||||||
'Param->flags' => \T_VARIABLE,
|
'Param->flags' => \T_VARIABLE,
|
||||||
//'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
|
//'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
|
||||||
];
|
];
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
|
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
|
||||||
backupGlobals="false"
|
backupGlobals="false"
|
||||||
colors="true"
|
colors="true"
|
||||||
|
convertDeprecationsToExceptions="true"
|
||||||
beStrictAboutTestsThatDoNotTestAnything="false"
|
beStrictAboutTestsThatDoNotTestAnything="false"
|
||||||
bootstrap="./test/bootstrap.php">
|
bootstrap="./test/bootstrap.php">
|
||||||
<testsuites>
|
<testsuites>
|
||||||
|
@ -142,6 +142,18 @@ class ClassConstTest extends \PHPUnit\Framework\TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testType() {
|
||||||
|
$node = $this->createClassConstBuilder('TYPE', 1)
|
||||||
|
->setType('int')
|
||||||
|
->getNode();
|
||||||
|
$this->assertEquals(
|
||||||
|
new Stmt\ClassConst(
|
||||||
|
[new Const_('TYPE', new LNumber(1))],
|
||||||
|
0, [], [], new Identifier('int')),
|
||||||
|
$node
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider provideTestDefaultValues
|
* @dataProvider provideTestDefaultValues
|
||||||
*/
|
*/
|
||||||
|
@ -27,6 +27,7 @@ class EnumCaseTest extends \PHPUnit\Framework\TestCase
|
|||||||
new Stmt\EnumCase(
|
new Stmt\EnumCase(
|
||||||
"TEST",
|
"TEST",
|
||||||
null,
|
null,
|
||||||
|
[],
|
||||||
[
|
[
|
||||||
'comments' => [new Comment\Doc('/** Test */')]
|
'comments' => [new Comment\Doc('/** Test */')]
|
||||||
]
|
]
|
||||||
@ -50,7 +51,6 @@ class EnumCaseTest extends \PHPUnit\Framework\TestCase
|
|||||||
new Stmt\EnumCase(
|
new Stmt\EnumCase(
|
||||||
"ATTR_GROUP",
|
"ATTR_GROUP",
|
||||||
null,
|
null,
|
||||||
[],
|
|
||||||
[$attributeGroup]
|
[$attributeGroup]
|
||||||
),
|
),
|
||||||
$node
|
$node
|
||||||
|
@ -205,6 +205,54 @@ class ParamTest extends \PHPUnit\Framework\TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testMakePublic() {
|
||||||
|
$node = $this->createParamBuilder('test')
|
||||||
|
->makePublic()
|
||||||
|
->getNode()
|
||||||
|
;
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
new Node\Param(new Expr\Variable('test'), null, null, false, false, [], Node\Stmt\Class_::MODIFIER_PUBLIC),
|
||||||
|
$node
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakeProtected() {
|
||||||
|
$node = $this->createParamBuilder('test')
|
||||||
|
->makeProtected()
|
||||||
|
->getNode()
|
||||||
|
;
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
new Node\Param(new Expr\Variable('test'), null, null, false, false, [], Node\Stmt\Class_::MODIFIER_PROTECTED),
|
||||||
|
$node
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakePrivate() {
|
||||||
|
$node = $this->createParamBuilder('test')
|
||||||
|
->makePrivate()
|
||||||
|
->getNode()
|
||||||
|
;
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
new Node\Param(new Expr\Variable('test'), null, null, false, false, [], Node\Stmt\Class_::MODIFIER_PRIVATE),
|
||||||
|
$node
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakeReadonly() {
|
||||||
|
$node = $this->createParamBuilder('test')
|
||||||
|
->makeReadonly()
|
||||||
|
->getNode()
|
||||||
|
;
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
new Node\Param(new Expr\Variable('test'), null, null, false, false, [], Node\Stmt\Class_::MODIFIER_READONLY),
|
||||||
|
$node
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function testAddAttribute() {
|
public function testAddAttribute() {
|
||||||
$attribute = new Attribute(
|
$attribute = new Attribute(
|
||||||
new Name('Attr'),
|
new Name('Attr'),
|
||||||
|
@ -210,6 +210,10 @@ class BuilderFactoryTest extends \PHPUnit\Framework\TestCase
|
|||||||
new Expr\ClassConstFetch(new Expr\Variable('foo'), new Identifier('BAR')),
|
new Expr\ClassConstFetch(new Expr\Variable('foo'), new Identifier('BAR')),
|
||||||
$factory->classConstFetch(new Expr\Variable('foo'), 'BAR')
|
$factory->classConstFetch(new Expr\Variable('foo'), 'BAR')
|
||||||
);
|
);
|
||||||
|
$this->assertEquals(
|
||||||
|
new Expr\ClassConstFetch(new Name('Foo'), new Expr\Variable('foo')),
|
||||||
|
$factory->classConstFetch('Foo', $factory->var('foo'))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testVar() {
|
public function testVar() {
|
||||||
@ -243,7 +247,7 @@ class BuilderFactoryTest extends \PHPUnit\Framework\TestCase
|
|||||||
public function testInvalidIdentifier() {
|
public function testInvalidIdentifier() {
|
||||||
$this->expectException(\LogicException::class);
|
$this->expectException(\LogicException::class);
|
||||||
$this->expectExceptionMessage('Expected string or instance of Node\Identifier');
|
$this->expectExceptionMessage('Expected string or instance of Node\Identifier');
|
||||||
(new BuilderFactory())->classConstFetch('Foo', new Expr\Variable('foo'));
|
(new BuilderFactory())->classConstFetch('Foo', new Name('foo'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testInvalidIdentifierOrExpr() {
|
public function testInvalidIdentifierOrExpr() {
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
namespace PhpParser;
|
namespace PhpParser;
|
||||||
|
|
||||||
use PhpParser\Builder\Class_;
|
use PhpParser\Builder\Class_;
|
||||||
|
use PhpParser\Node\Identifier;
|
||||||
|
use PhpParser\Node\Name\FullyQualified;
|
||||||
use PhpParser\Node\Scalar;
|
use PhpParser\Node\Scalar;
|
||||||
use PhpParser\Node\Stmt;
|
use PhpParser\Node\Stmt;
|
||||||
use PhpParser\Node\Expr;
|
use PhpParser\Node\Expr;
|
||||||
@ -125,8 +127,11 @@ class BuilderHelpersTest extends \PHPUnit\Framework\TestCase
|
|||||||
$this->assertEquals(new Node\Identifier('iterable'), BuilderHelpers::normalizeType('iterable'));
|
$this->assertEquals(new Node\Identifier('iterable'), BuilderHelpers::normalizeType('iterable'));
|
||||||
$this->assertEquals(new Node\Identifier('void'), BuilderHelpers::normalizeType('void'));
|
$this->assertEquals(new Node\Identifier('void'), BuilderHelpers::normalizeType('void'));
|
||||||
$this->assertEquals(new Node\Identifier('object'), BuilderHelpers::normalizeType('object'));
|
$this->assertEquals(new Node\Identifier('object'), BuilderHelpers::normalizeType('object'));
|
||||||
|
$this->assertEquals(new Node\Identifier('null'), BuilderHelpers::normalizeType('null'));
|
||||||
|
$this->assertEquals(new Node\Identifier('false'), BuilderHelpers::normalizeType('false'));
|
||||||
$this->assertEquals(new Node\Identifier('mixed'), BuilderHelpers::normalizeType('mixed'));
|
$this->assertEquals(new Node\Identifier('mixed'), BuilderHelpers::normalizeType('mixed'));
|
||||||
$this->assertEquals(new Node\Identifier('never'), BuilderHelpers::normalizeType('never'));
|
$this->assertEquals(new Node\Identifier('never'), BuilderHelpers::normalizeType('never'));
|
||||||
|
$this->assertEquals(new Node\Identifier('true'), BuilderHelpers::normalizeType('true'));
|
||||||
|
|
||||||
$intIdentifier = new Node\Identifier('int');
|
$intIdentifier = new Node\Identifier('int');
|
||||||
$this->assertSame($intIdentifier, BuilderHelpers::normalizeType($intIdentifier));
|
$this->assertSame($intIdentifier, BuilderHelpers::normalizeType($intIdentifier));
|
||||||
@ -219,4 +224,14 @@ class BuilderHelpersTest extends \PHPUnit\Framework\TestCase
|
|||||||
$this->expectExceptionMessage('Attribute must be an instance of PhpParser\Node\Attribute or PhpParser\Node\AttributeGroup');
|
$this->expectExceptionMessage('Attribute must be an instance of PhpParser\Node\Attribute or PhpParser\Node\AttributeGroup');
|
||||||
BuilderHelpers::normalizeAttribute('test');
|
BuilderHelpers::normalizeAttribute('test');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testNormalizeValueEnum() {
|
||||||
|
if (\PHP_VERSION_ID <= 80100) {
|
||||||
|
$this->markTestSkipped('Enums are supported since PHP 8.1');
|
||||||
|
}
|
||||||
|
|
||||||
|
include __DIR__ . '/../fixtures/Suit.php';
|
||||||
|
|
||||||
|
$this->assertEquals(new Expr\ClassConstFetch(new FullyQualified(\Suit::class), new Identifier('Hearts')), BuilderHelpers::normalizeValue(\Suit::Hearts));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -241,8 +241,8 @@ class EmulativeTest extends LexerTest
|
|||||||
['1_000', [
|
['1_000', [
|
||||||
[Tokens::T_LNUMBER, '1_000'],
|
[Tokens::T_LNUMBER, '1_000'],
|
||||||
]],
|
]],
|
||||||
['0xCAFE_F00D', [
|
['0x7AFE_F00D', [
|
||||||
[Tokens::T_LNUMBER, '0xCAFE_F00D'],
|
[Tokens::T_LNUMBER, '0x7AFE_F00D'],
|
||||||
]],
|
]],
|
||||||
['0b0101_1111', [
|
['0b0101_1111', [
|
||||||
[Tokens::T_LNUMBER, '0b0101_1111'],
|
[Tokens::T_LNUMBER, '0b0101_1111'],
|
||||||
@ -360,12 +360,12 @@ class EmulativeTest extends LexerTest
|
|||||||
]],
|
]],
|
||||||
['function readonly(', [
|
['function readonly(', [
|
||||||
[Tokens::T_FUNCTION, 'function'],
|
[Tokens::T_FUNCTION, 'function'],
|
||||||
[Tokens::T_STRING, 'readonly'],
|
[Tokens::T_READONLY, 'readonly'],
|
||||||
[ord('('), '('],
|
[ord('('), '('],
|
||||||
]],
|
]],
|
||||||
['function readonly (', [
|
['function readonly (', [
|
||||||
[Tokens::T_FUNCTION, 'function'],
|
[Tokens::T_FUNCTION, 'function'],
|
||||||
[Tokens::T_STRING, 'readonly'],
|
[Tokens::T_READONLY, 'readonly'],
|
||||||
[ord('('), '('],
|
[ord('('), '('],
|
||||||
]],
|
]],
|
||||||
];
|
];
|
||||||
|
@ -19,10 +19,12 @@ class NameTest extends \PHPUnit\Framework\TestCase
|
|||||||
$name = new Name('foo');
|
$name = new Name('foo');
|
||||||
$this->assertSame('foo', $name->getFirst());
|
$this->assertSame('foo', $name->getFirst());
|
||||||
$this->assertSame('foo', $name->getLast());
|
$this->assertSame('foo', $name->getLast());
|
||||||
|
$this->assertSame(['foo'], $name->getParts());
|
||||||
|
|
||||||
$name = new Name('foo\bar');
|
$name = new Name('foo\bar');
|
||||||
$this->assertSame('foo', $name->getFirst());
|
$this->assertSame('foo', $name->getFirst());
|
||||||
$this->assertSame('bar', $name->getLast());
|
$this->assertSame('bar', $name->getLast());
|
||||||
|
$this->assertSame(['foo', 'bar'], $name->getParts());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testToString() {
|
public function testToString() {
|
||||||
@ -73,6 +75,12 @@ class NameTest extends \PHPUnit\Framework\TestCase
|
|||||||
(new Name('foo\bar\baz'))->slice(0, -4);
|
(new Name('foo\bar\baz'))->slice(0, -4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSliceLengthTooLargeWithOffset() {
|
||||||
|
$this->expectException(\OutOfBoundsException::class);
|
||||||
|
$this->expectExceptionMessage('Length 3 is out of bounds');
|
||||||
|
(new Name('foo\bar\baz'))->slice(1, 3);
|
||||||
|
}
|
||||||
|
|
||||||
public function testConcat() {
|
public function testConcat() {
|
||||||
$this->assertEquals(new Name('foo\bar\baz'), Name::concat('foo', 'bar\baz'));
|
$this->assertEquals(new Name('foo\bar\baz'), Name::concat('foo', 'bar\baz'));
|
||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
|
@ -189,7 +189,7 @@ class A extends B implements C, D {
|
|||||||
E::h as i;
|
E::h as i;
|
||||||
E::j insteadof F, G;
|
E::j insteadof F, G;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[X]
|
#[X]
|
||||||
public float $php = 7.4;
|
public float $php = 7.4;
|
||||||
public ?Foo $person;
|
public ?Foo $person;
|
||||||
@ -198,6 +198,10 @@ class A extends B implements C, D {
|
|||||||
|
|
||||||
#[X]
|
#[X]
|
||||||
const C = 1;
|
const C = 1;
|
||||||
|
|
||||||
|
public const X A = X::Bar;
|
||||||
|
public const X\Foo B = X\Foo::Bar;
|
||||||
|
public const \X\Foo C = \X\Foo::Bar;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[X]
|
#[X]
|
||||||
@ -263,6 +267,9 @@ class A extends \NS\B implements \NS\C, \NS\D
|
|||||||
public \NS\A|\NS\B|int $prop;
|
public \NS\A|\NS\B|int $prop;
|
||||||
#[\NS\X]
|
#[\NS\X]
|
||||||
const C = 1;
|
const C = 1;
|
||||||
|
public const \NS\X A = \NS\X::Bar;
|
||||||
|
public const \NS\X\Foo B = \NS\X\Foo::Bar;
|
||||||
|
public const \X\Foo C = \X\Foo::Bar;
|
||||||
}
|
}
|
||||||
#[\NS\X]
|
#[\NS\X]
|
||||||
interface A extends \NS\C, \NS\D
|
interface A extends \NS\C, \NS\D
|
||||||
|
@ -5,6 +5,8 @@ namespace PhpParser;
|
|||||||
/* This test is very weak, because PHPUnit's assertEquals assertion is way too slow dealing with the
|
/* This test is very weak, because PHPUnit's assertEquals assertion is way too slow dealing with the
|
||||||
* large objects involved here. So we just do some basic instanceof tests instead. */
|
* large objects involved here. So we just do some basic instanceof tests instead. */
|
||||||
|
|
||||||
|
use PhpParser\Node\Stmt\Echo_;
|
||||||
|
|
||||||
class ParserFactoryTest extends \PHPUnit\Framework\TestCase
|
class ParserFactoryTest extends \PHPUnit\Framework\TestCase
|
||||||
{
|
{
|
||||||
/** @dataProvider provideTestCreate */
|
/** @dataProvider provideTestCreate */
|
||||||
@ -33,4 +35,26 @@ class ParserFactoryTest extends \PHPUnit\Framework\TestCase
|
|||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @dataProvider provideTestLexerAttributes */
|
||||||
|
public function testLexerAttributes(Parser $parser) {
|
||||||
|
$stmts = $parser->parse("<?php /* Bar */ echo 'Foo';");
|
||||||
|
$stmt = $stmts[0];
|
||||||
|
$this->assertInstanceOf(Echo_::class, $stmt);
|
||||||
|
$this->assertCount(1, $stmt->getComments());
|
||||||
|
$this->assertSame(1, $stmt->getStartLine());
|
||||||
|
$this->assertSame(1, $stmt->getEndLine());
|
||||||
|
$this->assertSame(3, $stmt->getStartTokenPos());
|
||||||
|
$this->assertSame(6, $stmt->getEndTokenPos());
|
||||||
|
$this->assertSame(16, $stmt->getStartFilePos());
|
||||||
|
$this->assertSame(26, $stmt->getEndFilePos());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideTestLexerAttributes() {
|
||||||
|
$factory = new ParserFactory();
|
||||||
|
return [
|
||||||
|
[$factory->createForHostVersion()],
|
||||||
|
[$factory->createForNewestSupportedVersion()],
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -102,12 +102,16 @@ function() {};
|
|||||||
fn()
|
fn()
|
||||||
=> 42;
|
=> 42;
|
||||||
-----
|
-----
|
||||||
// TODO: Currently we lose formatting for this case.
|
|
||||||
$attrGroup = new Node\AttributeGroup([
|
$attrGroup = new Node\AttributeGroup([
|
||||||
new Node\Attribute(new Node\Name('A'), []),
|
new Node\Attribute(new Node\Name('A'), []),
|
||||||
]);
|
]);
|
||||||
|
$attrGroup2 = new Node\AttributeGroup([
|
||||||
|
new Node\Attribute(new Node\Name('B'), []),
|
||||||
|
]);
|
||||||
$stmts[0]->attrGroups[] = $attrGroup;
|
$stmts[0]->attrGroups[] = $attrGroup;
|
||||||
|
$stmts[0]->attrGroups[] = $attrGroup2;
|
||||||
$stmts[0]->stmts[0]->attrGroups[] = $attrGroup;
|
$stmts[0]->stmts[0]->attrGroups[] = $attrGroup;
|
||||||
|
$stmts[0]->stmts[0]->attrGroups[] = $attrGroup2;
|
||||||
$stmts[0]->stmts[1]->attrGroups[] = $attrGroup;
|
$stmts[0]->stmts[1]->attrGroups[] = $attrGroup;
|
||||||
$stmts[0]->stmts[2]->attrGroups[] = $attrGroup;
|
$stmts[0]->stmts[2]->attrGroups[] = $attrGroup;
|
||||||
$stmts[1]->attrGroups[] = $attrGroup;
|
$stmts[1]->attrGroups[] = $attrGroup;
|
||||||
@ -119,39 +123,34 @@ $stmts[6]->expr->attrGroups[] = $attrGroup;
|
|||||||
-----
|
-----
|
||||||
<?php
|
<?php
|
||||||
#[A]
|
#[A]
|
||||||
class X
|
#[B]
|
||||||
{
|
class X {
|
||||||
#[A]
|
#[A]
|
||||||
public function m()
|
#[B]
|
||||||
{
|
public function m() {}
|
||||||
}
|
|
||||||
#[A]
|
#[A]
|
||||||
public $prop;
|
public
|
||||||
|
$prop;
|
||||||
|
|
||||||
#[A]
|
#[A]
|
||||||
const X = 42;
|
const
|
||||||
|
X = 42;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[A]
|
#[A]
|
||||||
trait X
|
trait X {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#[A]
|
#[A]
|
||||||
interface X
|
interface X {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#[A]
|
#[A]
|
||||||
function f()
|
function f() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
new #[A] class
|
new #[A] class {};
|
||||||
{
|
#[A] function() {};
|
||||||
};
|
#[A] fn()
|
||||||
#[A] function () {
|
=> 42;
|
||||||
};
|
|
||||||
#[A] fn() => 42;
|
|
||||||
-----
|
-----
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
@ -176,4 +175,4 @@ class X {};
|
|||||||
B,
|
B,
|
||||||
C,
|
C,
|
||||||
]
|
]
|
||||||
class X {};
|
class X {};
|
||||||
|
@ -49,4 +49,4 @@ class Test {
|
|||||||
public function test() {
|
public function test() {
|
||||||
// some code
|
// some code
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -107,4 +107,4 @@ Foo
|
|||||||
|
|
||||||
new class
|
new class
|
||||||
($a, $b)
|
($a, $b)
|
||||||
extends Foo {};
|
extends Foo {};
|
||||||
|
@ -42,6 +42,12 @@ $foo -> bar;
|
|||||||
$foo -> bar;
|
$foo -> bar;
|
||||||
self :: $foo;
|
self :: $foo;
|
||||||
self :: $foo;
|
self :: $foo;
|
||||||
|
new Foo();
|
||||||
|
$x instanceof Foo;
|
||||||
|
Foo :: bar;
|
||||||
|
Foo :: $bar;
|
||||||
|
Foo :: bar();
|
||||||
|
Foo :: bar;
|
||||||
-----
|
-----
|
||||||
$stmts[0]->expr->name = new Expr\Variable('a');
|
$stmts[0]->expr->name = new Expr\Variable('a');
|
||||||
$stmts[1]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
$stmts[1]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
||||||
@ -54,6 +60,12 @@ $stmts[5]->expr->name = new Expr\Variable('bar');
|
|||||||
$stmts[6]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
$stmts[6]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
||||||
$stmts[7]->expr->name = new Node\VarLikeIdentifier('bar');
|
$stmts[7]->expr->name = new Node\VarLikeIdentifier('bar');
|
||||||
$stmts[8]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
$stmts[8]->expr->name = new Expr\BinaryOp\Concat(new Expr\Variable('a'), new Expr\Variable('b'));
|
||||||
|
$stmts[9]->expr->class = new Scalar\String_('Foo');
|
||||||
|
$stmts[10]->expr->class = new Scalar\String_('Foo');
|
||||||
|
$stmts[11]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
|
||||||
|
$stmts[12]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
|
||||||
|
$stmts[13]->expr->class = new Expr\ConstFetch(new Node\Name('FOO'));
|
||||||
|
$stmts[14]->expr->name = new Expr\Variable('bar');
|
||||||
-----
|
-----
|
||||||
<?php
|
<?php
|
||||||
$a ();
|
$a ();
|
||||||
@ -64,4 +76,10 @@ $foo -> foo;
|
|||||||
$foo -> {$bar};
|
$foo -> {$bar};
|
||||||
$foo -> {$a . $b};
|
$foo -> {$a . $b};
|
||||||
self :: $bar;
|
self :: $bar;
|
||||||
self :: ${$a . $b};
|
self :: ${$a . $b};
|
||||||
|
new ('Foo')();
|
||||||
|
$x instanceof ('Foo');
|
||||||
|
(FOO) :: bar;
|
||||||
|
(FOO) :: $bar;
|
||||||
|
(FOO) :: bar();
|
||||||
|
Foo :: {$bar};
|
||||||
|
@ -42,13 +42,71 @@ function test() {
|
|||||||
baz();
|
baz();
|
||||||
}
|
}
|
||||||
-----
|
-----
|
||||||
// TODO Fix broken result
|
// TODO Preserve formatting
|
||||||
$stmts[0]->stmts[1] = $stmts[0]->stmts[2];
|
$stmts[0]->stmts[1] = $stmts[0]->stmts[2];
|
||||||
-----
|
-----
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
foo();
|
||||||
|
baz();
|
||||||
|
baz();
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
function test() {
|
function test() {
|
||||||
foo();<?php
|
foo();
|
||||||
|
?>Bar<?php
|
||||||
baz();
|
baz();
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
// TODO Preserve formatting
|
||||||
|
unset($stmts[0]->stmts[2]);
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
foo();
|
||||||
|
?>Bar<?php
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test() {
|
||||||
|
foo();
|
||||||
|
?>Bar<?php
|
||||||
baz();
|
baz();
|
||||||
}
|
}
|
||||||
|
-----
|
||||||
|
// TODO Preserve formatting
|
||||||
|
array_splice($stmts[0]->stmts, 0, 1, []);
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
?>Bar<?php
|
||||||
|
baz();
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test() {
|
||||||
|
foo();
|
||||||
|
?>Bar<?php
|
||||||
|
baz();
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
// TODO Preserve formatting
|
||||||
|
array_splice($stmts[0]->stmts, 1, 1, []);
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
foo();
|
||||||
|
baz();
|
||||||
|
}
|
||||||
|
@ -49,6 +49,10 @@ X
|
|||||||
private
|
private
|
||||||
$x
|
$x
|
||||||
;
|
;
|
||||||
|
|
||||||
|
const
|
||||||
|
X
|
||||||
|
= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (
|
foreach (
|
||||||
@ -86,6 +90,7 @@ $stmts[9]->expr = new Expr\Variable('x');
|
|||||||
$stmts[10]->extends = new Node\Name\FullyQualified('Bar');
|
$stmts[10]->extends = new Node\Name\FullyQualified('Bar');
|
||||||
$stmts[10]->stmts[0]->returnType = new Node\Name('Y');
|
$stmts[10]->stmts[0]->returnType = new Node\Name('Y');
|
||||||
$stmts[10]->stmts[1]->props[0]->default = new Scalar\DNumber(42.0);
|
$stmts[10]->stmts[1]->props[0]->default = new Scalar\DNumber(42.0);
|
||||||
|
$stmts[10]->stmts[2]->type = new Node\Identifier('int');
|
||||||
$stmts[11]->keyVar = new Expr\Variable('z');
|
$stmts[11]->keyVar = new Expr\Variable('z');
|
||||||
$stmts[12]->vars[0]->default = new Scalar\String_('abc');
|
$stmts[12]->vars[0]->default = new Scalar\String_('abc');
|
||||||
$stmts[13]->finally = new Stmt\Finally_([]);
|
$stmts[13]->finally = new Stmt\Finally_([]);
|
||||||
@ -140,6 +145,10 @@ X extends \Bar
|
|||||||
private
|
private
|
||||||
$x = 42.0
|
$x = 42.0
|
||||||
;
|
;
|
||||||
|
|
||||||
|
const int
|
||||||
|
X
|
||||||
|
= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (
|
foreach (
|
||||||
|
@ -54,4 +54,15 @@ function test(
|
|||||||
= 'z',
|
= 'z',
|
||||||
public T3 $z
|
public T3 $z
|
||||||
= 'x',
|
= 'x',
|
||||||
) {}
|
) {}
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
new class {};
|
||||||
|
new readonly class {};
|
||||||
|
-----
|
||||||
|
$stmts[0]->expr->class->flags = Stmt\Class_::MODIFIER_READONLY;
|
||||||
|
$stmts[1]->expr->class->flags = 0;
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
readonly class {};
|
||||||
|
class {};
|
||||||
|
@ -35,6 +35,11 @@ Bar
|
|||||||
y
|
y
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const
|
||||||
|
int
|
||||||
|
X
|
||||||
|
= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$foo [ $bar ];
|
$foo [ $bar ];
|
||||||
@ -97,6 +102,7 @@ $stmts[2]->extends = null;
|
|||||||
$stmts[2]->stmts[0]->returnType = null;
|
$stmts[2]->stmts[0]->returnType = null;
|
||||||
$stmts[2]->stmts[1]->props[0]->default = null;
|
$stmts[2]->stmts[1]->props[0]->default = null;
|
||||||
$stmts[2]->stmts[2]->adaptations[0]->newName = null;
|
$stmts[2]->stmts[2]->adaptations[0]->newName = null;
|
||||||
|
$stmts[2]->stmts[3]->type = null;
|
||||||
$stmts[3]->expr->dim = null;
|
$stmts[3]->expr->dim = null;
|
||||||
$stmts[4]->expr->expr = null;
|
$stmts[4]->expr->expr = null;
|
||||||
$stmts[5]->expr->if = null;
|
$stmts[5]->expr->if = null;
|
||||||
@ -141,6 +147,10 @@ Foo
|
|||||||
public
|
public
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const
|
||||||
|
X
|
||||||
|
= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$foo [];
|
$foo [];
|
||||||
|
@ -745,6 +745,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -899,12 +900,13 @@ array(
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
class Foo {
|
class Foo {
|
||||||
|
public $bar1;
|
||||||
publi $foo;
|
publi $foo;
|
||||||
public $bar;
|
public $bar;
|
||||||
}
|
}
|
||||||
-----
|
-----
|
||||||
!!php7
|
!!php7
|
||||||
Syntax error, unexpected T_STRING from 4:5 to 4:9
|
Syntax error, unexpected T_STRING from 5:5 to 5:9
|
||||||
array(
|
array(
|
||||||
0: Stmt_Class(
|
0: Stmt_Class(
|
||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
@ -918,6 +920,20 @@ array(
|
|||||||
)
|
)
|
||||||
stmts: array(
|
stmts: array(
|
||||||
0: Stmt_Property(
|
0: Stmt_Property(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: MODIFIER_PUBLIC (1)
|
||||||
|
type: null
|
||||||
|
props: array(
|
||||||
|
0: Stmt_PropertyProperty(
|
||||||
|
name: VarLikeIdentifier(
|
||||||
|
name: bar1
|
||||||
|
)
|
||||||
|
default: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Property(
|
||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_PUBLIC (1)
|
flags: MODIFIER_PUBLIC (1)
|
||||||
@ -1508,6 +1524,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -1521,4 +1538,4 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
43
test/code/parser/expr/dynamicClassConst.test
Normal file
43
test/code/parser/expr/dynamicClassConst.test
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
Dynamic class constant fetch
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
Foo::{bar()};
|
||||||
|
$foo::{bar()};
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
array(
|
||||||
|
0: Stmt_Expression(
|
||||||
|
expr: Expr_ClassConstFetch(
|
||||||
|
class: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Foo
|
||||||
|
)
|
||||||
|
)
|
||||||
|
name: Expr_FuncCall(
|
||||||
|
name: Name(
|
||||||
|
parts: array(
|
||||||
|
0: bar
|
||||||
|
)
|
||||||
|
)
|
||||||
|
args: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Expression(
|
||||||
|
expr: Expr_ClassConstFetch(
|
||||||
|
class: Expr_Variable(
|
||||||
|
name: foo
|
||||||
|
)
|
||||||
|
name: Expr_FuncCall(
|
||||||
|
name: Name(
|
||||||
|
parts: array(
|
||||||
|
0: bar
|
||||||
|
)
|
||||||
|
)
|
||||||
|
args: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
@ -17,6 +17,7 @@ Different float syntaxes
|
|||||||
// (all are actually the same number, just in different representations)
|
// (all are actually the same number, just in different representations)
|
||||||
18446744073709551615;
|
18446744073709551615;
|
||||||
0xFFFFFFFFFFFFFFFF;
|
0xFFFFFFFFFFFFFFFF;
|
||||||
|
0xEEEEEEEEEEEEEEEE;
|
||||||
01777777777777777777777;
|
01777777777777777777777;
|
||||||
0177777777777777777777787;
|
0177777777777777777777787;
|
||||||
0b1111111111111111111111111111111111111111111111111111111111111111;
|
0b1111111111111111111111111111111111111111111111111111111111111111;
|
||||||
@ -92,7 +93,7 @@ array(
|
|||||||
)
|
)
|
||||||
12: Stmt_Expression(
|
12: Stmt_Expression(
|
||||||
expr: Scalar_DNumber(
|
expr: Scalar_DNumber(
|
||||||
value: 1.844674407371E+19
|
value: 1.7216961135462E+19
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
13: Stmt_Expression(
|
13: Stmt_Expression(
|
||||||
@ -105,4 +106,9 @@ array(
|
|||||||
value: 1.844674407371E+19
|
value: 1.844674407371E+19
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
15: Stmt_Expression(
|
||||||
|
expr: Scalar_DNumber(
|
||||||
|
value: 1.844674407371E+19
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
@ -4,7 +4,7 @@ Different integer syntaxes
|
|||||||
|
|
||||||
6.674_083e-11;
|
6.674_083e-11;
|
||||||
299_792_458;
|
299_792_458;
|
||||||
0xCAFE_F00D;
|
0x7AFE_F00D;
|
||||||
0b0101_1111;
|
0b0101_1111;
|
||||||
0137_041;
|
0137_041;
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ array(
|
|||||||
)
|
)
|
||||||
2: Stmt_Expression(
|
2: Stmt_Expression(
|
||||||
expr: Scalar_LNumber(
|
expr: Scalar_LNumber(
|
||||||
value: 3405705229
|
value: 2063527949
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
3: Stmt_Expression(
|
3: Stmt_Expression(
|
||||||
@ -196,4 +196,4 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -152,6 +152,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -175,6 +176,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
|
@ -205,6 +205,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
|
@ -23,6 +23,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_STATIC (8)
|
flags: MODIFIER_STATIC (8)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -61,6 +62,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_ABSTRACT (16)
|
flags: MODIFIER_ABSTRACT (16)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -99,6 +101,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_READONLY (64)
|
flags: MODIFIER_READONLY (64)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -137,6 +140,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_PUBLIC (1)
|
flags: MODIFIER_PUBLIC (1)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -150,4 +154,4 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -27,6 +27,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -42,6 +43,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_PUBLIC (1)
|
flags: MODIFIER_PUBLIC (1)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -57,6 +59,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_PROTECTED (2)
|
flags: MODIFIER_PROTECTED (2)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -72,6 +75,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_PRIVATE (4)
|
flags: MODIFIER_PRIVATE (4)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -87,6 +91,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: MODIFIER_FINAL (32)
|
flags: MODIFIER_FINAL (32)
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
@ -100,4 +105,4 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -280,7 +280,7 @@ array(
|
|||||||
// Type in the partial parse could conceivably be any of 0, 16 or 32
|
// Type in the partial parse could conceivably be any of 0, 16 or 32
|
||||||
-----
|
-----
|
||||||
!!php5
|
!!php5
|
||||||
Syntax error, unexpected T_READONLY from 1:7 to 1:14
|
Syntax error, unexpected T_CLASS, expecting '(' from 1:16 to 1:20
|
||||||
array(
|
array(
|
||||||
0: Stmt_Class(
|
0: Stmt_Class(
|
||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
@ -366,4 +366,4 @@ array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -28,7 +28,7 @@ readonly class A {
|
|||||||
}
|
}
|
||||||
-----
|
-----
|
||||||
!!php5
|
!!php5
|
||||||
Syntax error, unexpected T_READONLY from 3:1 to 3:8
|
Syntax error, unexpected T_CLASS, expecting '(' from 3:10 to 3:14
|
||||||
array(
|
array(
|
||||||
0: Stmt_Class(
|
0: Stmt_Class(
|
||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
@ -65,4 +65,4 @@ array(
|
|||||||
stmts: array(
|
stmts: array(
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
26
test/code/parser/stmt/class/readonlyAnonyous.test
Normal file
26
test/code/parser/stmt/class/readonlyAnonyous.test
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
Readonly anonymous class
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
new readonly class {};
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
array(
|
||||||
|
0: Stmt_Expression(
|
||||||
|
expr: Expr_New(
|
||||||
|
class: Stmt_Class(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: MODIFIER_READONLY (64)
|
||||||
|
name: null
|
||||||
|
extends: null
|
||||||
|
implements: array(
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
args: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
@ -46,6 +46,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
|
125
test/code/parser/stmt/class/typedConstants.test
Normal file
125
test/code/parser/stmt/class/typedConstants.test
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
Typed constants
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
class Test {
|
||||||
|
const int X = 1;
|
||||||
|
private const string Y = "a", Z = "b";
|
||||||
|
const array ARRAY = [];
|
||||||
|
const Foo|Bar|null FOO = null;
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
array(
|
||||||
|
0: Stmt_Class(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
name: Identifier(
|
||||||
|
name: Test
|
||||||
|
)
|
||||||
|
extends: null
|
||||||
|
implements: array(
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
0: Stmt_ClassConst(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
type: Identifier(
|
||||||
|
name: int
|
||||||
|
)
|
||||||
|
consts: array(
|
||||||
|
0: Const(
|
||||||
|
name: Identifier(
|
||||||
|
name: X
|
||||||
|
)
|
||||||
|
value: Scalar_LNumber(
|
||||||
|
value: 1
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_ClassConst(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: MODIFIER_PRIVATE (4)
|
||||||
|
type: Identifier(
|
||||||
|
name: string
|
||||||
|
)
|
||||||
|
consts: array(
|
||||||
|
0: Const(
|
||||||
|
name: Identifier(
|
||||||
|
name: Y
|
||||||
|
)
|
||||||
|
value: Scalar_String(
|
||||||
|
value: a
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Const(
|
||||||
|
name: Identifier(
|
||||||
|
name: Z
|
||||||
|
)
|
||||||
|
value: Scalar_String(
|
||||||
|
value: b
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
2: Stmt_ClassConst(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
type: Identifier(
|
||||||
|
name: array
|
||||||
|
)
|
||||||
|
consts: array(
|
||||||
|
0: Const(
|
||||||
|
name: Identifier(
|
||||||
|
name: ARRAY
|
||||||
|
)
|
||||||
|
value: Expr_Array(
|
||||||
|
items: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
3: Stmt_ClassConst(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
type: UnionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Foo
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Bar
|
||||||
|
)
|
||||||
|
)
|
||||||
|
2: Identifier(
|
||||||
|
name: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
consts: array(
|
||||||
|
0: Const(
|
||||||
|
name: Identifier(
|
||||||
|
name: FOO
|
||||||
|
)
|
||||||
|
value: Expr_ConstFetch(
|
||||||
|
name: Name(
|
||||||
|
parts: array(
|
||||||
|
0: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
195
test/code/parser/stmt/function/disjointNormalFormTypes.test
Normal file
195
test/code/parser/stmt/function/disjointNormalFormTypes.test
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
DNF types
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
class Test {
|
||||||
|
public (A&B)|(X&Y) $prop;
|
||||||
|
public readonly (A&B)|C $prop2;
|
||||||
|
}
|
||||||
|
|
||||||
|
function test((A&B)|(X&Y) $a): (A&B)|(X&Y) {}
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
array(
|
||||||
|
0: Stmt_Class(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
name: Identifier(
|
||||||
|
name: Test
|
||||||
|
)
|
||||||
|
extends: null
|
||||||
|
implements: array(
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
0: Stmt_Property(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: MODIFIER_PUBLIC (1)
|
||||||
|
type: UnionType(
|
||||||
|
types: array(
|
||||||
|
0: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: A
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: B
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: X
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Y
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
props: array(
|
||||||
|
0: Stmt_PropertyProperty(
|
||||||
|
name: VarLikeIdentifier(
|
||||||
|
name: prop
|
||||||
|
)
|
||||||
|
default: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Property(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: MODIFIER_PUBLIC | MODIFIER_READONLY (65)
|
||||||
|
type: UnionType(
|
||||||
|
types: array(
|
||||||
|
0: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: A
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: B
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: C
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
props: array(
|
||||||
|
0: Stmt_PropertyProperty(
|
||||||
|
name: VarLikeIdentifier(
|
||||||
|
name: prop2
|
||||||
|
)
|
||||||
|
default: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Function(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
name: Identifier(
|
||||||
|
name: test
|
||||||
|
)
|
||||||
|
params: array(
|
||||||
|
0: Param(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
flags: 0
|
||||||
|
type: UnionType(
|
||||||
|
types: array(
|
||||||
|
0: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: A
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: B
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: X
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Y
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
variadic: false
|
||||||
|
var: Expr_Variable(
|
||||||
|
name: a
|
||||||
|
)
|
||||||
|
default: null
|
||||||
|
)
|
||||||
|
)
|
||||||
|
returnType: UnionType(
|
||||||
|
types: array(
|
||||||
|
0: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: A
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: B
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: IntersectionType(
|
||||||
|
types: array(
|
||||||
|
0: Name(
|
||||||
|
parts: array(
|
||||||
|
0: X
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Name(
|
||||||
|
parts: array(
|
||||||
|
0: Y
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
56
test/code/parser/stmt/function/nullFalseTrueTypes.test
Normal file
56
test/code/parser/stmt/function/nullFalseTrueTypes.test
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
standalone null, false and true types
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function test(): null {}
|
||||||
|
function test(): false {}
|
||||||
|
function test(): true {}
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
array(
|
||||||
|
0: Stmt_Function(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
name: Identifier(
|
||||||
|
name: test
|
||||||
|
)
|
||||||
|
params: array(
|
||||||
|
)
|
||||||
|
returnType: Identifier(
|
||||||
|
name: null
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Function(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
name: Identifier(
|
||||||
|
name: test
|
||||||
|
)
|
||||||
|
params: array(
|
||||||
|
)
|
||||||
|
returnType: Identifier(
|
||||||
|
name: false
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
2: Stmt_Function(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
name: Identifier(
|
||||||
|
name: test
|
||||||
|
)
|
||||||
|
params: array(
|
||||||
|
)
|
||||||
|
returnType: Identifier(
|
||||||
|
name: true
|
||||||
|
)
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
32
test/code/parser/stmt/function/readonlyFunction.test
Normal file
32
test/code/parser/stmt/function/readonlyFunction.test
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
readonly function
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
function readonly() {}
|
||||||
|
readonly();
|
||||||
|
-----
|
||||||
|
array(
|
||||||
|
0: Stmt_Function(
|
||||||
|
attrGroups: array(
|
||||||
|
)
|
||||||
|
byRef: false
|
||||||
|
name: Identifier(
|
||||||
|
name: readonly
|
||||||
|
)
|
||||||
|
params: array(
|
||||||
|
)
|
||||||
|
returnType: null
|
||||||
|
stmts: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
1: Stmt_Expression(
|
||||||
|
expr: Expr_FuncCall(
|
||||||
|
name: Name(
|
||||||
|
parts: array(
|
||||||
|
0: readonly
|
||||||
|
)
|
||||||
|
)
|
||||||
|
args: array(
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
@ -127,6 +127,7 @@ array(
|
|||||||
attrGroups: array(
|
attrGroups: array(
|
||||||
)
|
)
|
||||||
flags: 0
|
flags: 0
|
||||||
|
type: null
|
||||||
consts: array(
|
consts: array(
|
||||||
0: Const(
|
0: Const(
|
||||||
name: Identifier(
|
name: Identifier(
|
||||||
|
@ -64,4 +64,28 @@ function test()
|
|||||||
function test()
|
function test()
|
||||||
{
|
{
|
||||||
// empty
|
// empty
|
||||||
}
|
}
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
function noDuplicateComment()
|
||||||
|
{
|
||||||
|
if (true):
|
||||||
|
// TEST 1
|
||||||
|
elseif (true):
|
||||||
|
// TEST 2
|
||||||
|
else:
|
||||||
|
// TEST 3
|
||||||
|
endif;
|
||||||
|
}
|
||||||
|
-----
|
||||||
|
function noDuplicateComment()
|
||||||
|
{
|
||||||
|
if (true) {
|
||||||
|
// TEST 1
|
||||||
|
} elseif (true) {
|
||||||
|
// TEST 2
|
||||||
|
} else {
|
||||||
|
// TEST 3
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -10,7 +10,9 @@ new class($a) extends A {
|
|||||||
$this->a = $a;
|
$this->a = $a;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
new readonly class {};
|
||||||
-----
|
-----
|
||||||
|
!!php7
|
||||||
new class
|
new class
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
@ -25,3 +27,6 @@ new class($a) extends A
|
|||||||
$this->a = $a;
|
$this->a = $a;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
new readonly class
|
||||||
|
{
|
||||||
|
};
|
||||||
|
9
test/code/prettyPrinter/expr/dynamicClassConstFetch.test
Normal file
9
test/code/prettyPrinter/expr/dynamicClassConstFetch.test
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
Dynamic class constant fetch
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
Foo::{bar()};
|
||||||
|
$foo::{bar()};
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
Foo::{bar()};
|
||||||
|
$foo::{bar()};
|
@ -2,10 +2,22 @@ Parentheses for complex new/instanceof expressions
|
|||||||
-----
|
-----
|
||||||
<?php
|
<?php
|
||||||
new ('a' . 'b');
|
new ('a' . 'b');
|
||||||
|
new (x);
|
||||||
|
new (foo());
|
||||||
|
new ('foo');
|
||||||
|
new (x[0]);
|
||||||
|
new (x->y);
|
||||||
|
new ((x)::$y);
|
||||||
$x instanceof ('a' . 'b');
|
$x instanceof ('a' . 'b');
|
||||||
$x instanceof ($y++);
|
$x instanceof ($y++);
|
||||||
-----
|
-----
|
||||||
!!php7
|
!!php7
|
||||||
new ('a' . 'b')();
|
new ('a' . 'b')();
|
||||||
|
new (x)();
|
||||||
|
new (foo())();
|
||||||
|
new ('foo')();
|
||||||
|
new (x[0])();
|
||||||
|
new (x->y)();
|
||||||
|
new ((x)::$y)();
|
||||||
$x instanceof ('a' . 'b');
|
$x instanceof ('a' . 'b');
|
||||||
$x instanceof ($y++);
|
$x instanceof ($y++);
|
||||||
|
@ -11,6 +11,9 @@ A::$$b[$c]();
|
|||||||
($a->b)();
|
($a->b)();
|
||||||
(A::$b)();
|
(A::$b)();
|
||||||
('a' . 'b')::X;
|
('a' . 'b')::X;
|
||||||
|
(A)::X;
|
||||||
|
(A)::$x;
|
||||||
|
(A)::x();
|
||||||
-----
|
-----
|
||||||
!!php7
|
!!php7
|
||||||
(function () {
|
(function () {
|
||||||
@ -22,4 +25,7 @@ $A::{$b[$c]}();
|
|||||||
A::${$b}[$c]();
|
A::${$b}[$c]();
|
||||||
($a->b)();
|
($a->b)();
|
||||||
(A::$b)();
|
(A::$b)();
|
||||||
('a' . 'b')::X;
|
('a' . 'b')::X;
|
||||||
|
(A)::X;
|
||||||
|
(A)::$x;
|
||||||
|
(A)::x();
|
||||||
|
@ -7,7 +7,7 @@ class Foo
|
|||||||
const A = 1, B = 2;
|
const A = 1, B = 2;
|
||||||
public const C = 3, D = 4;
|
public const C = 3, D = 4;
|
||||||
protected const E = 5, F = 6;
|
protected const E = 5, F = 6;
|
||||||
private const G = 7, H = 8;
|
private const int G = 7, H = 8;
|
||||||
}
|
}
|
||||||
-----
|
-----
|
||||||
!!php7
|
!!php7
|
||||||
@ -16,5 +16,5 @@ class Foo
|
|||||||
const A = 1, B = 2;
|
const A = 1, B = 2;
|
||||||
public const C = 3, D = 4;
|
public const C = 3, D = 4;
|
||||||
protected const E = 5, F = 6;
|
protected const E = 5, F = 6;
|
||||||
private const G = 7, H = 8;
|
private const int G = 7, H = 8;
|
||||||
}
|
}
|
||||||
|
18
test/code/prettyPrinter/stmt/disjointNormalFormTypes.test
Normal file
18
test/code/prettyPrinter/stmt/disjointNormalFormTypes.test
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
Union types
|
||||||
|
-----
|
||||||
|
<?php
|
||||||
|
|
||||||
|
class Test {
|
||||||
|
public (A&B)|(X&Y) $prop;
|
||||||
|
}
|
||||||
|
|
||||||
|
function test((A&B)|(X&Y) $a): (A&B)|(X&Y) {}
|
||||||
|
-----
|
||||||
|
!!php7
|
||||||
|
class Test
|
||||||
|
{
|
||||||
|
public (A&B)|(X&Y) $prop;
|
||||||
|
}
|
||||||
|
function test((A&B)|(X&Y) $a) : (A&B)|(X&Y)
|
||||||
|
{
|
||||||
|
}
|
9
test/fixtures/Suit.php
vendored
Normal file
9
test/fixtures/Suit.php
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
enum Suit
|
||||||
|
{
|
||||||
|
case Hearts;
|
||||||
|
case Diamonds;
|
||||||
|
case Clubs;
|
||||||
|
case Spades;
|
||||||
|
}
|
Reference in New Issue
Block a user