This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch php80-support
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 7e0621f Merge pull request #2335 from
junichi11/php80-static-return-type
new 94e6960 [NETBEANS-4443] PHP 8.0 Support: Mixed type v2 (Part 1)
new a6ccfd8 [NETBEANS-4443] PHP 8.0 Support: Mixed type v2 (Part 2)
new dabf717 Merge pull request #2342 from junichi11/php80-mixed-type-v2
The 4191 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 | 11 +
.../editor/completion/CompletionContextFinder.java | 1 +
.../php/editor/completion/PHPCodeCompletion.java | 29 +
.../php/editor/lexer/PHP5ColoringLexer.java | 2554 ++++++++++----------
.../modules/php/editor/lexer/PHPTokenId.java | 1 +
.../php/editor/model/impl/FunctionScopeImpl.java | 2 +-
.../php/editor/model/impl/MethodScopeImpl.java | 2 +-
.../modules/php/editor/model/impl/Type.java | 11 +-
.../editor/verification/PHP80UnhandledError.java | 4 +
.../verification/UnusableTypesUnhandledError.java | 52 +-
.../lexer/php80/mixedType_01.pass | 80 +
.../parser/php80/mixedTypeError_01.pass | 42 +
.../parser/php80/mixedType_01.pass | 253 ++
.../testMixedTypeImplementMethod01.php} | 28 +-
...hp.testMixedTypeImplementMethod01_PHP80.codegen | 2 +
.../testMixedTypeOverrideMethod01.php} | 28 +-
...php.testMixedTypeOverrideMethod01_PHP80.codegen | 3 +
.../byReferences.php.testByReferences01.completion | 1 +
.../byReferences.php.testByReferences03.completion | 1 +
.../byReferences.php.testByReferences05.completion | 1 +
.../byReferences.php.testByReferences07.completion | 1 +
.../byReferences.php.testByReferences08.completion | 1 +
.../byReferences.php.testByReferences10.completion | 1 +
.../byReferences.php.testByReferences12.completion | 1 +
.../byReferences.php.testByReferences14.completion | 1 +
.../byReferences.php.testByReferences16.completion | 1 +
.../byReferences.php.testByReferences18.completion | 1 +
.../byReferences.php.testByReferences20.completion | 1 +
.../byReferences.php.testByReferences22.completion | 1 +
.../byReferences.php.testByReferences24.completion | 1 +
.../byReferences.php.testByReferences26.completion | 1 +
.../byReferences.php.testByReferences28.completion | 1 +
.../byReferences.php.testByReferences30.completion | 1 +
.../byReferences.php.testByReferences32.completion | 1 +
.../byReferences.php.testByReferences34.completion | 1 +
.../byReferences.php.testByReferences36.completion | 1 +
...amdecltypes.php.testParamDeclTypes11.completion | 1 +
...amdecltypes.php.testParamDeclTypes14.completion | 1 +
...ramdecltypes.php.testParamDeclTypes5.completion | 1 +
...ramdecltypes.php.testParamDeclTypes8.completion | 1 +
...TypeHint.php.testCallableTypeHint_01.completion | 1 +
...TypeHint.php.testCallableTypeHint_03.completion | 1 +
.../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 +
...alarTypeHints.php.testBoolTypeHint01.completion | 1 +
...alarTypeHints.php.testBoolTypeHint03.completion | 1 +
...larTypeHints.php.testFloatTypeHint01.completion | 1 +
...larTypeHints.php.testFloatTypeHint03.completion | 1 +
...calarTypeHints.php.testIntTypeHint01.completion | 1 +
...calarTypeHints.php.testIntTypeHint03.completion | 1 +
...arTypeHints.php.testStringTypeHint01.completion | 1 +
...arTypeHints.php.testStringTypeHint03.completion | 1 +
...hp.testNullableTypes_ParameterType01.completion | 1 +
...hp.testNullableTypes_ParameterType03.completion | 1 +
...hp.testNullableTypes_ParameterType07.completion | 1 +
...hp.testNullableTypes_ParameterType09.completion | 1 +
...hp.testNullableTypes_ParameterType11.completion | 1 +
...hp.testNullableTypes_ParameterType13.completion | 1 +
...s.php.testNullableTypes_ReturnType01.completion | 1 +
...s.php.testNullableTypes_ReturnType03.completion | 1 +
...s.php.testNullableTypes_ReturnType05.completion | 1 +
...s.php.testNullableTypes_ReturnType09.completion | 1 +
...s.php.testNullableTypes_ReturnType11.completion | 1 +
...s.php.testNullableTypes_ReturnType13.completion | 1 +
...s.php.testNullableTypes_ReturnType15.completion | 1 +
...tNullableTypes_TypingParameterType01.completion | 1 +
...tNullableTypes_TypingParameterType02.completion | 1 +
...tNullableTypes_TypingParameterType03.completion | 1 +
...tNullableTypes_TypingParameterType04.completion | 1 +
...tNullableTypes_TypingParameterType05.completion | 1 +
...tNullableTypes_TypingParameterType06.completion | 1 +
...tNullableTypes_TypingParameterType07.completion | 1 +
...tNullableTypes_TypingParameterType08.completion | 1 +
...tNullableTypes_TypingParameterType09.completion | 1 +
...tNullableTypes_TypingParameterType10.completion | 1 +
...tNullableTypes_TypingParameterType11.completion | 1 +
...tNullableTypes_TypingParameterType12.completion | 1 +
...testNullableTypes_TypingReturnType01.completion | 1 +
...testNullableTypes_TypingReturnType02.completion | 1 +
...testNullableTypes_TypingReturnType03.completion | 1 +
...testNullableTypes_TypingReturnType04.completion | 1 +
...testNullableTypes_TypingReturnType05.completion | 1 +
...testNullableTypes_TypingReturnType06.completion | 1 +
...testNullableTypes_TypingReturnType07.completion | 1 +
...testNullableTypes_TypingReturnType08.completion | 1 +
...testNullableTypes_TypingReturnType09.completion | 1 +
...testNullableTypes_TypingReturnType10.completion | 1 +
...testNullableTypes_TypingReturnType11.completion | 1 +
...testNullableTypes_TypingReturnType12.completion | 1 +
...NullableTypesInPHPDoc_NullableType04.completion | 1 +
...NullableTypesInPHPDoc_NullableType06.completion | 1 +
...nType.php.testVoidReturnType_Class01.completion | 1 +
...pe.php.testVoidReturnType_Function01.completion | 1 +
...e.php.testVoidReturnType_Interface01.completion | 1 +
...p.testObjectTypeHint_ParameterType01.completion | 1 +
....php.testObjectTypeHint_ReturnType02.completion | 1 +
...Functions.php.testArrowFunctions_03a.completion | 1 +
...Functions.php.testArrowFunctions_04a.completion | 1 +
...Functions.php.testArrowFunctions_05a.completion | 1 +
...Functions.php.testArrowFunctions_06a.completion | 1 +
...Functions.php.testArrowFunctions_17b.completion | 1 +
...Functions.php.testArrowFunctions_23a.completion | 1 +
...Functions.php.testArrowFunctions_23b.completion | 1 +
...ss.php.testTypedProperties20Class_06.completion | 1 +
...ss.php.testTypedProperties20Class_08.completion | 1 +
...ss.php.testTypedProperties20Class_10.completion | 1 +
...ss.php.testTypedProperties20Class_16.completion | 1 +
...ss.php.testTypedProperties20Class_17.completion | 1 +
...it.php.testTypedProperties20Trait_06.completion | 1 +
...it.php.testTypedProperties20Trait_08.completion | 1 +
...it.php.testTypedProperties20Trait_09.completion | 1 +
...it.php.testTypedProperties20Trait_11.completion | 1 +
...it.php.testTypedProperties20Trait_17.completion | 1 +
...it.php.testTypedProperties20Trait_18.completion | 1 +
.../lib/php80/testMixedType/mixedType.php} | 28 +-
.../mixedType.php.testMixedType_01.completion} | 7 +-
.../mixedType.php.testMixedType_02.completion | 6 +
.../mixedType.php.testMixedType_03.completion} | 6 +-
.../mixedType.php.testMixedType_04.completion | 6 +
.../mixedType.php.testMixedType_05.completion} | 6 +-
.../mixedType.php.testMixedType_06.completion | 6 +
.../mixedType.php.testMixedType_07.completion} | 5 +-
.../mixedType.php.testMixedType_08.completion} | 4 +-
.../mixedType.php.testMixedType_09.completion} | 6 +-
.../testMixedTypeImplementMethod01.php} | 28 +-
....php.testMixedTypeImplementMethod01.cccustomtpl | 4 +
.../testMixedTypeOverrideMethod01.php} | 28 +-
...1.php.testMixedTypeOverrideMethod01.cccustomtpl | 4 +
...estUnionTypesFunctionParameterType04.completion | 1 +
...tions.php.testUnionTypesFunctions_04.completion | 1 +
...tions.php.testUnionTypesFunctions_09.completion | 1 +
...tions.php.testUnionTypesFunctions_15.completion | 1 +
...Methods.php.testUnionTypesMethods_01.completion | 1 +
...Methods.php.testUnionTypesMethods_05.completion | 1 +
...Methods.php.testUnionTypesMethods_07.completion | 1 +
.../issue204958.php.testUseCase1.completion | 1 +
.../tests225089.php.testUseCase1.completion | 1 +
.../tests225089.php.testUseCase2.completion | 1 +
.../tests225089.php.testUseCase3.completion | 1 +
.../tests225089.php.testUseCase4.completion | 1 +
.../issue242398_01.php.testUseCase1.completion | 1 +
.../issue242398_02.php.testUseCase2.completion | 1 +
.../testPHP80MixedReturnType.php} | 28 +-
.../testPHP80MixedReturnType.php.indexed | 30 +
.../testfiles/lexer/php80/mixedType_01.php} | 29 +-
.../testfiles/parser/php80/mixedTypeError_01.php} | 27 +-
.../parser/php80/mixedTypeError_01.php.errors | 7 +
.../testfiles/parser/php80/mixedType_01.php} | 29 +-
.../parser/php80/mixedType_01.php.errors} | 0
.../testMixedTypeImplementMethod01.php} | 28 +-
...mplementMethod01.php.testMixedTypeFix_01.fixed} | 28 +-
...ypeImplementMethod01.php.testMixedType_01.hints | 5 +
.../SelectedPropertyMethodsCreatorTest.java | 16 +
.../editor/completion/PHP80CodeCompletionTest.java | 45 +
.../modules/php/editor/index/PHPIndexTest.java | 4 +
.../php/editor/lexer/PHP80FeaturesTest.java | 4 +
.../php/editor/parser/ASTPHP5ParserTest.java | 8 +
.../php/editor/parser/PhpParserErrorTest.java | 8 +
.../ImplementAbstractMethodsHintErrorTest.java | 8 +
php/php.editor/tools/Php5ColoringScanner.flex | 6 +
180 files changed, 2162 insertions(+), 1526 deletions(-)
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest/lexer/php80/mixedType_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/mixedTypeError_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/mixedType_01.pass
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/codegen/testMixedTypeImplementMethod01/testMixedTypeImplementMethod01.php}
(54%)
create mode 100644
php/php.editor/test/unit/data/testfiles/codegen/testMixedTypeImplementMethod01/testMixedTypeImplementMethod01.php.testMixedTypeImplementMethod01_PHP80.codegen
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/codegen/testMixedTypeOverrideMethod01/testMixedTypeOverrideMethod01.php}
(55%)
create mode 100644
php/php.editor/test/unit/data/testfiles/codegen/testMixedTypeOverrideMethod01/testMixedTypeOverrideMethod01.php.testMixedTypeOverrideMethod01_PHP80.codegen
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=> data/testfiles/completion/lib/php80/testMixedType/mixedType.php} (55%)
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion
=> php80/testMixedType/mixedType.php.testMixedType_01.completion} (87%)
create mode 100644
php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_02.completion
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{tests242398/issue242398_02.php.testUseCase2.completion
=> php80/testMixedType/mixedType.php.testMixedType_03.completion} (83%)
create mode 100644
php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_04.completion
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion
=> php80/testMixedType/mixedType.php.testMixedType_05.completion} (83%)
create mode 100644
php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_06.completion
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion
=> php80/testMixedType/mixedType.php.testMixedType_07.completion} (82%)
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion
=> php80/testMixedType/mixedType.php.testMixedType_08.completion} (87%)
copy
php/php.editor/test/unit/data/testfiles/completion/lib/{tests242398/issue242398_02.php.testUseCase2.completion
=> php80/testMixedType/mixedType.php.testMixedType_09.completion} (82%)
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/completion/lib/php80/testMixedTypeImplementMethod01/testMixedTypeImplementMethod01.php}
(54%)
create mode 100644
php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedTypeImplementMethod01/testMixedTypeImplementMethod01.php.testMixedTypeImplementMethod01.cccustomtpl
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/completion/lib/php80/testMixedTypeOverrideMethod01/testMixedTypeOverrideMethod01.php}
(55%)
create mode 100644
php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedTypeOverrideMethod01/testMixedTypeOverrideMethod01.php.testMixedTypeOverrideMethod01.cccustomtpl
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=> data/testfiles/index/testPHP80MixedReturnType/testPHP80MixedReturnType.php}
(55%)
create mode 100644
php/php.editor/test/unit/data/testfiles/index/testPHP80MixedReturnType/testPHP80MixedReturnType.php.indexed
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=> data/testfiles/lexer/php80/mixedType_01.php} (55%)
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=> data/testfiles/parser/php80/mixedTypeError_01.php} (54%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php80/mixedTypeError_01.php.errors
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=> data/testfiles/parser/php80/mixedType_01.php} (55%)
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=> php.editor/test/unit/data/testfiles/parser/php80/mixedType_01.php.errors}
(100%)
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/verification/ImplementAbstractMethodsHintError/testMixedTypeImplementMethod01.php}
(54%)
copy
php/php.editor/test/unit/{src/org/netbeans/modules/php/editor/lexer/PHP80FeaturesTest.java
=>
data/testfiles/verification/ImplementAbstractMethodsHintError/testMixedTypeImplementMethod01.php.testMixedTypeFix_01.fixed}
(55%)
create mode 100644
php/php.editor/test/unit/data/testfiles/verification/ImplementAbstractMethodsHintError/testMixedTypeImplementMethod01.php.testMixedType_01.hints
---------------------------------------------------------------------
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
