This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 4a3f9bcfde0ffd8bb13a5874559783a8833533c9 Merge: f53aa038bb ffd958e6d8 Author: Junichi Yamamoto <junich...@apache.org> AuthorDate: Wed Feb 21 19:44:07 2024 +0900 Merge pull request #7056 from apache/php-nb22-features PHP features for NB22 .../php/dbgp/breakpoints/BreakpointModel.java | 44 +- .../php/dbgp/breakpoints/ExceptionBreakpoint.java | 40 + .../modules/php/dbgp/packets/RunResponse.java | 31 +- php/php.editor/nbproject/project.properties | 2 +- .../org/netbeans/modules/php/editor/CodeUtils.java | 1 + .../modules/php/editor/api/ElementQuery.java | 11 + .../modules/php/editor/codegen/AutoImport.java | 971 +++++ .../editor/codegen/PHPCodeTemplateProcessor.java | 69 +- .../php/editor/completion/PHPCodeCompletion.java | 4 +- .../php/editor/completion/PHPCompletionItem.java | 167 +- .../php/editor/elements/IndexQueryImpl.java | 20 + .../modules/php/editor/indent/TokenFormatter.java | 8 + .../modules/php/editor/options/Bundle.properties | 15 + .../php/editor/options/CodeCompletionPanel.form | 285 +- .../php/editor/options/CodeCompletionPanel.java | 317 +- .../modules/php/editor/options/OptionsUtils.java | 89 + .../testGroupUsesC01/testGroupUsesC01.php} | 31 +- ...esC01.php.testGroupUsesC01_Const01a.autoimport} | 32 +- ...esC01.php.testGroupUsesC01_Const01b.autoimport} | 32 +- ...sesC01.php.testGroupUsesC01_Const02.autoimport} | 32 +- ...sesC01.php.testGroupUsesC01_Const03.autoimport} | 32 +- ...esC01.php.testGroupUsesC01_Const04a.autoimport} | 32 +- ...esC01.php.testGroupUsesC01_Const04b.autoimport} | 32 +- ...01.php.testGroupUsesC01_Function01a.autoimport} | 32 +- ...01.php.testGroupUsesC01_Function01b.autoimport} | 31 +- ...01.php.testGroupUsesC01_Function01c.autoimport} | 32 +- ...01.php.testGroupUsesC01_Function01d.autoimport} | 31 +- ...sesC01.php.testGroupUsesC01_Type01a.autoimport} | 32 +- ...sesC01.php.testGroupUsesC01_Type01b.autoimport} | 31 +- .../testGroupUsesF01/testGroupUsesF01.php} | 31 +- ...esF01.php.testGroupUsesF01_Const01a.autoimport} | 32 +- ...esF01.php.testGroupUsesF01_Const01b.autoimport} | 31 +- ...esF01.php.testGroupUsesF01_Const01c.autoimport} | 32 +- ...esF01.php.testGroupUsesF01_Const01d.autoimport} | 31 +- ...F01.php.testGroupUsesF01_Function01.autoimport} | 31 +- ...01.php.testGroupUsesF01_Function02a.autoimport} | 32 +- ...01.php.testGroupUsesF01_Function02b.autoimport} | 32 +- ...01.php.testGroupUsesF01_Function02c.autoimport} | 32 +- ...01.php.testGroupUsesF01_Function02d.autoimport} | 32 +- ...01.php.testGroupUsesF01_Function03a.autoimport} | 32 +- ...01.php.testGroupUsesF01_Function03b.autoimport} | 32 +- ...sesF01.php.testGroupUsesF01_Type01a.autoimport} | 32 +- ...sesF01.php.testGroupUsesF01_Type01b.autoimport} | 31 +- .../testGroupUsesT01/testGroupUsesT01.php} | 30 +- ...esT01.php.testGroupUsesT01_Const01a.autoimport} | 31 +- ...esT01.php.testGroupUsesT01_Const01b.autoimport} | 30 +- ...01.php.testGroupUsesT01_Function01a.autoimport} | 31 +- ...01.php.testGroupUsesT01_Function01b.autoimport} | 30 +- ...UsesT01.php.testGroupUsesT01_Type01.autoimport} | 30 +- ...sesT01.php.testGroupUsesT01_Type02a.autoimport} | 31 +- ...sesT01.php.testGroupUsesT01_Type02b.autoimport} | 31 +- ...sesT01.php.testGroupUsesT01_Type03a.autoimport} | 31 +- ...sesT01.php.testGroupUsesT01_Type03b.autoimport} | 31 +- ...UsesT01.php.testGroupUsesT01_Type04.autoimport} | 31 +- ...UsesT01.php.testGroupUsesT01_Type05.autoimport} | 31 +- ...sesT01.php.testGroupUsesT01_Type06a.autoimport} | 31 +- ...sesT01.php.testGroupUsesT01_Type06b.autoimport} | 31 +- .../testGroupUsesT02/testGroupUsesT02.php} | 32 +- ...esT02.php.testGroupUsesT02_Const01a.autoimport} | 33 +- ...esT02.php.testGroupUsesT02_Const01b.autoimport} | 32 +- ...02.php.testGroupUsesT02_Function01a.autoimport} | 33 +- ...02.php.testGroupUsesT02_Function01b.autoimport} | 32 +- ...UsesT02.php.testGroupUsesT02_Type01.autoimport} | 33 +- ...UsesT02.php.testGroupUsesT02_Type02.autoimport} | 33 +- ...UsesT02.php.testGroupUsesT02_Type03.autoimport} | 33 +- ...UsesT02.php.testGroupUsesT02_Type04.autoimport} | 33 +- ...UsesT02.php.testGroupUsesT02_Type05.autoimport} | 33 +- ...sesT02.php.testGroupUsesT02_Type06a.autoimport} | 33 +- ...sesT02.php.testGroupUsesT02_Type06b.autoimport} | 33 +- .../testGroupUsesT03/testGroupUsesT03.php} | 37 +- ...esT03.php.testGroupUsesT03_Const01a.autoimport} | 38 +- ...esT03.php.testGroupUsesT03_Const01b.autoimport} | 37 +- ...03.php.testGroupUsesT03_Function01a.autoimport} | 38 +- ...03.php.testGroupUsesT03_Function01b.autoimport} | 37 +- ...UsesT03.php.testGroupUsesT03_Type01.autoimport} | 38 +- ...UsesT03.php.testGroupUsesT03_Type02.autoimport} | 38 +- ...UsesT03.php.testGroupUsesT03_Type03.autoimport} | 38 +- ...UsesT03.php.testGroupUsesT03_Type04.autoimport} | 38 +- ...UsesT03.php.testGroupUsesT03_Type05.autoimport} | 38 +- .../testGroupUsesT04/testGroupUsesT04.php} | 29 +- ...esT04.php.testGroupUsesT04_Const01a.autoimport} | 30 +- ...esT04.php.testGroupUsesT04_Const01b.autoimport} | 29 +- ...04.php.testGroupUsesT04_Function01a.autoimport} | 30 +- ...04.php.testGroupUsesT04_Function01b.autoimport} | 29 +- ...UsesT04.php.testGroupUsesT04_Type01.autoimport} | 30 +- ...UsesT04.php.testGroupUsesT04_Type02.autoimport} | 29 +- ...sesT04.php.testGroupUsesT04_Type03a.autoimport} | 30 +- ...sesT04.php.testGroupUsesT04_Type03b.autoimport} | 29 +- ...UsesT04.php.testGroupUsesT04_Type04.autoimport} | 30 +- ...UsesT04.php.testGroupUsesT04_Type05.autoimport} | 31 +- ...UsesT04.php.testGroupUsesT04_Type06.autoimport} | 30 +- .../testGroupUsesTC01a/testGroupUsesTC01a.php} | 35 +- ...01a.php.testGroupUsesTC01a_Const01a.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const01b.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const01c.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const01d.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const02a.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const02b.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const02c.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const02d.autoimport} | 36 +- ...C01a.php.testGroupUsesTC01a_Const03.autoimport} | 36 +- ...C01a.php.testGroupUsesTC01a_Const04.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const05a.autoimport} | 36 +- ...01a.php.testGroupUsesTC01a_Const05b.autoimport} | 36 +- ....php.testGroupUsesTC01a_Function01a.autoimport} | 36 +- ....php.testGroupUsesTC01a_Function01b.autoimport} | 35 +- ....php.testGroupUsesTC01a_Function01c.autoimport} | 37 +- ....php.testGroupUsesTC01a_Function01d.autoimport} | 35 +- ...TC01a.php.testGroupUsesTC01a_Type01.autoimport} | 36 +- ...C01a.php.testGroupUsesTC01a_Type02a.autoimport} | 36 +- ...C01a.php.testGroupUsesTC01a_Type02b.autoimport} | 36 +- ...C01a.php.testGroupUsesTC01a_Type03a.autoimport} | 37 +- ...C01a.php.testGroupUsesTC01a_Type03b.autoimport} | 36 +- .../testGroupUsesTC01b/testGroupUsesTC01b.php} | 35 +- ...01b.php.testGroupUsesTC01b_Const01a.autoimport} | 36 +- ...01b.php.testGroupUsesTC01b_Const01b.autoimport} | 35 +- ...01b.php.testGroupUsesTC01b_Const01c.autoimport} | 36 +- ...01b.php.testGroupUsesTC01b_Const01d.autoimport} | 35 +- ...01b.php.testGroupUsesTC01b_Const02a.autoimport} | 36 +- ...01b.php.testGroupUsesTC01b_Const02b.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Const03.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Const04.autoimport} | 36 +- ...01b.php.testGroupUsesTC01b_Const05a.autoimport} | 36 +- ...01b.php.testGroupUsesTC01b_Const05b.autoimport} | 36 +- ....php.testGroupUsesTC01b_Function01a.autoimport} | 36 +- ....php.testGroupUsesTC01b_Function01b.autoimport} | 35 +- ....php.testGroupUsesTC01b_Function01c.autoimport} | 36 +- ....php.testGroupUsesTC01b_Function01d.autoimport} | 34 +- ...TC01b.php.testGroupUsesTC01b_Type01.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Type02a.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Type02b.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Type03a.autoimport} | 36 +- ...C01b.php.testGroupUsesTC01b_Type03b.autoimport} | 35 +- .../testGroupUsesTF01/testGroupUsesTF01.php} | 41 +- ...1.php.testGroupUsesTF01_Function01a.autoimport} | 42 +- ...1.php.testGroupUsesTF01_Function01b.autoimport} | 41 +- ...1.php.testGroupUsesTF01_Function01c.autoimport} | 42 +- ...1.php.testGroupUsesTF01_Function01d.autoimport} | 41 +- ...1.php.testGroupUsesTF01_Function02a.autoimport} | 42 +- ...1.php.testGroupUsesTF01_Function02b.autoimport} | 42 +- ...1.php.testGroupUsesTF01_Function03a.autoimport} | 42 +- ...1.php.testGroupUsesTF01_Function03b.autoimport} | 42 +- ...01.php.testGroupUsesTF01_Function04.autoimport} | 42 +- ...01.php.testGroupUsesTF01_Function05.autoimport} | 42 +- ...01.php.testGroupUsesTF01_Function06.autoimport} | 42 +- ...esTF01.php.testGroupUsesTF01_Type01.autoimport} | 42 +- ...esTF01.php.testGroupUsesTF01_Type02.autoimport} | 42 +- ...esTF01.php.testGroupUsesTF01_Type03.autoimport} | 42 +- .../testGroupUsesTFC01/testGroupUsesTFC01.php} | 41 +- ...C01.php.testGroupUsesTFC01_Const01a.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const01b.autoimport} | 41 +- ...C01.php.testGroupUsesTFC01_Const01c.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const01d.autoimport} | 41 +- ...FC01.php.testGroupUsesTFC01_Const02.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const03.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const04.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const05.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const06.autoimport} | 41 +- ...FC01.php.testGroupUsesTFC01_Const07.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const08.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Const09.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const10a.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const10b.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const10c.autoimport} | 42 +- ...C01.php.testGroupUsesTFC01_Const10d.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function01a.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function01b.autoimport} | 41 +- ....php.testGroupUsesTFC01_Function01c.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function01d.autoimport} | 41 +- ....php.testGroupUsesTFC01_Function02a.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function02b.autoimport} | 42 +- ...1.php.testGroupUsesTFC01_Function03.autoimport} | 42 +- ...1.php.testGroupUsesTFC01_Function04.autoimport} | 42 +- ...1.php.testGroupUsesTFC01_Function05.autoimport} | 42 +- ...1.php.testGroupUsesTFC01_Function06.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function07a.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function07b.autoimport} | 41 +- ....php.testGroupUsesTFC01_Function07c.autoimport} | 42 +- ....php.testGroupUsesTFC01_Function07d.autoimport} | 41 +- ...TFC01.php.testGroupUsesTFC01_Type01.autoimport} | 42 +- ...TFC01.php.testGroupUsesTFC01_Type02.autoimport} | 42 +- ...TFC01.php.testGroupUsesTFC01_Type03.autoimport} | 42 +- ...TFC01.php.testGroupUsesTFC01_Type04.autoimport} | 42 +- ...TFC01.php.testGroupUsesTFC01_Type05.autoimport} | 42 +- ...TFC01.php.testGroupUsesTFC01_Type06.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Type07a.autoimport} | 42 +- ...FC01.php.testGroupUsesTFC01_Type07b.autoimport} | 41 +- .../testInSameNamespace01.php} | 28 +- ...ce01.php.testInSameNamespace01_Type.autoimport} | 28 +- .../testMixedUsesC01/testMixedUsesC01.php} | 34 +- ...esC01.php.testMixedUsesC01_Const01a.autoimport} | 35 +- ...esC01.php.testMixedUsesC01_Const01b.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const02.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const03.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const04.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const05.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const06.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const07.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const08.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const09.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Const10.autoimport} | 35 +- ...esC01.php.testMixedUsesC01_Const11a.autoimport} | 35 +- ...esC01.php.testMixedUsesC01_Const11b.autoimport} | 35 +- ...01.php.testMixedUsesC01_Function01a.autoimport} | 35 +- ...01.php.testMixedUsesC01_Function01b.autoimport} | 34 +- ...01.php.testMixedUsesC01_Function01c.autoimport} | 35 +- ...01.php.testMixedUsesC01_Function01d.autoimport} | 34 +- ...sesC01.php.testMixedUsesC01_Type01a.autoimport} | 35 +- ...sesC01.php.testMixedUsesC01_Type01b.autoimport} | 34 +- .../testMixedUsesF01/testMixedUsesF01.php} | 35 +- ...esF01.php.testMixedUsesF01_Const01a.autoimport} | 36 +- ...esF01.php.testMixedUsesF01_Const01b.autoimport} | 35 +- ...esF01.php.testMixedUsesF01_Const01c.autoimport} | 36 +- ...esF01.php.testMixedUsesF01_Const01d.autoimport} | 35 +- ...01.php.testMixedUsesF01_Function01a.autoimport} | 36 +- ...01.php.testMixedUsesF01_Function01b.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function02.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function03.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function04.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function05.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function06.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function07.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function08.autoimport} | 36 +- ...F01.php.testMixedUsesF01_Function09.autoimport} | 36 +- ...sesF01.php.testMixedUsesF01_Type01a.autoimport} | 36 +- ...sesF01.php.testMixedUsesF01_Type01b.autoimport} | 35 +- .../testMixedUsesT01/testMixedUsesT01.php} | 32 +- ...esT01.php.testMixedUsesT01_Const01a.autoimport} | 33 +- ...esT01.php.testMixedUsesT01_Const01b.autoimport} | 32 +- ...01.php.testMixedUsesT01_Function01a.autoimport} | 33 +- ...01.php.testMixedUsesT01_Function01b.autoimport} | 32 +- ...UsesT01.php.testMixedUsesT01_Type01.autoimport} | 33 +- ...UsesT01.php.testMixedUsesT01_Type02.autoimport} | 33 +- ...sesT01.php.testMixedUsesT01_Type03a.autoimport} | 33 +- ...sesT01.php.testMixedUsesT01_Type03b.autoimport} | 33 +- ...UsesT01.php.testMixedUsesT01_Type04.autoimport} | 33 +- ...UsesT01.php.testMixedUsesT01_Type05.autoimport} | 33 +- .../testMixedUsesTC01/testMixedUsesTC01.php} | 39 +- ...TC01.php.testMixedUsesTC01_Const01a.autoimport} | 40 +- ...TC01.php.testMixedUsesTC01_Const01b.autoimport} | 39 +- ...TC01.php.testMixedUsesTC01_Const01c.autoimport} | 40 +- ...TC01.php.testMixedUsesTC01_Const01d.autoimport} | 39 +- ...sTC01.php.testMixedUsesTC01_Const02.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const03.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const04.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const05.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const06.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const07.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const08.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Const09.autoimport} | 40 +- ...1.php.testMixedUsesTC01_Function01a.autoimport} | 40 +- ...1.php.testMixedUsesTC01_Function01b.autoimport} | 39 +- ...1.php.testMixedUsesTC01_Function01c.autoimport} | 40 +- ...1.php.testMixedUsesTC01_Function01d.autoimport} | 38 +- ...esTC01.php.testMixedUsesTC01_Type01.autoimport} | 40 +- ...esTC01.php.testMixedUsesTC01_Type02.autoimport} | 40 +- ...esTC01.php.testMixedUsesTC01_Type03.autoimport} | 40 +- ...esTC01.php.testMixedUsesTC01_Type04.autoimport} | 40 +- ...esTC01.php.testMixedUsesTC01_Type05.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Type06a.autoimport} | 40 +- ...sTC01.php.testMixedUsesTC01_Type06b.autoimport} | 39 +- .../testMixedUsesTCF01/testMixedUsesTCF01.php} | 41 +- ...F01.php.testMixedUsesTCF01_Const01a.autoimport} | 42 +- ...F01.php.testMixedUsesTCF01_Const01b.autoimport} | 41 +- ...F01.php.testMixedUsesTCF01_Const01c.autoimport} | 42 +- ...F01.php.testMixedUsesTCF01_Const01d.autoimport} | 41 +- ...CF01.php.testMixedUsesTCF01_Const02.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Const03.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Const04.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Const05.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Const06.autoimport} | 42 +- ...F01.php.testMixedUsesTCF01_Const07a.autoimport} | 42 +- ...F01.php.testMixedUsesTCF01_Const07b.autoimport} | 41 +- ...F01.php.testMixedUsesTCF01_Const07c.autoimport} | 42 +- ...F01.php.testMixedUsesTCF01_Const07d.autoimport} | 41 +- ....php.testMixedUsesTCF01_Function01a.autoimport} | 42 +- ....php.testMixedUsesTCF01_Function01b.autoimport} | 41 +- ....php.testMixedUsesTCF01_Function01c.autoimport} | 42 +- ....php.testMixedUsesTCF01_Function01d.autoimport} | 41 +- ...1.php.testMixedUsesTCF01_Function02.autoimport} | 42 +- ...1.php.testMixedUsesTCF01_Function03.autoimport} | 42 +- ...1.php.testMixedUsesTCF01_Function04.autoimport} | 42 +- ...1.php.testMixedUsesTCF01_Function05.autoimport} | 42 +- ...1.php.testMixedUsesTCF01_Function06.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type01.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type02.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type03.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type04.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type05.autoimport} | 42 +- ...TCF01.php.testMixedUsesTCF01_Type06.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Type07a.autoimport} | 42 +- ...CF01.php.testMixedUsesTCF01_Type07b.autoimport} | 41 +- .../testMixedUsesTF01/testMixedUsesTF01.php} | 39 +- ...TF01.php.testMixedUsesTF01_Const01a.autoimport} | 41 +- ...TF01.php.testMixedUsesTF01_Const01b.autoimport} | 39 +- ...TF01.php.testMixedUsesTF01_Const01c.autoimport} | 40 +- ...TF01.php.testMixedUsesTF01_Const01d.autoimport} | 39 +- ...1.php.testMixedUsesTF01_Function01a.autoimport} | 40 +- ...1.php.testMixedUsesTF01_Function01b.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function02.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function03.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function04.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function05.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function06.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function07.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function08.autoimport} | 40 +- ...01.php.testMixedUsesTF01_Function09.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type01.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type02.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type03.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type04.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type05.autoimport} | 40 +- ...esTF01.php.testMixedUsesTF01_Type06.autoimport} | 40 +- ...sTF01.php.testMixedUsesTF01_Type07a.autoimport} | 41 +- ...sTF01.php.testMixedUsesTF01_Type07b.autoimport} | 40 +- .../testMultipleUsesC01/testMultipleUsesC01.php} | 28 +- ...C01.php.testMultipleUsesC01_Const01.autoimport} | 28 +- ...01.php.testMultipleUsesC01_Const02a.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const02b.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const03a.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const03b.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const03c.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const03d.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const04a.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const04b.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const04c.autoimport} | 29 +- ...01.php.testMultipleUsesC01_Const04d.autoimport} | 29 +- ...php.testMultipleUsesC01_Function01a.autoimport} | 29 +- ...php.testMultipleUsesC01_Function01b.autoimport} | 28 +- ...php.testMultipleUsesC01_Function01c.autoimport} | 29 +- ...php.testMultipleUsesC01_Function01d.autoimport} | 28 +- ...C01.php.testMultipleUsesC01_Type01a.autoimport} | 29 +- ...C01.php.testMultipleUsesC01_Type01b.autoimport} | 28 +- .../testMultipleUsesF01/testMultipleUsesF01.php} | 28 +- ...01.php.testMultipleUsesF01_Const01a.autoimport} | 29 +- ...01.php.testMultipleUsesF01_Const01b.autoimport} | 28 +- ...01.php.testMultipleUsesF01_Const01c.autoimport} | 29 +- ...01.php.testMultipleUsesF01_Const01d.autoimport} | 28 +- ....php.testMultipleUsesF01_Function01.autoimport} | 28 +- ...php.testMultipleUsesF01_Function02a.autoimport} | 29 +- ...php.testMultipleUsesF01_Function02b.autoimport} | 29 +- ...php.testMultipleUsesF01_Function02c.autoimport} | 29 +- ...php.testMultipleUsesF01_Function02d.autoimport} | 29 +- ...php.testMultipleUsesF01_Function03a.autoimport} | 29 +- ...php.testMultipleUsesF01_Function03b.autoimport} | 29 +- ...F01.php.testMultipleUsesF01_Type01a.autoimport} | 29 +- ...F01.php.testMultipleUsesF01_Type01b.autoimport} | 28 +- .../testMultipleUsesT01/testMultipleUsesT01.php} | 28 +- ...01.php.testMultipleUsesT01_Const01a.autoimport} | 29 +- ...01.php.testMultipleUsesT01_Const01b.autoimport} | 28 +- ...php.testMultipleUsesT01_Function01a.autoimport} | 29 +- ...php.testMultipleUsesT01_Function01b.autoimport} | 28 +- ...sT01.php.testMultipleUsesT01_Type01.autoimport} | 28 +- ...sT01.php.testMultipleUsesT01_Type02.autoimport} | 29 +- ...sT01.php.testMultipleUsesT01_Type03.autoimport} | 29 +- .../testMultipleUsesT02/testMultipleUsesT02.php} | 31 +- ...sT02.php.testMultipleUsesT02_Type01.autoimport} | 31 +- ...sT02.php.testMultipleUsesT02_Type02.autoimport} | 32 +- ...sT02.php.testMultipleUsesT02_Type03.autoimport} | 32 +- ...sT02.php.testMultipleUsesT02_Type04.autoimport} | 32 +- ...sT02.php.testMultipleUsesT02_Type05.autoimport} | 32 +- .../testNoExistingUses01/testNoExistingUses01.php} | 27 +- ...es01.php.testNoExistingUses01_CONST.autoimport} | 27 +- ...1.php.testNoExistingUses01_Function.autoimport} | 27 +- ...ses01.php.testNoExistingUses01_Type.autoimport} | 27 +- .../testNoExistingUses02/testNoExistingUses02.php} | 28 +- ...es02.php.testNoExistingUses02_CONST.autoimport} | 28 +- ...2.php.testNoExistingUses02_Function.autoimport} | 28 +- ...ses02.php.testNoExistingUses02_Type.autoimport} | 28 +- .../testNoExistingUses03/testNoExistingUses03.php} | 27 +- ...ses03.php.testNoExistingUses03_Type.autoimport} | 27 +- .../testNoExistingUses04a.php} | 28 +- ...s04a.php.testNoExistingUses04a_Type.autoimport} | 28 +- .../testNoExistingUses04b.php} | 28 +- ...s04b.php.testNoExistingUses04b_Type.autoimport} | 28 +- .../testNoExistingUses05/testNoExistingUses05.php} | 29 +- ...ses05.php.testNoExistingUses05_Type.autoimport} | 29 +- .../testNoExistingUses06a.php} | 30 +- ...s06a.php.testNoExistingUses06a_Type.autoimport} | 30 +- .../testNoExistingUses06b.php} | 30 +- ...s06b.php.testNoExistingUses06b_Type.autoimport} | 30 +- .../testNoExistingUses07/testNoExistingUses07.php} | 29 +- ...ses07.php.testNoExistingUses07_Type.autoimport} | 29 +- .../testNoExistingUses08/testNoExistingUses08.php} | 30 +- ...ses08.php.testNoExistingUses08_Type.autoimport} | 30 +- .../testNoExistingUses09/testNoExistingUses09.php} | 32 +- ...ses09.php.testNoExistingUses09_Type.autoimport} | 32 +- .../testNoExistingUsesWithDeclare01a.php} | 30 +- ...stNoExistingUsesWithDeclare01a_Type.autoimport} | 30 +- .../testNoExistingUsesWithDeclare01b.php} | 31 +- ...stNoExistingUsesWithDeclare01b_Type.autoimport} | 31 +- .../testNoExistingUsesWithDeclare02a.php} | 30 +- ...stNoExistingUsesWithDeclare02a_Type.autoimport} | 30 +- .../testNoExistingUsesWithDeclare02b.php} | 31 +- ...stNoExistingUsesWithDeclare02b_Type.autoimport} | 31 +- .../testNoExistingUsesWithDeclare02c.php} | 31 +- ...stNoExistingUsesWithDeclare02c_Type.autoimport} | 31 +- .../testNoExistingUsesWithDeclare03.php} | 28 +- ...estNoExistingUsesWithDeclare03_Type.autoimport} | 28 +- .../testNoExistingUsesWithDeclare04.php} | 31 +- ...oExistingUsesWithDeclare04_Function.autoimport} | 31 +- .../testSingleUsesC01/testSingleUsesC01.php} | 28 +- ...esC01.php.testSingleUsesC01_Const01.autoimport} | 29 +- ...esC01.php.testSingleUsesC01_Const02.autoimport} | 28 +- ...esC01.php.testSingleUsesC01_Const03.autoimport} | 29 +- ...esC01.php.testSingleUsesC01_Const04.autoimport} | 29 +- ...1.php.testSingleUsesC01_Function01a.autoimport} | 29 +- ...1.php.testSingleUsesC01_Function01b.autoimport} | 28 +- ...1.php.testSingleUsesC01_Function01c.autoimport} | 28 +- ...esC01.php.testSingleUsesC01_Type01a.autoimport} | 29 +- ...esC01.php.testSingleUsesC01_Type01b.autoimport} | 28 +- .../testSingleUsesC02/testSingleUsesC02.php} | 30 +- ...esC02.php.testSingleUsesC02_Const01.autoimport} | 30 +- ...esC02.php.testSingleUsesC02_Const02.autoimport} | 30 +- ...esC02.php.testSingleUsesC02_Const03.autoimport} | 31 +- ...esC02.php.testSingleUsesC02_Const04.autoimport} | 31 +- ...esC02.php.testSingleUsesC02_Const05.autoimport} | 31 +- ...2.php.testSingleUsesC02_Function01a.autoimport} | 31 +- ...2.php.testSingleUsesC02_Function01b.autoimport} | 30 +- ...2.php.testSingleUsesC02_Function01c.autoimport} | 30 +- ...2.php.testSingleUsesC02_Function02a.autoimport} | 31 +- ...2.php.testSingleUsesC02_Function02b.autoimport} | 30 +- ...2.php.testSingleUsesC02_Function02c.autoimport} | 30 +- ...esC02.php.testSingleUsesC02_Type01a.autoimport} | 31 +- ...esC02.php.testSingleUsesC02_Type01b.autoimport} | 30 +- .../testSingleUsesC03/testSingleUsesC03.php} | 30 +- ...esC03.php.testSingleUsesC03_Const01.autoimport} | 31 +- ...esC03.php.testSingleUsesC03_Const02.autoimport} | 31 +- ...3.php.testSingleUsesC03_Function01a.autoimport} | 31 +- ...3.php.testSingleUsesC03_Function01b.autoimport} | 30 +- ...3.php.testSingleUsesC03_Function01c.autoimport} | 30 +- ...03.php.testSingleUsesC03_Function02.autoimport} | 31 +- ...esC03.php.testSingleUsesC03_Type01a.autoimport} | 31 +- ...esC03.php.testSingleUsesC03_Type01b.autoimport} | 30 +- .../testSingleUsesCF01/testSingleUsesCF01.php} | 28 +- ...CF01.php.testSingleUsesCF01_Const01.autoimport} | 28 +- ...F01.php.testSingleUsesCF01_Const02a.autoimport} | 29 +- ...F01.php.testSingleUsesCF01_Const02b.autoimport} | 29 +- ...F01.php.testSingleUsesCF01_Const02c.autoimport} | 29 +- ...F01.php.testSingleUsesCF01_Const02d.autoimport} | 29 +- ...F01.php.testSingleUsesCF01_Const03a.autoimport} | 30 +- ...F01.php.testSingleUsesCF01_Const03b.autoimport} | 29 +- ...F01.php.testSingleUsesCF01_Const03c.autoimport} | 30 +- ...F01.php.testSingleUsesCF01_Const03d.autoimport} | 29 +- ....php.testSingleUsesCF01_Function01a.autoimport} | 29 +- ....php.testSingleUsesCF01_Function01b.autoimport} | 29 +- ....php.testSingleUsesCF01_Function01c.autoimport} | 29 +- ....php.testSingleUsesCF01_Function01d.autoimport} | 29 +- ....php.testSingleUsesCF01_Function02a.autoimport} | 29 +- ....php.testSingleUsesCF01_Function02b.autoimport} | 29 +- ....php.testSingleUsesCF01_Function02c.autoimport} | 29 +- ....php.testSingleUsesCF01_Function02d.autoimport} | 29 +- ...CF01.php.testSingleUsesCF01_Type01a.autoimport} | 29 +- ...CF01.php.testSingleUsesCF01_Type01b.autoimport} | 28 +- .../testSingleUsesCF02/testSingleUsesCF02.php} | 33 +- ...CF02.php.testSingleUsesCF02_Const01.autoimport} | 33 +- ...F02.php.testSingleUsesCF02_Const02a.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const02b.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const02c.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const02d.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const03a.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const03b.autoimport} | 33 +- ...F02.php.testSingleUsesCF02_Const03c.autoimport} | 34 +- ...F02.php.testSingleUsesCF02_Const03d.autoimport} | 33 +- ....php.testSingleUsesCF02_Function01a.autoimport} | 34 +- ....php.testSingleUsesCF02_Function01b.autoimport} | 33 +- ....php.testSingleUsesCF02_Function01c.autoimport} | 34 +- ....php.testSingleUsesCF02_Function01d.autoimport} | 33 +- ...2.php.testSingleUsesCF02_Function02.autoimport} | 34 +- ....php.testSingleUsesCF02_Function03a.autoimport} | 34 +- ....php.testSingleUsesCF02_Function03b.autoimport} | 34 +- ....php.testSingleUsesCF02_Function03c.autoimport} | 34 +- ....php.testSingleUsesCF02_Function03d.autoimport} | 34 +- ...CF02.php.testSingleUsesCF02_Type01a.autoimport} | 34 +- ...CF02.php.testSingleUsesCF02_Type01b.autoimport} | 33 +- .../testSingleUsesCFT01/testSingleUsesCFT01.php} | 34 +- ...01.php.testSingleUsesCFT01_Const01a.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const01b.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const02a.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const02b.autoimport} | 35 +- ...T01.php.testSingleUsesCFT01_Const03.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const04a.autoimport} | 36 +- ...01.php.testSingleUsesCFT01_Const04b.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const05a.autoimport} | 35 +- ...01.php.testSingleUsesCFT01_Const05b.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function01a.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function01b.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function01c.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function01d.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function02a.autoimport} | 36 +- ...php.testSingleUsesCFT01_Function02b.autoimport} | 35 +- ...php.testSingleUsesCFT01_Function02c.autoimport} | 36 +- ...php.testSingleUsesCFT01_Function02d.autoimport} | 35 +- ...T01.php.testSingleUsesCFT01_Type01a.autoimport} | 35 +- ...T01.php.testSingleUsesCFT01_Type01b.autoimport} | 35 +- ...T01.php.testSingleUsesCFT01_Type02a.autoimport} | 35 +- ...T01.php.testSingleUsesCFT01_Type02b.autoimport} | 35 +- .../testSingleUsesF01/testSingleUsesF01.php} | 28 +- ...sF01.php.testSingleUsesF01_Const01a.autoimport} | 29 +- ...sF01.php.testSingleUsesF01_Const01b.autoimport} | 28 +- ...1.php.testSingleUsesF01_Function01a.autoimport} | 29 +- ...1.php.testSingleUsesF01_Function01b.autoimport} | 29 +- ...01.php.testSingleUsesF01_Function02.autoimport} | 29 +- ...01.php.testSingleUsesF01_Function03.autoimport} | 28 +- ...esF01.php.testSingleUsesF01_Type01a.autoimport} | 29 +- ...esF01.php.testSingleUsesF01_Type01b.autoimport} | 28 +- .../testSingleUsesF02/testSingleUsesF02.php} | 32 +- ...sF02.php.testSingleUsesF02_Const01a.autoimport} | 33 +- ...sF02.php.testSingleUsesF02_Const01b.autoimport} | 32 +- ...sF02.php.testSingleUsesF02_Const01c.autoimport} | 32 +- ...2.php.testSingleUsesF02_Function01a.autoimport} | 32 +- ...2.php.testSingleUsesF02_Function01b.autoimport} | 32 +- ...2.php.testSingleUsesF02_Function02a.autoimport} | 33 +- ...2.php.testSingleUsesF02_Function02b.autoimport} | 33 +- ...02.php.testSingleUsesF02_Function03.autoimport} | 33 +- ...02.php.testSingleUsesF02_Function04.autoimport} | 33 +- ...02.php.testSingleUsesF02_Function05.autoimport} | 33 +- ...02.php.testSingleUsesF02_Function06.autoimport} | 33 +- ...02.php.testSingleUsesF02_Function07.autoimport} | 33 +- ...esF02.php.testSingleUsesF02_Type01a.autoimport} | 33 +- ...esF02.php.testSingleUsesF02_Type01b.autoimport} | 32 +- .../testSingleUsesF03/testSingleUsesF03.php} | 32 +- ...sF03.php.testSingleUsesF03_Const01a.autoimport} | 33 +- ...sF03.php.testSingleUsesF03_Const01b.autoimport} | 32 +- ...sF03.php.testSingleUsesF03_Const01c.autoimport} | 32 +- ...03.php.testSingleUsesF03_Function01.autoimport} | 33 +- ...03.php.testSingleUsesF03_Function02.autoimport} | 33 +- ...03.php.testSingleUsesF03_Function03.autoimport} | 33 +- ...esF03.php.testSingleUsesF03_Type01a.autoimport} | 33 +- ...esF03.php.testSingleUsesF03_Type01b.autoimport} | 32 +- .../testSingleUsesFC01/testSingleUsesFC01.php} | 28 +- ...FC01.php.testSingleUsesFC01_Const01.autoimport} | 28 +- ...C01.php.testSingleUsesFC01_Const02a.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const02b.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const02c.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const02d.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const03a.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const03b.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const03c.autoimport} | 29 +- ...C01.php.testSingleUsesFC01_Const03d.autoimport} | 29 +- ...1.php.testSingleUsesFC01_Function01.autoimport} | 29 +- ....php.testSingleUsesFC01_Function02a.autoimport} | 30 +- ....php.testSingleUsesFC01_Function02b.autoimport} | 29 +- ....php.testSingleUsesFC01_Function02c.autoimport} | 30 +- ....php.testSingleUsesFC01_Function02d.autoimport} | 29 +- ...FC01.php.testSingleUsesFC01_Type01a.autoimport} | 29 +- ...FC01.php.testSingleUsesFC01_Type01b.autoimport} | 28 +- .../testSingleUsesFC02/testSingleUsesFC02.php} | 33 +- ...FC02.php.testSingleUsesFC02_Const01.autoimport} | 33 +- ...C02.php.testSingleUsesFC02_Const02a.autoimport} | 34 +- ...C02.php.testSingleUsesFC02_Const02b.autoimport} | 33 +- ...C02.php.testSingleUsesFC02_Const02c.autoimport} | 34 +- ...C02.php.testSingleUsesFC02_Const02d.autoimport} | 33 +- ...C02.php.testSingleUsesFC02_Const03a.autoimport} | 34 +- ...C02.php.testSingleUsesFC02_Const03b.autoimport} | 34 +- ...C02.php.testSingleUsesFC02_Const03c.autoimport} | 34 +- ...C02.php.testSingleUsesFC02_Const03d.autoimport} | 34 +- ...2.php.testSingleUsesFC02_Function01.autoimport} | 34 +- ...2.php.testSingleUsesFC02_Function02.autoimport} | 34 +- ....php.testSingleUsesFC02_Function02a.autoimport} | 34 +- ....php.testSingleUsesFC02_Function03a.autoimport} | 34 +- ....php.testSingleUsesFC02_Function03b.autoimport} | 33 +- ....php.testSingleUsesFC02_Function03c.autoimport} | 34 +- ....php.testSingleUsesFC02_Function03d.autoimport} | 33 +- ...FC02.php.testSingleUsesFC02_Type01a.autoimport} | 34 +- ...FC02.php.testSingleUsesFC02_Type01b.autoimport} | 33 +- .../testSingleUsesFCT01/testSingleUsesFCT01.php} | 36 +- ...01.php.testSingleUsesFCT01_Const01a.autoimport} | 37 +- ...01.php.testSingleUsesFCT01_Const01b.autoimport} | 36 +- ...01.php.testSingleUsesFCT01_Const02a.autoimport} | 37 +- ...01.php.testSingleUsesFCT01_Const02b.autoimport} | 36 +- ...01.php.testSingleUsesFCT01_Const03a.autoimport} | 37 +- ...01.php.testSingleUsesFCT01_Const03b.autoimport} | 36 +- ...php.testSingleUsesFCT01_Function01a.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function01b.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function01c.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function01d.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function02a.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function02b.autoimport} | 36 +- ...php.testSingleUsesFCT01_Function02c.autoimport} | 37 +- ...php.testSingleUsesFCT01_Function02d.autoimport} | 36 +- ....php.testSingleUsesFCT01_Function03.autoimport} | 36 +- ...T01.php.testSingleUsesFCT01_Type01a.autoimport} | 37 +- ...T01.php.testSingleUsesFCT01_Type01b.autoimport} | 36 +- ...T01.php.testSingleUsesFCT01_Type01c.autoimport} | 37 +- ...T01.php.testSingleUsesFCT01_Type01d.autoimport} | 36 +- ...T01.php.testSingleUsesFCT01_Type02a.autoimport} | 37 +- ...T01.php.testSingleUsesFCT01_Type02b.autoimport} | 37 +- .../testSingleUsesT01/testSingleUsesT01.php} | 28 +- ...sT01.php.testSingleUsesT01_Const01a.autoimport} | 29 +- ...sT01.php.testSingleUsesT01_Const01b.autoimport} | 28 +- ...sT01.php.testSingleUsesT01_Const02a.autoimport} | 29 +- ...sT01.php.testSingleUsesT01_Const02b.autoimport} | 28 +- ...1.php.testSingleUsesT01_Function01a.autoimport} | 29 +- ...1.php.testSingleUsesT01_Function01b.autoimport} | 28 +- ...1.php.testSingleUsesT01_Function02a.autoimport} | 29 +- ...1.php.testSingleUsesT01_Function02b.autoimport} | 28 +- ...sesT01.php.testSingleUsesT01_Type01.autoimport} | 29 +- ...sesT01.php.testSingleUsesT01_Type02.autoimport} | 29 +- ...sesT01.php.testSingleUsesT01_Type03.autoimport} | 28 +- ...sesT01.php.testSingleUsesT01_Type04.autoimport} | 29 +- .../testSingleUsesT02/testSingleUsesT02.php} | 30 +- ...sT02.php.testSingleUsesT02_Const01a.autoimport} | 31 +- ...sT02.php.testSingleUsesT02_Const01b.autoimport} | 30 +- ...2.php.testSingleUsesT02_Function01a.autoimport} | 31 +- ...2.php.testSingleUsesT02_Function01b.autoimport} | 30 +- ...sesT02.php.testSingleUsesT02_Type01.autoimport} | 31 +- ...sesT02.php.testSingleUsesT02_Type02.autoimport} | 31 +- ...sesT02.php.testSingleUsesT02_Type03.autoimport} | 31 +- ...sesT02.php.testSingleUsesT02_Type04.autoimport} | 31 +- .../testSingleUsesT03/testSingleUsesT03.php} | 30 +- ...sT03.php.testSingleUsesT03_Const01a.autoimport} | 31 +- ...sT03.php.testSingleUsesT03_Const01b.autoimport} | 30 +- ...3.php.testSingleUsesT03_Function01a.autoimport} | 31 +- ...3.php.testSingleUsesT03_Function01b.autoimport} | 30 +- ...sesT03.php.testSingleUsesT03_Type01.autoimport} | 31 +- .../testSingleUsesTC01/testSingleUsesTC01.php} | 29 +- ...TC01.php.testSingleUsesTC01_Const01.autoimport} | 29 +- ...C01.php.testSingleUsesTC01_Const02a.autoimport} | 30 +- ...C01.php.testSingleUsesTC01_Const02b.autoimport} | 29 +- ...C01.php.testSingleUsesTC01_Const02c.autoimport} | 30 +- ...C01.php.testSingleUsesTC01_Const02d.autoimport} | 29 +- ...TC01.php.testSingleUsesTC01_Const03.autoimport} | 30 +- ....php.testSingleUsesTC01_Function01a.autoimport} | 30 +- ....php.testSingleUsesTC01_Function01b.autoimport} | 29 +- ....php.testSingleUsesTC01_Function01c.autoimport} | 30 +- ....php.testSingleUsesTC01_Function01d.autoimport} | 28 +- ...sTC01.php.testSingleUsesTC01_Type01.autoimport} | 30 +- ...sTC01.php.testSingleUsesTC01_Type02.autoimport} | 29 +- ...TC01.php.testSingleUsesTC01_Type03a.autoimport} | 30 +- ...TC01.php.testSingleUsesTC01_Type03b.autoimport} | 29 +- ...TC01.php.testSingleUsesTC01_Type03c.autoimport} | 30 +- ...TC01.php.testSingleUsesTC01_Type03d.autoimport} | 29 +- .../testSingleUsesTC02/testSingleUsesTC02.php} | 32 +- ...TC02.php.testSingleUsesTC02_Const01.autoimport} | 32 +- ...C02.php.testSingleUsesTC02_Const02a.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const02b.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const02c.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const02d.autoimport} | 33 +- ...TC02.php.testSingleUsesTC02_Const03.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const04a.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const04b.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const04c.autoimport} | 33 +- ...C02.php.testSingleUsesTC02_Const04d.autoimport} | 33 +- ....php.testSingleUsesTC02_Function01a.autoimport} | 33 +- ....php.testSingleUsesTC02_Function01b.autoimport} | 32 +- ....php.testSingleUsesTC02_Function01c.autoimport} | 34 +- ....php.testSingleUsesTC02_Function01d.autoimport} | 32 +- ...sTC02.php.testSingleUsesTC02_Type01.autoimport} | 33 +- ...sTC02.php.testSingleUsesTC02_Type02.autoimport} | 33 +- ...TC02.php.testSingleUsesTC02_Type03a.autoimport} | 34 +- ...TC02.php.testSingleUsesTC02_Type03b.autoimport} | 33 +- ...TC02.php.testSingleUsesTC02_Type03c.autoimport} | 34 +- ...TC02.php.testSingleUsesTC02_Type03d.autoimport} | 33 +- .../testSingleUsesTF01/testSingleUsesTF01.php} | 29 +- ...F01.php.testSingleUsesTF01_Const01a.autoimport} | 30 +- ...F01.php.testSingleUsesTF01_Const01b.autoimport} | 28 +- ...F01.php.testSingleUsesTF01_Const01c.autoimport} | 30 +- ...F01.php.testSingleUsesTF01_Const01d.autoimport} | 29 +- ....php.testSingleUsesTF01_Function01a.autoimport} | 30 +- ....php.testSingleUsesTF01_Function01b.autoimport} | 29 +- ....php.testSingleUsesTF01_Function01c.autoimport} | 29 +- ....php.testSingleUsesTF01_Function02a.autoimport} | 30 +- ....php.testSingleUsesTF01_Function02b.autoimport} | 30 +- ....php.testSingleUsesTF01_Function02c.autoimport} | 30 +- ...1.php.testSingleUsesTF01_Function03.autoimport} | 29 +- ...TF01.php.testSingleUsesTF01_Type01a.autoimport} | 30 +- ...TF01.php.testSingleUsesTF01_Type01b.autoimport} | 29 +- ...TF01.php.testSingleUsesTF01_Type01c.autoimport} | 29 +- ...TF01.php.testSingleUsesTF01_Type02a.autoimport} | 30 +- ...TF01.php.testSingleUsesTF01_Type02b.autoimport} | 30 +- ...TF01.php.testSingleUsesTF01_Type02c.autoimport} | 30 +- .../testSingleUsesTF02/testSingleUsesTF02.php} | 31 +- ...F02.php.testSingleUsesTF02_Const01a.autoimport} | 33 +- ...F02.php.testSingleUsesTF02_Const01b.autoimport} | 31 +- ...F02.php.testSingleUsesTF02_Const01c.autoimport} | 32 +- ...F02.php.testSingleUsesTF02_Const01d.autoimport} | 31 +- ....php.testSingleUsesTF02_Function01a.autoimport} | 32 +- ....php.testSingleUsesTF02_Function01b.autoimport} | 32 +- ....php.testSingleUsesTF02_Function01c.autoimport} | 32 +- ....php.testSingleUsesTF02_Function01d.autoimport} | 32 +- ....php.testSingleUsesTF02_Function02a.autoimport} | 32 +- ....php.testSingleUsesTF02_Function02b.autoimport} | 32 +- ....php.testSingleUsesTF02_Function02c.autoimport} | 32 +- ....php.testSingleUsesTF02_Function02d.autoimport} | 32 +- ...2.php.testSingleUsesTF02_Function03.autoimport} | 32 +- ...2.php.testSingleUsesTF02_Function04.autoimport} | 32 +- ...sTF02.php.testSingleUsesTF02_Type01.autoimport} | 32 +- ...sTF02.php.testSingleUsesTF02_Type02.autoimport} | 31 +- ...TF02.php.testSingleUsesTF02_Type03a.autoimport} | 32 +- ...TF02.php.testSingleUsesTF02_Type03b.autoimport} | 32 +- ...TF02.php.testSingleUsesTF02_Type03c.autoimport} | 32 +- ...TF02.php.testSingleUsesTF02_Type03d.autoimport} | 32 +- .../testSingleUsesTFC01/testSingleUsesTFC01.php} | 34 +- ...01.php.testSingleUsesTFC01_Const01a.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const01b.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const01c.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const01d.autoimport} | 35 +- ...C01.php.testSingleUsesTFC01_Const02.autoimport} | 35 +- ...C01.php.testSingleUsesTFC01_Const03.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const04a.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const04b.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const04c.autoimport} | 35 +- ...01.php.testSingleUsesTFC01_Const04d.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function01a.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function01b.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function01c.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function01d.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function02a.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function02b.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function02c.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function02d.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function03a.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function03b.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function03c.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function03d.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function04a.autoimport} | 36 +- ...php.testSingleUsesTFC01_Function04b.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function04c.autoimport} | 36 +- ...php.testSingleUsesTFC01_Function04d.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function05a.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function05b.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function05c.autoimport} | 35 +- ...php.testSingleUsesTFC01_Function05d.autoimport} | 35 +- ...C01.php.testSingleUsesTFC01_Type01a.autoimport} | 35 +- ...C01.php.testSingleUsesTFC01_Type01b.autoimport} | 35 +- ...FC01.php.testSingleUsesTFC01_Type02.autoimport} | 35 +- ...C01.php.testSingleUsesTFC01_Type03a.autoimport} | 36 +- ...C01.php.testSingleUsesTFC01_Type03b.autoimport} | 35 +- .../testTypeInGlobal01/testTypeInGlobal01.php} | 26 +- ...nGlobal01.php.testTypeInGlobal01_01.autoimport} | 26 +- ...nGlobal01.php.testTypeInGlobal01_02.autoimport} | 31 +- .../testTypeInGlobal02/testTypeInGlobal02.php} | 27 +- ...nGlobal02.php.testTypeInGlobal02_01.autoimport} | 27 +- ...nGlobal02.php.testTypeInGlobal02_02.autoimport} | 27 +- .../testTypeInGlobalWithBlock01.php} | 26 +- ....php.testTypeInGlobalWithBlock01_01.autoimport} | 26 +- ....php.testTypeInGlobalWithBlock01_02.autoimport} | 26 +- .../lib/autoImport/testConst01/testConst01.php} | 28 +- .../testConst01.php.testConst01_FQN01.cccustomtpl | 2 + .../testConst01.php.testConst01_FQN02.cccustomtpl | 2 + ...testConst01.php.testConst01_Smart01.cccustomtpl | 2 + ...testConst01.php.testConst01_Smart02.cccustomtpl | 2 + ...nst01.php.testConst01_Unqualified01.cccustomtpl | 2 + ...nst01.php.testConst01_Unqualified02.cccustomtpl | 2 + .../autoImport/testFunction01/testFunction01.php} | 29 +- ...Function01.php.testFunction01_FQN01.cccustomtpl | 2 + ...Function01.php.testFunction01_FQN02.cccustomtpl | 2 + ...nction01.php.testFunction01_Smart01.cccustomtpl | 2 + ...nction01.php.testFunction01_Smart02.cccustomtpl | 2 + ...01.php.testFunction01_Unqualified01.cccustomtpl | 2 + ...01.php.testFunction01_Unqualified02.cccustomtpl | 2 + .../testGlobalNamespaceItem01.php} | 34 +- ...hp.testGlobalNamespaceItem01_FQN01a.cccustomtpl | 14 + ...hp.testGlobalNamespaceItem01_FQN01b.cccustomtpl | 14 + ....testGlobalNamespaceItem01_Smart01a.cccustomtpl | 14 + ....testGlobalNamespaceItem01_Smart01b.cccustomtpl | 14 + ...lobalNamespaceItem01_Unqualified01a.cccustomtpl | 14 + ...lobalNamespaceItem01_Unqualified01b.cccustomtpl | 14 + .../testGlobalNamespaceItem02.php} | 35 +- ...hp.testGlobalNamespaceItem02_FQN01a.cccustomtpl | 2 + ...hp.testGlobalNamespaceItem02_FQN01b.cccustomtpl | 2 + ....testGlobalNamespaceItem02_Smart01a.cccustomtpl | 2 + ....testGlobalNamespaceItem02_Smart01b.cccustomtpl | 2 + ...lobalNamespaceItem02_Unqualified01a.cccustomtpl | 2 + ...lobalNamespaceItem02_Unqualified01b.cccustomtpl | 2 + .../lib/autoImport/testType01/testType01.php} | 28 +- .../testType01.php.testType01_FQN01.cccustomtpl | 8 + .../testType01.php.testType01_FQN02.cccustomtpl | 8 + .../testType01.php.testType01_Smart01.cccustomtpl | 8 + .../testType01.php.testType01_Smart02.cccustomtpl | 8 + ...Type01.php.testType01_Unqualified01.cccustomtpl | 8 + ...Type01.php.testType01_Unqualified02.cccustomtpl | 8 + .../lib/autoImport/testType02/testType02.php} | 28 +- .../testType02.php.testType02_FQN01.cccustomtpl | 2 + .../testType02.php.testType02_FQN02.cccustomtpl | 2 + .../testType02.php.testType02_Smart01.cccustomtpl | 2 + .../testType02.php.testType02_Smart02.cccustomtpl | 2 + ...Type02.php.testType02_Unqualified01.cccustomtpl | 2 + ...Type02.php.testType02_Unqualified02.cccustomtpl | 2 + .../lib/autoImport/testType03/testType03.php} | 28 +- .../testType03.php.testType03_FQN01.cccustomtpl | 2 + .../testType03.php.testType03_FQN02.cccustomtpl | 2 + .../testType03.php.testType03_Smart01.cccustomtpl | 2 + .../testType03.php.testType03_Smart02.cccustomtpl | 2 + ...Type03.php.testType03_Unqualified01.cccustomtpl | 2 + ...Type03.php.testType03_Unqualified02.cccustomtpl | 2 + .../lib/autoImport/testType04/testType04.php} | 28 +- .../testType04.php.testType04_FQN01.cccustomtpl | 8 + .../testType04.php.testType04_FQN02.cccustomtpl | 8 + .../testType04.php.testType04_Smart01.cccustomtpl | 8 + .../testType04.php.testType04_Smart02.cccustomtpl | 8 + ...Type04.php.testType04_Unqualified01.cccustomtpl | 8 + ...Type04.php.testType04_Unqualified02.cccustomtpl | 8 + .../lib/autoImport/testType05/testType05.php} | 28 +- .../testType05.php.testType05_FQN01.cccustomtpl | 8 + .../testType05.php.testType05_FQN02.cccustomtpl | 8 + .../testType05.php.testType05_Smart01.cccustomtpl | 8 + .../testType05.php.testType05_Smart02.cccustomtpl | 8 + ...Type05.php.testType05_Unqualified01.cccustomtpl | 8 + ...Type05.php.testType05_Unqualified02.cccustomtpl | 8 + .../lib/autoImport/testType06/testType06.php} | 28 +- .../testType06.php.testType06_FQN01.cccustomtpl | 8 + .../testType06.php.testType06_FQN02.cccustomtpl | 8 + .../testType06.php.testType06_Smart01.cccustomtpl | 8 + .../testType06.php.testType06_Smart02.cccustomtpl | 8 + ...Type06.php.testType06_Unqualified01.cccustomtpl | 8 + ...Type06.php.testType06_Unqualified02.cccustomtpl | 8 + .../testTypeAlias01/testTypeAlias01.php} | 30 +- ...peAlias01.php.testTypeAlias01_FQN01.cccustomtpl | 8 + ...peAlias01.php.testTypeAlias01_FQN02.cccustomtpl | 8 + ...Alias01.php.testTypeAlias01_Smart01.cccustomtpl | 8 + ...Alias01.php.testTypeAlias01_Smart02.cccustomtpl | 8 + ...1.php.testTypeAlias01_Unqualified01.cccustomtpl | 8 + ...1.php.testTypeAlias01_Unqualified02.cccustomtpl | 8 + .../testTypeAlias02/testTypeAlias02.php} | 28 +- ...peAlias02.php.testTypeAlias02_FQN01.cccustomtpl | 2 + ...peAlias02.php.testTypeAlias02_FQN02.cccustomtpl | 2 + ...Alias02.php.testTypeAlias02_Smart01.cccustomtpl | 2 + ...Alias02.php.testTypeAlias02_Smart02.cccustomtpl | 2 + ...2.php.testTypeAlias02_Unqualified01.cccustomtpl | 2 + ...2.php.testTypeAlias02_Unqualified02.cccustomtpl | 2 + .../testTypeWithSameName01.php} | 30 +- ...01.php.testTypeWithSameName01_FQN01.cccustomtpl | 8 + ...01.php.testTypeWithSameName01_FQN02.cccustomtpl | 8 + ....php.testTypeWithSameName01_Smart01.cccustomtpl | 8 + ....php.testTypeWithSameName01_Smart02.cccustomtpl | 8 + ...estTypeWithSameName01_Unqualified01.cccustomtpl | 8 + ...estTypeWithSameName01_Unqualified02.cccustomtpl | 8 + .../testTypeWithSameName02.php} | 28 +- ...02.php.testTypeWithSameName02_FQN01.cccustomtpl | 2 + ...02.php.testTypeWithSameName02_FQN02.cccustomtpl | 2 + ....php.testTypeWithSameName02_Smart01.cccustomtpl | 2 + ....php.testTypeWithSameName02_Smart02.cccustomtpl | 2 + ...estTypeWithSameName02_Unqualified01.cccustomtpl | 2 + ...estTypeWithSameName02_Unqualified02.cccustomtpl | 2 + .../testGroupUseFunction01.php} | 31 +- ...nction01.php.testGroupUseFunction01.cccustomtpl | 5 + .../testUseFunction01/testUseFunction01.php} | 28 +- ...UseFunction01.php.testUseFunction01.cccustomtpl | 5 + ...TypeHint.php.testCallableTypeHint_01.completion | 3 + ...TypeHint.php.testCallableTypeHint_03.completion | 3 + .../completion/lib/php54/traitsAliasedName01.php} | 27 +- ...edName01.php.testTraitsAliasedName01.completion | 5 + .../testEnumsAliasedName/enumsAliasedName.php} | 28 +- ...asedName.php.testEnumsAliasedName_01.completion | 5 + .../formatting/blankLines/issueGH6980_01.php} | 28 +- .../issueGH6980_01.php.testGH6980_01.formatted} | 28 +- .../formatting/blankLines/issueGH6980_02.php} | 28 +- .../issueGH6980_02.php.testGH6980_02.formatted} | 28 +- .../formatting/blankLines/issueGH6980_03.php} | 31 +- .../issueGH6980_03.php.testGH6980_03.formatted} | 31 +- .../blankLines/issueGH6980_NSWithBlock01.php} | 28 +- ...Block01.php.testGH6980_NSWithBlock01.formatted} | 27 +- .../blankLines/issueGH6980_NSWithBlock02.php} | 28 +- ...Block02.php.testGH6980_NSWithBlock02.formatted} | 26 +- .../blankLines/issueGH6980_NSWithBlock03.php} | 31 +- ...Block03.php.testGH6980_NSWithBlock03.formatted} | 30 +- .../modules/php/editor/codegen/AutoImportTest.java | 3708 ++++++++++++++++++++ .../editor/completion/PHP54CodeCompletionTest.java | 4 + .../editor/completion/PHP71CodeCompletionTest.java | 9 - .../editor/completion/PHP72CodeCompletionTest.java | 9 - .../editor/completion/PHP74CodeCompletionTest.java | 9 - .../editor/completion/PHP80CodeCompletionTest.java | 9 - .../editor/completion/PHP81CodeCompletionTest.java | 13 +- .../editor/completion/PHP82CodeCompletionTest.java | 9 - .../editor/completion/PHP83CodeCompletionTest.java | 9 - .../PHPCodeCompletionAutoImportTest.java | 639 ++++ .../completion/PHPCodeCompletionGH7041Test.java | 48 + .../PHPCodeCompletionMagicMethodTest.java | 9 - .../completion/PHPCodeCompletionTestBase.java | 61 +- .../editor/indent/PHPFormatterBlankLinesTest.java | 36 + 872 files changed, 15376 insertions(+), 16928 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