Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[php] Fix #4205 -- fix precedence of 'require' and 'include' operators #4206

Merged
merged 1 commit into from
Aug 16, 2024
Merged

[php] Fix #4205 -- fix precedence of 'require' and 'include' operators #4206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions php/PhpParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,6 @@ expression
| Empty '(' chain ')' # SpecialWordExpression
| Eval '(' expression ')' # SpecialWordExpression
| Exit ( '(' ')' | parentheses)? # SpecialWordExpression
| (Include | IncludeOnce) expression # SpecialWordExpression
| (Require | RequireOnce) expression # SpecialWordExpression
| lambdaFunctionExpr # LambdaFunctionExpression
| matchExpr # MatchExpression
| <assoc = right> expression op = '**' expression # ArithmeticExpression
Expand All @@ -518,6 +516,8 @@ expression
| expression op = QuestionMark expression? ':' expression # ConditionalExpression
| expression op = '??' expression # NullCoalescingExpression
| expression op = '<=>' expression # SpaceshipExpression
| (Include | IncludeOnce) expression # IncludeExpression
| (Require | RequireOnce) expression # RequireExpression
| Throw expression # SpecialWordExpression
| arrayDestructuring Eq expression # ArrayDestructExpression
| assignable assignmentOperator attributes? expression # AssignmentExpression
Expand Down
5 changes: 5 additions & 0 deletions php/examples/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php
$x = 1;
echo $x;
echo "\n";

1 change: 1 addition & 0 deletions php/examples/config.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(htmlDocument (phpBlock (topStatement (statement (expressionStatement (expression (assignable (chain (chainOrigin (chainBase (keyedVariable $x))))) (assignmentOperator =) (expression (constant (literalConstant (numericConstant 1))))) ;))) (topStatement (statement (echoStatement echo (expressionList (expression (chain (chainOrigin (chainBase (keyedVariable $x)))))) ;))) (topStatement (statement (echoStatement echo (expressionList (expression (string " (interpolatedStringPart \n) "))) ;)))) <EOF>)
7 changes: 7 additions & 0 deletions php/examples/require-include.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php
require './config.php';
require "./config.php";
require "." . "/config.php";
require_once "./config.php";
include "./config.php";
include_once "." . "/config.php";
1 change: 1 addition & 0 deletions php/examples/require-include.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(htmlDocument (phpBlock (topStatement (statement (expressionStatement (expression require (expression (string './config.php'))) ;))) (topStatement (statement (expressionStatement (expression require (expression (string " (interpolatedStringPart ./config.php) "))) ;))) (topStatement (statement (expressionStatement (expression require (expression (expression (string " (interpolatedStringPart .) ")) . (expression (string " (interpolatedStringPart /config.php) ")))) ;))) (topStatement (statement (expressionStatement (expression require_once (expression (string " (interpolatedStringPart ./config.php) "))) ;))) (topStatement (statement (expressionStatement (expression include (expression (string " (interpolatedStringPart ./config.php) "))) ;))) (topStatement (statement (expressionStatement (expression include_once (expression (expression (string " (interpolatedStringPart .) ")) . (expression (string " (interpolatedStringPart /config.php) ")))) ;)))) <EOF>)