This is an automated email from the ASF dual-hosted git repository.

haidubogdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 37fddc4c685790906a47b12f26020d04ccefd571
Merge: 201b82600da 7ebcdfa7124
Author: haidubogdan <[email protected]>
AuthorDate: Sat Mar 14 20:06:40 2026 +0200

    Merge pull request #9113 from haidubogdan/t_php85
    
    Support for PHP 8.5 pipe operator

 .../org/netbeans/modules/php/api/PhpVersion.java   |    7 +
 .../org/netbeans/modules/php/editor/CodeUtils.java |    1 +
 .../modules/php/editor/indent/FormatVisitor.java   |   18 +
 .../php/editor/indent/IndentationCounter.java      |    8 +
 .../modules/php/editor/lexer/LexUtilities.java     |    7 +-
 .../php/editor/lexer/PHP5ColoringLexer.java        |  184 +-
 .../modules/php/editor/parser/ASTPHP5Parser.java   | 4240 ++++++------
 .../modules/php/editor/parser/ASTPHP5Scanner.java  | 2786 ++++----
 .../modules/php/editor/parser/ASTPHP5Symbols.java  |  141 +-
 .../php/editor/parser/EncodedActionTable1.java     | 6851 +++++++++---------
 .../php/editor/parser/EncodedActionTable10.java    | 6975 +++++++++----------
 .../php/editor/parser/EncodedActionTable11.java    | 5991 ++++++++--------
 .../php/editor/parser/EncodedActionTable12.java    | 7227 +++++++++----------
 .../php/editor/parser/EncodedActionTable13.java    | 6191 ++++++++---------
 .../php/editor/parser/EncodedActionTable14.java    | 6061 ++++++++--------
 .../php/editor/parser/EncodedActionTable15.java    | 5909 ++++++++--------
 .../php/editor/parser/EncodedActionTable16.java    | 6199 ++++++++---------
 .../php/editor/parser/EncodedActionTable17.java    | 5601 +++++++--------
 .../php/editor/parser/EncodedActionTable18.java    | 7233 ++++++++++----------
 .../php/editor/parser/EncodedActionTable19.java    | 5313 +++++++-------
 .../php/editor/parser/EncodedActionTable2.java     | 4861 ++++++-------
 .../php/editor/parser/EncodedActionTable20.java    | 6849 +++++++++---------
 .../php/editor/parser/EncodedActionTable21.java    | 3255 ++++++---
 .../php/editor/parser/EncodedActionTable22.java    |  266 +
 .../php/editor/parser/EncodedActionTable3.java     | 6297 ++++++++---------
 .../php/editor/parser/EncodedActionTable4.java     | 6345 ++++++++---------
 .../php/editor/parser/EncodedActionTable5.java     | 5715 ++++++++--------
 .../php/editor/parser/EncodedActionTable6.java     | 6197 ++++++++---------
 .../php/editor/parser/EncodedActionTable7.java     | 6355 ++++++++---------
 .../php/editor/parser/EncodedActionTable8.java     | 5653 +++++++--------
 .../php/editor/parser/EncodedActionTable9.java     | 5407 +++++++--------
 .../php/editor/parser/PHP5ErrorHandlerImpl.java    |    2 +
 .../netbeans/modules/php/editor/parser/Utils.java  |    3 +
 .../parser/astnodes/CompositionExpression.java     |  106 +
 .../php/editor/parser/astnodes/Visitor.java        |    2 +
 .../parser/astnodes/visitors/DefaultVisitor.java   |    7 +
 .../modules/php/editor/resources/layer.xml         |    2 +
 .../IncorrectFunctionCompositionHintError.java     |  167 +
 .../editor/verification/PHP84UnhandledError.java   |    2 +-
 ...nhandledError.java => PHP85UnhandledError.java} |  102 +-
 .../lexer/php85/pipeOperator_01.pass               |   94 +
 .../lexer/php85/pipeOperator_02.pass               |  235 +
 .../lexer/php85/pipeOperator_03.pass               |   91 +
 .../parser/php85/pipeOperator_01.pass              |  337 +
 .../parser/php85/pipeOperator_02.pass              |  819 +++
 .../parser/php85/pipeOperator_03.pass              |  281 +
 .../php85/pipeOperatorInlineExpression_01.php      |   24 +
 .../pipeOperatorInlineExpression_01.php.formatted  |   24 +
 .../php85/pipeOperatorMultilineExpression_01.php   |   24 +
 ...ipeOperatorMultilineExpression_01.php.formatted |   25 +
 .../data/testfiles/lexer/php85/pipeOperator_01.php |   28 +
 .../data/testfiles/lexer/php85/pipeOperator_02.php |   50 +
 .../data/testfiles/lexer/php85/pipeOperator_03.php |   28 +
 .../testfiles/parser/php85/pipeOperator_01.php     |   28 +
 .../parser/php85/pipeOperator_01.php.errors        |    0
 .../testfiles/parser/php85/pipeOperator_02.php     |   50 +
 .../parser/php85/pipeOperator_02.php.errors        |    0
 .../testfiles/parser/php85/pipeOperator_03.php     |   28 +
 .../parser/php85/pipeOperator_03.php.errors        |    0
 .../testArrowFunctionMustBeParenthesized.php       |   24 +
 ...rowFunctionMustBeParenthesizedRightHandle.hints |    3 +
 .../testInfixExpressionRightHandle.php             |   31 +
 ...Handle.php.testInfixExpressionRightHandle.hints |    9 +
 .../testNonCallableRightHandle.php                 |   21 +
 ...ightHandle.php.testNonCallableRightHandle.hints |    2 +
 .../php/editor/indent/PHPFormatterTest.java        |   11 +
 .../php/editor/lexer/PHP85FeaturesTest.java        |   38 +
 .../php/editor/parser/ASTPHP5ParserTest.java       |   13 +
 .../php/editor/parser/PhpParserErrorTest.java      |   13 +
 .../modules/php/editor/parser/PrintASTVisitor.java |    9 +
 .../IncorrectFunctionCompositionHintErrorTest.java |   43 +
 php/php.editor/tools/ASTPHP5Parser.cup             |   20 +-
 php/php.editor/tools/ASTPHP5Scanner.flex           |    6 +
 php/php.editor/tools/Php5ColoringScanner.flex      |    2 +-
 74 files changed, 70738 insertions(+), 66209 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to