You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by tm...@apache.org on 2018/10/28 18:09:55 UTC
[incubator-netbeans] branch release100 updated (b4e96bd -> de8ea29)
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch release100
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from b4e96bd Merge pull request #977 from junichi11/cherry-picking-1461-1463
add b88d34f Don't extract phpstubs to simplify license handling
add 12c5647 Update phpsigfiles
add 930bb6f [NETBEANS-1550] Cannot set custom configuration of the inspection feature
add f9c08ff [NETBEANS-1507] PHPStan empty inspector Window
add b4e42f1 Improve PHPStan level
add 8119e32 [NETBEANS-1563] Error while parsing HEREDOC
add 7f80a3d [NETBEANS-1552] Syntax error for UVS
new de8ea29 Merge pull request #991 from junichi11/cherry-picking-php-commits
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:
.../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} | 0
.../data/testfiles/parser/netbeans1563_02.php} | 38 +-
.../testfiles/parser/netbeans1563_02.php.errors} | 0
.../data/testfiles/parser/netbeans1563_03.php} | 38 +-
.../testfiles/parser/netbeans1563_03.php.errors} | 0
.../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} | 0
.../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, 61201 insertions(+), 59240 deletions(-)
create mode 100644 php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_01.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_02.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_03.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_04.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_01.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_02.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_03.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_04.pass
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/uniformVariableSyntax_38.pass
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/lexer/netbeans1563_01.php} (53%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/lexer/netbeans1563_02.php} (53%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/lexer/netbeans1563_03.php} (53%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/lexer/netbeans1563_04.php} (53%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/parser/netbeans1563_01.php} (53%)
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/parser/netbeans1563_01.php.errors} (100%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/parser/netbeans1563_02.php} (53%)
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/parser/netbeans1563_02.php.errors} (100%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/parser/netbeans1563_03.php} (53%)
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/parser/netbeans1563_03.php.errors} (100%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/parser/netbeans1563_04.php} (53%)
copy webcommon/web.clientproject/test/qa-functional/data/simpleProject/public_html/refresh.js => php/php.editor/test/unit/data/testfiles/parser/netbeans1563_04.php.errors (100%)
copy php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java => test/unit/data/testfiles/parser/uniformVariableSyntax_38.php} (54%)
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/parser/uniformVariableSyntax_38.php.errors} (100%)
delete mode 100644 php/php.project/external/phpsigfiles-1.0-license.txt
create mode 100644 php/php.project/external/phpsigfiles-1.1-license.txt
create mode 100644 php/php.project/external/phpsigfiles-1.1-notice.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] 01/01: Merge pull request #991 from
junichi11/cherry-picking-php-commits
Posted by tm...@apache.org.
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 <to...@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-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists