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 2021/11/30 11:04:49 UTC
[netbeans] branch php81-support updated (7f54ae6 -> f654361)
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch php81-support
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 7f54ae6 Merge pull request #3331 from junichi11/php81-final-class-constants
new 0846356 Convert from UnusableTypesUnhandledError to UnusableTypesHintError
new ab498d4 [NETBEANS-5599] PHP 8.1 Support: Never type (Part 1)
new 419c0ed [NETBEANS-5599] PHP 8.1 Support: Never type (Part 2)
new f654361 Merge pull request #3340 from junichi11/php81-never-type
The 6197 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:
php/php.api.phpmodule/manifest.mf | 2 +-
.../org/netbeans/modules/php/api/PhpVersion.java | 11 +
php/php.editor/nbproject/project.properties | 2 +-
php/php.editor/nbproject/project.xml | 2 +-
.../editor/completion/CompletionContextFinder.java | 1 +
.../php/editor/completion/PHPCodeCompletion.java | 2 +
.../php/editor/lexer/PHP5ColoringLexer.java | 2380 ++++++++++----------
.../modules/php/editor/lexer/PHPTokenId.java | 1 +
.../modules/php/editor/model/impl/Type.java | 8 +-
.../modules/php/editor/resources/layer.xml | 2 +-
.../editor/verification/PHP81UnhandledError.java | 4 +
.../editor/verification/ReturnTypeHintError.java | 48 +-
...ndledError.java => UnusableTypesHintError.java} | 194 +-
.../lexer/php81/neverType_01.pass | 122 +
.../returnTypes.php.testReturnType01.completion | 1 +
.../returnTypes.php.testReturnType03.completion | 1 +
.../returnTypes.php.testReturnType05.completion | 1 +
.../returnTypes.php.testReturnType07.completion | 1 +
.../returnTypes.php.testReturnType12.completion | 1 +
.../returnTypes.php.testReturnType13.completion | 1 +
.../returnTypes.php.testReturnType14.completion | 1 +
...Typing01.php.testReturnTypesTyping01.completion | 1 +
...Typing02.php.testReturnTypesTyping02.completion | 1 +
...Typing03.php.testReturnTypesTyping03.completion | 1 +
...yping04.php.testReturnTypesTyping04a.completion | 1 +
...yping04.php.testReturnTypesTyping04b.completion | 1 +
...Typing05.php.testReturnTypesTyping05.completion | 1 +
...Typing06.php.testReturnTypesTyping06.completion | 1 +
...Typing07.php.testReturnTypesTyping07.completion | 1 +
...yping08.php.testReturnTypesTyping08a.completion | 1 +
...yping08.php.testReturnTypesTyping08b.completion | 1 +
...Typing09.php.testReturnTypesTyping09.completion | 1 +
...Typing10.php.testReturnTypesTyping10.completion | 1 +
...Typing11.php.testReturnTypesTyping11.completion | 1 +
...yping12.php.testReturnTypesTyping12a.completion | 1 +
...yping12.php.testReturnTypesTyping12b.completion | 1 +
...nType.php.testVoidReturnType_Class01.completion | 1 +
...pe.php.testVoidReturnType_Function01.completion | 1 +
...e.php.testVoidReturnType_Interface01.completion | 1 +
....php.testObjectTypeHint_ReturnType02.completion | 1 +
...Functions.php.testArrowFunctions_05a.completion | 1 +
.../mixedType.php.testMixedType_05.completion | 1 +
...tions.php.testUnionTypesFunctions_04.completion | 1 +
...tions.php.testUnionTypesFunctions_09.completion | 1 +
...tions.php.testUnionTypesFunctions_15.completion | 1 +
...Methods.php.testUnionTypesMethods_07.completion | 1 +
.../php81/testNeverReturnType/neverReturnType.php | 47 +
...ype.php.testNeverReturnType_Class01.completion} | 7 +-
...Type.php.testNeverReturnType_Class02.completion | 5 +
...Type.php.testNeverReturnType_Class03.completion | 3 +
....php.testNeverReturnType_Function01.completion} | 7 +-
...e.php.testNeverReturnType_Function02.completion | 5 +
...e.php.testNeverReturnType_Function03.completion | 3 +
...php.testNeverReturnType_Interface01.completion} | 7 +-
....php.testNeverReturnType_Interface02.completion | 5 +
....php.testNeverReturnType_Interface03.completion | 3 +
...ype.php.testNeverReturnType_Trait01.completion} | 7 +-
...Type.php.testNeverReturnType_Trait02.completion | 5 +
...Type.php.testNeverReturnType_Trait03.completion | 3 +
.../data/testfiles/lexer/php81/neverType_01.php | 40 +
.../testNeverReturnTypeHint.php | 152 ++
...nTypeHint.php.testNeverReturnTypeHint_01.hints} | 0
...rnTypeHint.php.testNeverReturnTypeHint_02.hints | 66 +
.../testVoidReturnTypeHint.php | 18 +
...urnTypeHint.php.testVoidReturnTypeHint_01.hints | 0
...urnTypeHint.php.testVoidReturnTypeHint_02.hints | 0
.../testArrowFunctionReturnTypes_01.php | 21 +
...es_01.php.testArrowFunctionReturnTypes_01.hints | 3 +
.../UnusableTypesHintError/testFieldTypes_01.php | 60 +
.../testFieldTypes_01.php.testFieldTypes_01.hints | 12 +
.../UnusableTypesHintError/testMixedTypes_01.php | 37 +
.../testMixedTypes_01.php.testMixedTypes_01.hints | 13 +
.../UnusableTypesHintError/testNeverTypes_01.php | 40 +
.../testNeverTypes_01.php.testNeverTypes_01.hints | 13 +
.../testStaticReturnTypes_01.php | 46 +
...turnTypes_01.php.testStaticReturnTypes_01.hints | 15 +
.../UnusableTypesHintError/testUnionTypes_01.php | 71 +
.../testUnionTypes_01.php.testUnionTypes_01.hints | 49 +
.../editor/completion/PHP81CodeCompletionTest.java | 111 +
.../php/editor/lexer/PHP81FeaturesTest.java | 31 +
.../modules/php/editor/verification/HintsTest.java | 23 -
.../verification/ReturnTypeHintErrorTest.java | 66 +
.../verification/UnusableTypesHintErrorTest.java | 56 +
php/php.editor/tools/Php5ColoringScanner.flex | 6 +
84 files changed, 2492 insertions(+), 1375 deletions(-)
rename php/php.editor/src/org/netbeans/modules/php/editor/verification/{UnusableTypesUnhandledError.java => UnusableTypesHintError.java} (78%)
create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP81FeaturesTest/lexer/php81/neverType_01.pass
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php
copy php/php.editor/test/unit/data/testfiles/completion/lib/{php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion => php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class01.completion} (80%)
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class02.completion
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class03.completion
copy php/php.editor/test/unit/data/testfiles/completion/lib/{php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Function01.completion => php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function01.completion} (77%)
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function02.completion
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function03.completion
copy php/php.editor/test/unit/data/testfiles/completion/lib/{php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion => php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface01.completion} (79%)
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface02.completion
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface03.completion
copy php/php.editor/test/unit/data/testfiles/completion/lib/{php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion => php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait01.completion} (80%)
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait02.completion
create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait03.completion
create mode 100644 php/php.editor/test/unit/data/testfiles/lexer/php81/neverType_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/ReturnTypeHintError/testNeverReturnTypeHint.php
copy php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => php.editor/test/unit/data/testfiles/verification/ReturnTypeHintError/testNeverReturnTypeHint.php.testNeverReturnTypeHint_01.hints} (100%)
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/ReturnTypeHintError/testNeverReturnTypeHint.php.testNeverReturnTypeHint_02.hints
rename php/php.editor/test/unit/data/testfiles/verification/{ => ReturnTypeHintError}/testVoidReturnTypeHint.php (78%)
rename php/php.editor/test/unit/data/testfiles/verification/{ => ReturnTypeHintError}/testVoidReturnTypeHint.php.testVoidReturnTypeHint_01.hints (100%)
rename php/php.editor/test/unit/data/testfiles/verification/{ => ReturnTypeHintError}/testVoidReturnTypeHint.php.testVoidReturnTypeHint_02.hints (100%)
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testArrowFunctionReturnTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testArrowFunctionReturnTypes_01.php.testArrowFunctionReturnTypes_01.hints
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testFieldTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testFieldTypes_01.php.testFieldTypes_01.hints
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testMixedTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testMixedTypes_01.php.testMixedTypes_01.hints
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNeverTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNeverTypes_01.php.testNeverTypes_01.hints
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testStaticReturnTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testStaticReturnTypes_01.php.testStaticReturnTypes_01.hints
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP81CodeCompletionTest.java
create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP81FeaturesTest.java
create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/ReturnTypeHintErrorTest.java
create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintErrorTest.java
---------------------------------------------------------------------
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