This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch release100
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit de8ea299a864293aa2caedbf84458700f21914fd
Merge: b4e96bd 7f80a3d
Author: Tomáš Myšík <tomas.my...@gmail.com>
AuthorDate: Sun Oct 28 19:09:49 2018 +0100
Merge pull request #991 from junichi11/cherry-picking-php-commits
Cherry picking PHP commits
.../modules/php/analysis/PHPStanAnalyzerImpl.java | 6 +-
.../modules/php/analysis/commands/PHPStan.java | 1 +
.../php/analysis/options/AnalysisOptions.java | 30 +-
.../php/analysis/parsers/PHPStanReportParser.java | 16 +-
.../analysis/ui/PHPStanLevelListCellRenderer.java | 3 +-
.../ui/analyzer/CodeSnifferCustomizerPanel.java | 18 +-
.../ui/analyzer/PHPStanCustomizerPanel.java | 13 +-
.../analysis/ui/options/PHPStanOptionsPanel.java | 19 +-
.../modules/php/analysis/util/AnalysisUtils.java | 4 +
.../data/phpstan/phpstan-log-with-other-output.xml | 2 +-
.../test/unit/data/phpstan/phpstan-log.xml | 6 +-
php/php.editor/build.xml | 43 +
.../php/editor/lexer/PHP5ColoringLexer.java | 604 +-
.../modules/php/editor/parser/ASTPHP5Parser.java | 1846 ++--
.../modules/php/editor/parser/ASTPHP5Scanner.java | 248 +-
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../php/editor/parser/EncodedActionTable1.java | 7282 ++++++++--------
.../php/editor/parser/EncodedActionTable10.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable11.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable12.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable13.java | 8540 ++++++++++---------
.../php/editor/parser/EncodedActionTable14.java | 487 ++
.../php/editor/parser/EncodedActionTable2.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable3.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable4.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable5.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable6.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable7.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable8.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable9.java | 9000 ++++++++++----------
.../parser/astnodes/DereferencableVariable.java | 3 +-
.../lexer/PHPLexerTest/lexer/netbeans1563_01.pass | 18 +
.../lexer/PHPLexerTest/lexer/netbeans1563_02.pass | 16 +
.../lexer/PHPLexerTest/lexer/netbeans1563_03.pass | 21 +
.../lexer/PHPLexerTest/lexer/netbeans1563_04.pass | 23 +
.../ASTPHP5ParserTest/parser/netbeans1563_01.pass | 45 +
.../ASTPHP5ParserTest/parser/netbeans1563_02.pass | 45 +
.../ASTPHP5ParserTest/parser/netbeans1563_03.pass | 73 +
.../ASTPHP5ParserTest/parser/netbeans1563_04.pass | 73 +
.../parser/uniformVariableSyntax_38.pass | 702 ++
.../unit/data/testfiles/lexer/netbeans1563_01.php} | 37 +-
.../unit/data/testfiles/lexer/netbeans1563_02.php} | 38 +-
.../unit/data/testfiles/lexer/netbeans1563_03.php} | 38 +-
.../unit/data/testfiles/lexer/netbeans1563_04.php} | 37 +-
.../data/testfiles/parser/netbeans1563_01.php} | 37 +-
.../testfiles/parser/netbeans1563_01.php.errors | 1 +
.../data/testfiles/parser/netbeans1563_02.php} | 38 +-
.../testfiles/parser/netbeans1563_02.php.errors | 1 +
.../data/testfiles/parser/netbeans1563_03.php} | 38 +-
.../testfiles/parser/netbeans1563_03.php.errors | 1 +
.../data/testfiles/parser/netbeans1563_04.php} | 37 +-
.../testfiles/parser/netbeans1563_04.php.errors | 0
.../testfiles/parser/uniformVariableSyntax_38.php} | 44 +-
.../parser/uniformVariableSyntax_38.php.errors | 1 +
.../modules/php/editor/lexer/PHPLexerTest.java | 17 +
.../php/editor/parser/ASTPHP5ParserTest.java | 23 +
.../php/editor/parser/PhpParserErrorTest.java | 23 +
php/php.editor/tools/ASTPHP5Parser.cup | 16 +-
php/php.editor/tools/ASTPHP5Scanner.flex | 42 +-
php/php.editor/tools/Php5ColoringScanner.flex | 40 +-
php/php.project/build.xml | 7 -
php/php.project/external/binaries-list | 2 +-
.../external/phpsigfiles-1.0-license.txt | 388 -
.../external/phpsigfiles-1.1-license.txt | 326 +
.../external/phpsigfiles-1.1-notice.txt | 9 +
php/php.project/nbproject/project.properties | 4 +-
.../modules/php/project/api/PhpSourcePath.java | 11 +-
67 files changed, 61205 insertions(+), 59240 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
