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
The following commit(s) were added to refs/heads/master by this push:
new 1c64bc5880 Corrected a typo in the php parser tests
new 52975795ec Merge pull request #5476 from troizet/fix_php_parser_tests
1c64bc5880 is described below
commit 1c64bc5880f27de272963d40c80feca6f3601a80
Author: Alexey Borokhvostov <troi...@gmail.com>
AuthorDate: Sun Feb 12 14:42:54 2023 +0700
Corrected a typo in the php parser tests
---
.../treatNamespacedNamesAsSingleToken_02a.pass | 32 +++++++++----------
.../treatNamespacedNamesAsSingleToken_02b.pass | 36 +++++++++++-----------
.../treatNamespacedNamesAsSingleToken_02a.php | 2 +-
.../treatNamespacedNamesAsSingleToken_02b.php | 2 +-
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
index 6969358281..4483160105 100644
---
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
+++
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02a.pass
@@ -615,26 +615,26 @@
<token id='T_NAMESPACE' start='2023' end='2032'>
<text>namespace</text>
</token>
- <token id='T_STRING' start='2033' end='2043'>
- <text>ineterface</text>
+ <token id='T_INTERFACE' start='2033' end='2042'>
+ <text>interface</text>
</token>
- <token id='T_SEMICOLON' start='2043' end='2044'>
+ <token id='T_SEMICOLON' start='2042' end='2043'>
<text>;</text>
</token>
- <token id='T_NAMESPACE' start='2045' end='2054'>
+ <token id='T_NAMESPACE' start='2044' end='2053'>
<text>namespace</text>
</token>
- <token id='T_STRING' start='2055' end='2059'>
+ <token id='T_STRING' start='2054' end='2058'>
<text>enum</text>
</token>
- <token id='T_SEMICOLON' start='2059' end='2060'>
+ <token id='T_SEMICOLON' start='2058' end='2059'>
<text>;</text>
</token>
- <token id='EOF' start='2061' end='2061'>
+ <token id='EOF' start='2060' end='2060'>
<text></text>
</token>
</scanner>
- <Program start='0' end='2061'>
+ <Program start='0' end='2060'>
<Comments>
<Comment start='6' end='813' commentType='multiLine'/>
<Comment start='6' end='813' commentType='multiLine'/>
@@ -1117,18 +1117,18 @@
<Block start='2022' end='2022' isCurly='true'>
</Block>
</NamespaceDeclaration>
- <NamespaceDeclaration start='2023' end='2044' isBracketed='false'>
- <NamespaceName start='2033' end='2043' isCurrent='false'
isGlobal='false'>
- <Identifier start='2033' end='2043' name='ineterface'/>
+ <NamespaceDeclaration start='2023' end='2043' isBracketed='false'>
+ <NamespaceName start='2033' end='2042' isCurrent='false'
isGlobal='false'>
+ <Identifier start='2033' end='2042' name='interface'/>
</NamespaceName>
- <Block start='2044' end='2044' isCurly='true'>
+ <Block start='2043' end='2043' isCurly='true'>
</Block>
</NamespaceDeclaration>
- <NamespaceDeclaration start='2045' end='2060' isBracketed='false'>
- <NamespaceName start='2055' end='2059' isCurrent='false'
isGlobal='false'>
- <Identifier start='2055' end='2059' name='enum'/>
+ <NamespaceDeclaration start='2044' end='2059' isBracketed='false'>
+ <NamespaceName start='2054' end='2058' isCurrent='false'
isGlobal='false'>
+ <Identifier start='2054' end='2058' name='enum'/>
</NamespaceName>
- <Block start='2060' end='2060' isCurly='true'>
+ <Block start='2059' end='2059' isCurly='true'>
</Block>
</NamespaceDeclaration>
</Statements>
diff --git
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
index 831ac128a0..fd3c2c6af5 100644
---
a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
+++
b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/treatNamespacedNamesAsSingleToken_02b.pass
@@ -819,32 +819,32 @@
<token id='T_NAMESPACE' start='2161' end='2170'>
<text>namespace</text>
</token>
- <token id='T_STRING' start='2171' end='2181'>
- <text>ineterface</text>
+ <token id='T_INTERFACE' start='2171' end='2180'>
+ <text>interface</text>
</token>
- <token id='T_CURLY_OPEN' start='2182' end='2183'>
+ <token id='T_CURLY_OPEN' start='2181' end='2182'>
<text>{</text>
</token>
- <token id='T_CURLY_CLOSE' start='2183' end='2184'>
+ <token id='T_CURLY_CLOSE' start='2182' end='2183'>
<text>}</text>
</token>
- <token id='T_NAMESPACE' start='2185' end='2194'>
+ <token id='T_NAMESPACE' start='2184' end='2193'>
<text>namespace</text>
</token>
- <token id='T_STRING' start='2195' end='2199'>
+ <token id='T_STRING' start='2194' end='2198'>
<text>enum</text>
</token>
- <token id='T_CURLY_OPEN' start='2200' end='2201'>
+ <token id='T_CURLY_OPEN' start='2199' end='2200'>
<text>{</text>
</token>
- <token id='T_CURLY_CLOSE' start='2201' end='2202'>
+ <token id='T_CURLY_CLOSE' start='2200' end='2201'>
<text>}</text>
</token>
- <token id='EOF' start='2203' end='2203'>
+ <token id='EOF' start='2202' end='2202'>
<text></text>
</token>
</scanner>
- <Program start='0' end='2203'>
+ <Program start='0' end='2202'>
<Comments>
<Comment start='6' end='815' commentType='multiLine'/>
<Comment start='6' end='815' commentType='multiLine'/>
@@ -1327,18 +1327,18 @@
<Block start='2158' end='2160' isCurly='true'>
</Block>
</NamespaceDeclaration>
- <NamespaceDeclaration start='2161' end='2184' isBracketed='true'>
- <NamespaceName start='2171' end='2181' isCurrent='false'
isGlobal='false'>
- <Identifier start='2171' end='2181' name='ineterface'/>
+ <NamespaceDeclaration start='2161' end='2183' isBracketed='true'>
+ <NamespaceName start='2171' end='2180' isCurrent='false'
isGlobal='false'>
+ <Identifier start='2171' end='2180' name='interface'/>
</NamespaceName>
- <Block start='2182' end='2184' isCurly='true'>
+ <Block start='2181' end='2183' isCurly='true'>
</Block>
</NamespaceDeclaration>
- <NamespaceDeclaration start='2185' end='2202' isBracketed='true'>
- <NamespaceName start='2195' end='2199' isCurrent='false'
isGlobal='false'>
- <Identifier start='2195' end='2199' name='enum'/>
+ <NamespaceDeclaration start='2184' end='2201' isBracketed='true'>
+ <NamespaceName start='2194' end='2198' isCurrent='false'
isGlobal='false'>
+ <Identifier start='2194' end='2198' name='enum'/>
</NamespaceName>
- <Block start='2200' end='2202' isCurly='true'>
+ <Block start='2199' end='2201' isCurly='true'>
</Block>
</NamespaceDeclaration>
</Statements>
diff --git
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
index 22a51e9e66..d62a8d5469 100644
---
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
+++
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02a.php
@@ -87,5 +87,5 @@ namespace callable;
namespace extends;
namespace implements;
namespace trait;
-namespace ineterface;
+namespace interface;
namespace enum;
diff --git
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02b.php
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02b.php
index 6ce9585b37..4a3064a688 100644
---
a/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02b.php
+++
b/php/php.editor/test/unit/data/testfiles/parser/php80/treatNamespacedNamesAsSingleToken_02b.php
@@ -87,5 +87,5 @@ namespace callable {}
namespace extends {}
namespace implements {}
namespace trait {}
-namespace ineterface {}
+namespace interface {}
namespace enum {}
---------------------------------------------------------------------
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
