This is an automated email from the ASF dual-hosted git repository.
haidubogdan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 201b82600da Merge pull request #9266 from mbien/bump-webcommon-to-17
add 7ebcdfa7124 Support for PHP 8.5 part 1 Issue #9034
new 37fddc4c685 Merge pull request #9113 from haidubogdan/t_php85
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
create mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable22.java
create mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/CompositionExpression.java
create mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/verification/IncorrectFunctionCompositionHintError.java
copy
php/php.editor/src/org/netbeans/modules/php/editor/verification/{PHP84UnhandledError.java
=> PHP85UnhandledError.java} (52%)
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP85FeaturesTest/lexer/php85/pipeOperator_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP85FeaturesTest/lexer/php85/pipeOperator_02.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP85FeaturesTest/lexer/php85/pipeOperator_03.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php85/pipeOperator_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php85/pipeOperator_02.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php85/pipeOperator_03.pass
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/php85/pipeOperatorInlineExpression_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/php85/pipeOperatorInlineExpression_01.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/php85/pipeOperatorMultilineExpression_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/php85/pipeOperatorMultilineExpression_01.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/php85/pipeOperator_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/php85/pipeOperator_02.php
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/php85/pipeOperator_03.php
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_01.php
copy
contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
=>
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_01.php.errors
(100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_02.php
copy
contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
=>
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_02.php.errors
(100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_03.php
copy
contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
=>
php/php.editor/test/unit/data/testfiles/parser/php85/pipeOperator_03.php.errors
(100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testArrowFunctionMustBeParenthesized.php
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testArrowFunctionMustBeParenthesized.php.testArrowFunctionMustBeParenthesizedRightHandle.hints
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testInfixExpressionRightHandle.php
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testInfixExpressionRightHandle.php.testInfixExpressionRightHandle.hints
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testNonCallableRightHandle.php
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/IncorrectFunctionCompositionHintError/testNonCallableRightHandle.php.testNonCallableRightHandle.hints
create mode 100644
php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP85FeaturesTest.java
create mode 100644
php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/IncorrectFunctionCompositionHintErrorTest.java
---------------------------------------------------------------------
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