This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6b515ec [NETBEANS-3413] Implicit inheritance of PHPDoc descriptions -
fixed code completion tests
new cf0ae24 Merge pull request #2189 from
KacerCZ/netbeans-3413-fix-completion-test
6b515ec is described below
commit 6b515ec7571d06cf11c3c9c5749438a4a88bc2da
Author: Tomas Prochazka <ka...@razdva.cz>
AuthorDate: Sun Jun 14 21:02:13 2020 +0200
[NETBEANS-3413] Implicit inheritance of PHPDoc descriptions - fixed code
completion tests
---
.../documentation/inheritdoc.php.testInheritdocNoDocMethod.html | 5 ++++-
.../completion/documentation/issue215408.php.testIssue215408.html | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocNoDocMethod.html
b/php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocNoDocMethod.html
index b88cc46..b408a75 100644
---
a/php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocNoDocMethod.html
+++
b/php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocNoDocMethod.html
@@ -3,4 +3,7 @@
$childClass->testNoD|oc();
(QueryType=COMPLETION, prefixSearch=false, caseSensitive=true)
METHOD testNoDoc() [PUBLIC] ChildClass
-</pre><h2>Documentation:</h2><div align="right"><font
size=-1></font></div><b>testNoDoc</b><br/><br/>PHPDoc not found</body></html>
+</pre><h2>Documentation:</h2><div align="right"><font
size=-1></font></div><b>testNoDoc</b><br/><br/>
+testNoDoc method of BaseClass.<br><br>testNoDoc method description of
BaseClass.
+<br />
+</body></html>
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/documentation/issue215408.php.testIssue215408.html
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issue215408.php.testIssue215408.html
index 7f9f170..c63fdbf 100644
---
a/php/php.editor/test/unit/data/testfiles/completion/documentation/issue215408.php.testIssue215408.html
+++
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issue215408.php.testIssue215408.html
@@ -3,4 +3,5 @@
ClassName::F|OO;
(QueryType=COMPLETION, prefixSearch=false, caseSensitive=true)
CONSTANT FOO -12 [PUBLIC] ClassName
-</pre><h2>Documentation:</h2><div align="right"><font
size=-1></font></div><b>FOO</b> = -12<br/><br/>PHPDoc not found</body></html>
\ No newline at end of file
+</pre><h2>Documentation:</h2><div align="right"><font
size=-1></font></div><b>FOO</b> = -12<br/><br/><br />
+</body></html>
\ No newline at end of file
---------------------------------------------------------------------
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
