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 a09703ead4 Fix find usages for Enums
new 470e29fa46 Merge pull request #5718 from
junichi11/php-find-usage-for-enums
a09703ead4 is described below
commit a09703ead4f4aa3f3eb386fa7fcfa25beed26a5b
Author: Junichi Yamamoto <junich...@apache.org>
AuthorDate: Sun Mar 26 08:00:59 2023 +0900
Fix find usages for Enums
- Handle `ENUM` and `ENUM_CASE`
---
.../refactoring/php/findusages/Bundle.properties | 2 +
.../refactoring/php/findusages/WhereUsedPanel.java | 6 ++
.../data/testfiles/findusages/testEnums/index.php | 68 ++++++++++++++
.../index.php.testEnums_Case_01a.findUsages | 9 ++
.../index.php.testEnums_Case_01b.findUsages | 9 ++
.../index.php.testEnums_Case_02a.findUsages | 14 +++
.../index.php.testEnums_Case_02b.findUsages | 14 +++
.../index.php.testEnums_Case_02c.findUsages | 14 +++
.../index.php.testEnums_Constant_01a.findUsages | 9 ++
.../index.php.testEnums_Constant_01b.findUsages | 9 ++
.../index.php.testEnums_EnumName_01a.findUsages | 19 ++++
.../index.php.testEnums_EnumName_01b.findUsages | 19 ++++
.../index.php.testEnums_EnumName_01c.findUsages | 19 ++++
.../index.php.testEnums_EnumName_01d.findUsages | 19 ++++
.../index.php.testEnums_EnumName_02a.findUsages | 14 +++
.../index.php.testEnums_EnumName_02b.findUsages | 14 +++
.../index.php.testEnums_EnumName_02c.findUsages | 14 +++
.../index.php.testEnums_Interface_01a.findUsages | 9 ++
.../index.php.testEnums_Interface_01b.findUsages | 9 ++
.../index.php.testEnums_Method_01a.findUsages | 9 ++
.../index.php.testEnums_Method_01b.findUsages | 9 ++
.../index.php.testEnums_Method_02a.findUsages | 9 ++
.../index.php.testEnums_Method_02b.findUsages | 9 ++
...index.php.testEnums_StaticMethod_01a.findUsages | 14 +++
...index.php.testEnums_StaticMethod_01b.findUsages | 14 +++
...index.php.testEnums_StaticMethod_01c.findUsages | 14 +++
...index.php.testEnums_StaticMethod_02a.findUsages | 9 ++
...index.php.testEnums_StaticMethod_02b.findUsages | 9 ++
.../php/findusages/WhereUsedSupportTest.java | 100 +++++++++++++++++++++
29 files changed, 486 insertions(+)
diff --git
a/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/Bundle.properties
b/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/Bundle.properties
index fbc5f1e2e6..97f934ae39 100644
---
a/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/Bundle.properties
+++
b/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/Bundle.properties
@@ -34,6 +34,8 @@ DSC_FieldUsages=<html>Field <b>{0}</b> of class
<b>{1}</b>:</html>
DSC_VariableUsages=<html>Variable <b>{0}</b>:</html>
DSC_UseAliasUsages=<html>Use Alias <b>{0}</b>:</html>
DSC_TraitUsages=<html>Trait <b>{0}</b>:</html>
+DSC_EnumUsages=<html>Enum <b>{0}</b>:</html>
+DSC_EnumCaseUsages=<html>Enum Case <b>{0}</b> of enum <b>{1}</b>:</html>
DSC_WhereUsedWarningInDevelopment={0} (PHP refactoring is approximate. Review
all results.)
LBL_FindUsages=Find &Usages
LBL_FindOverridingMethods=Find &Overriding Methods
diff --git
a/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedPanel.java
b/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedPanel.java
index e36670ab57..201ec1ffaa 100644
---
a/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedPanel.java
+++
b/php/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedPanel.java
@@ -199,6 +199,12 @@ public class WhereUsedPanel extends JPanel implements
CustomRefactoringPanel {
case TRAIT:
bundleKey = "DSC_TraitUsages"; //NOI18N
break;
+ case ENUM:
+ bundleKey = "DSC_EnumUsages"; // NOI18N
+ break;
+ case ENUM_CASE:
+ bundleKey = "DSC_EnumCaseUsages"; // NOI18N
+ break;
default:
assert false : usage.getKind();
}
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php
new file mode 100644
index 0000000000..1209da3457
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace A;
+
+enum EnumA {
+
+ public const CONSTANT_A = 1;
+
+ case Case1;
+ case Case2;
+
+ public function test(): void {
+ $this->publicMethod();
+ self::publicStaticMethod();
+ static::publicStaticMethod();
+ }
+
+ public function publicMethod(): void { // EnumA
+ }
+
+ public static function publicStaticMethod(): string { // EnumA
+ return "publicStaticMethod()";
+ }
+}
+
+namespace B;
+
+use A\EnumA;
+
+interface InterfaceB {
+}
+
+enum EnumB: string implements InterfaceB {
+
+ public const CONSTANT_B = EnumA::CONSTANT_A;
+
+ case A = 'A';
+ case B = 'B';
+ case C = EnumA::Case1;
+
+ public function publicMethod(): void { // EnumB
+ }
+
+ public static function publicStaticMethod(): string { // EnumB
+ return "publicStaticMethod()";
+ }
+}
+
+EnumB::A->publicMethod();
+EnumB::A::publicStaticMethod();
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01a.findUsages
new file mode 100644
index 0000000000..3a98252d02
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01a.findUsages
@@ -0,0 +1,9 @@
+Display text: case <b>Case1</b>;
+File name: index.php
+Name: Case1
+Position: BEGIN: 886 END: 891
+
+Display text: case C = EnumA::<b>Case1</b>;
+File name: index.php
+Name: Case1
+Position: BEGIN: 1435 END: 1440
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01b.findUsages
new file mode 100644
index 0000000000..3a98252d02
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_01b.findUsages
@@ -0,0 +1,9 @@
+Display text: case <b>Case1</b>;
+File name: index.php
+Name: Case1
+Position: BEGIN: 886 END: 891
+
+Display text: case C = EnumA::<b>Case1</b>;
+File name: index.php
+Name: Case1
+Position: BEGIN: 1435 END: 1440
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02a.findUsages
new file mode 100644
index 0000000000..3af4cdb5e2
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02a.findUsages
@@ -0,0 +1,14 @@
+Display text: case <b>A</b> = 'A';
+File name: index.php
+Name: A
+Position: BEGIN: 1388 END: 1389
+
+Display text: EnumB::<b>A</b>->publicMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1624 END: 1625
+
+Display text: EnumB::<b>A</b>::publicStaticMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1650 END: 1651
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02b.findUsages
new file mode 100644
index 0000000000..3af4cdb5e2
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02b.findUsages
@@ -0,0 +1,14 @@
+Display text: case <b>A</b> = 'A';
+File name: index.php
+Name: A
+Position: BEGIN: 1388 END: 1389
+
+Display text: EnumB::<b>A</b>->publicMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1624 END: 1625
+
+Display text: EnumB::<b>A</b>::publicStaticMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1650 END: 1651
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02c.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02c.findUsages
new file mode 100644
index 0000000000..3af4cdb5e2
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Case_02c.findUsages
@@ -0,0 +1,14 @@
+Display text: case <b>A</b> = 'A';
+File name: index.php
+Name: A
+Position: BEGIN: 1388 END: 1389
+
+Display text: EnumB::<b>A</b>->publicMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1624 END: 1625
+
+Display text: EnumB::<b>A</b>::publicStaticMethod();
+File name: index.php
+Name: A
+Position: BEGIN: 1650 END: 1651
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01a.findUsages
new file mode 100644
index 0000000000..346dd4ff2a
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01a.findUsages
@@ -0,0 +1,9 @@
+Display text: public const <b>CONSTANT_A</b> = 1;
+File name: index.php
+Name: CONSTANT_A
+Position: BEGIN: 860 END: 870
+
+Display text: public const CONSTANT_B = EnumA::<b>CONSTANT_A</b>;
+File name: index.php
+Name: CONSTANT_A
+Position: BEGIN: 1366 END: 1376
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01b.findUsages
new file mode 100644
index 0000000000..346dd4ff2a
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Constant_01b.findUsages
@@ -0,0 +1,9 @@
+Display text: public const <b>CONSTANT_A</b> = 1;
+File name: index.php
+Name: CONSTANT_A
+Position: BEGIN: 860 END: 870
+
+Display text: public const CONSTANT_B = EnumA::<b>CONSTANT_A</b>;
+File name: index.php
+Name: CONSTANT_A
+Position: BEGIN: 1366 END: 1376
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01a.findUsages
new file mode 100644
index 0000000000..345dbb1ae3
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01a.findUsages
@@ -0,0 +1,19 @@
+Display text: enum <b>EnumA</b> {
+File name: index.php
+Name: EnumA
+Position: BEGIN: 834 END: 839
+
+Display text: use A\<b>EnumA</b>;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1251 END: 1256
+
+Display text: public const CONSTANT_B = <b>EnumA</b>::CONSTANT_A;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1359 END: 1364
+
+Display text: case C = <b>EnumA</b>::Case1;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1428 END: 1433
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01b.findUsages
new file mode 100644
index 0000000000..345dbb1ae3
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01b.findUsages
@@ -0,0 +1,19 @@
+Display text: enum <b>EnumA</b> {
+File name: index.php
+Name: EnumA
+Position: BEGIN: 834 END: 839
+
+Display text: use A\<b>EnumA</b>;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1251 END: 1256
+
+Display text: public const CONSTANT_B = <b>EnumA</b>::CONSTANT_A;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1359 END: 1364
+
+Display text: case C = <b>EnumA</b>::Case1;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1428 END: 1433
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01c.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01c.findUsages
new file mode 100644
index 0000000000..345dbb1ae3
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01c.findUsages
@@ -0,0 +1,19 @@
+Display text: enum <b>EnumA</b> {
+File name: index.php
+Name: EnumA
+Position: BEGIN: 834 END: 839
+
+Display text: use A\<b>EnumA</b>;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1251 END: 1256
+
+Display text: public const CONSTANT_B = <b>EnumA</b>::CONSTANT_A;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1359 END: 1364
+
+Display text: case C = <b>EnumA</b>::Case1;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1428 END: 1433
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01d.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01d.findUsages
new file mode 100644
index 0000000000..345dbb1ae3
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_01d.findUsages
@@ -0,0 +1,19 @@
+Display text: enum <b>EnumA</b> {
+File name: index.php
+Name: EnumA
+Position: BEGIN: 834 END: 839
+
+Display text: use A\<b>EnumA</b>;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1251 END: 1256
+
+Display text: public const CONSTANT_B = <b>EnumA</b>::CONSTANT_A;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1359 END: 1364
+
+Display text: case C = <b>EnumA</b>::Case1;
+File name: index.php
+Name: EnumA
+Position: BEGIN: 1428 END: 1433
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02a.findUsages
new file mode 100644
index 0000000000..ba47c75d2e
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02a.findUsages
@@ -0,0 +1,14 @@
+Display text: enum <b>EnumB</b>: string implements InterfaceB {
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1290 END: 1295
+
+Display text: <b>EnumB</b>::A->publicMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1617 END: 1622
+
+Display text: <b>EnumB</b>::A::publicStaticMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1643 END: 1648
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02b.findUsages
new file mode 100644
index 0000000000..ba47c75d2e
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02b.findUsages
@@ -0,0 +1,14 @@
+Display text: enum <b>EnumB</b>: string implements InterfaceB {
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1290 END: 1295
+
+Display text: <b>EnumB</b>::A->publicMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1617 END: 1622
+
+Display text: <b>EnumB</b>::A::publicStaticMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1643 END: 1648
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02c.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02c.findUsages
new file mode 100644
index 0000000000..ba47c75d2e
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_EnumName_02c.findUsages
@@ -0,0 +1,14 @@
+Display text: enum <b>EnumB</b>: string implements InterfaceB {
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1290 END: 1295
+
+Display text: <b>EnumB</b>::A->publicMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1617 END: 1622
+
+Display text: <b>EnumB</b>::A::publicStaticMethod();
+File name: index.php
+Name: EnumB
+Position: BEGIN: 1643 END: 1648
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01a.findUsages
new file mode 100644
index 0000000000..c2f2d33853
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01a.findUsages
@@ -0,0 +1,9 @@
+Display text: interface <b>InterfaceB</b> {
+File name: index.php
+Name: InterfaceB
+Position: BEGIN: 1269 END: 1279
+
+Display text: enum EnumB: string implements <b>InterfaceB</b> {
+File name: index.php
+Name: InterfaceB
+Position: BEGIN: 1315 END: 1325
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01b.findUsages
new file mode 100644
index 0000000000..c2f2d33853
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Interface_01b.findUsages
@@ -0,0 +1,9 @@
+Display text: interface <b>InterfaceB</b> {
+File name: index.php
+Name: InterfaceB
+Position: BEGIN: 1269 END: 1279
+
+Display text: enum EnumB: string implements <b>InterfaceB</b> {
+File name: index.php
+Name: InterfaceB
+Position: BEGIN: 1315 END: 1325
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01a.findUsages
new file mode 100644
index 0000000000..910c4051a2
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01a.findUsages
@@ -0,0 +1,9 @@
+Display text: $this-><b>publicMethod</b>();
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 960 END: 972
+
+Display text: public function <b>publicMethod</b>(): void { // EnumA
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1077 END: 1089
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01b.findUsages
new file mode 100644
index 0000000000..910c4051a2
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_01b.findUsages
@@ -0,0 +1,9 @@
+Display text: $this-><b>publicMethod</b>();
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 960 END: 972
+
+Display text: public function <b>publicMethod</b>(): void { // EnumA
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1077 END: 1089
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02a.findUsages
new file mode 100644
index 0000000000..df4e7bcab7
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02a.findUsages
@@ -0,0 +1,9 @@
+Display text: public function <b>publicMethod</b>(): void { // EnumB
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1463 END: 1475
+
+Display text: EnumB::A-><b>publicMethod</b>();
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1627 END: 1639
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02b.findUsages
new file mode 100644
index 0000000000..df4e7bcab7
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_Method_02b.findUsages
@@ -0,0 +1,9 @@
+Display text: public function <b>publicMethod</b>(): void { // EnumB
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1463 END: 1475
+
+Display text: EnumB::A-><b>publicMethod</b>();
+File name: index.php
+Name: publicMethod
+Position: BEGIN: 1627 END: 1639
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01a.findUsages
new file mode 100644
index 0000000000..333b043108
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01a.findUsages
@@ -0,0 +1,14 @@
+Display text: self::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 990 END: 1008
+
+Display text: static::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1028 END: 1046
+
+Display text: public static function <b>publicStaticMethod</b>(): string { //
EnumA
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1143 END: 1161
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01b.findUsages
new file mode 100644
index 0000000000..333b043108
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01b.findUsages
@@ -0,0 +1,14 @@
+Display text: self::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 990 END: 1008
+
+Display text: static::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1028 END: 1046
+
+Display text: public static function <b>publicStaticMethod</b>(): string { //
EnumA
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1143 END: 1161
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01c.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01c.findUsages
new file mode 100644
index 0000000000..333b043108
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_01c.findUsages
@@ -0,0 +1,14 @@
+Display text: self::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 990 END: 1008
+
+Display text: static::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1028 END: 1046
+
+Display text: public static function <b>publicStaticMethod</b>(): string { //
EnumA
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1143 END: 1161
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02a.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02a.findUsages
new file mode 100644
index 0000000000..23a93a2f40
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02a.findUsages
@@ -0,0 +1,9 @@
+Display text: public static function <b>publicStaticMethod</b>(): string { //
EnumB
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1529 END: 1547
+
+Display text: EnumB::A::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1653 END: 1671
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02b.findUsages
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02b.findUsages
new file mode 100644
index 0000000000..23a93a2f40
--- /dev/null
+++
b/php/php.refactoring/test/unit/data/testfiles/findusages/testEnums/index.php.testEnums_StaticMethod_02b.findUsages
@@ -0,0 +1,9 @@
+Display text: public static function <b>publicStaticMethod</b>(): string { //
EnumB
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1529 END: 1547
+
+Display text: EnumB::A::<b>publicStaticMethod</b>();
+File name: index.php
+Name: publicStaticMethod
+Position: BEGIN: 1653 END: 1671
\ No newline at end of file
diff --git
a/php/php.refactoring/test/unit/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupportTest.java
b/php/php.refactoring/test/unit/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupportTest.java
index 34d7198425..cfb7b3815b 100644
---
a/php/php.refactoring/test/unit/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupportTest.java
+++
b/php/php.refactoring/test/unit/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupportTest.java
@@ -272,4 +272,104 @@ public class WhereUsedSupportTest extends
FindUsagesTestBase {
findUsages("echo $this->privateFi^eld;", "nb6087.php");
}
+ public void testEnums_EnumName_01a() throws Exception {
+ findUsages("enum Enum^A {");
+ }
+
+ public void testEnums_EnumName_01b() throws Exception {
+ findUsages("use A\\Enu^mA;");
+ }
+
+ public void testEnums_EnumName_01c() throws Exception {
+ findUsages(" public const CONSTANT_B = Enu^mA::CONSTANT_A;");
+ }
+
+ public void testEnums_EnumName_01d() throws Exception {
+ findUsages(" case C = E^numA::Case1;");
+ }
+
+ public void testEnums_EnumName_02a() throws Exception {
+ findUsages("enum Enu^mB: string implements InterfaceB {");
+ }
+
+ public void testEnums_EnumName_02b() throws Exception {
+ findUsages("Enu^mB::A->publicMethod();");
+ }
+
+ public void testEnums_EnumName_02c() throws Exception {
+ findUsages("E^numB::A::publicStaticMethod();");
+ }
+
+ public void testEnums_Constant_01a() throws Exception {
+ findUsages(" public const CONSTA^NT_A = 1;");
+ }
+
+ public void testEnums_Constant_01b() throws Exception {
+ findUsages(" public const CONSTANT_B = EnumA::CONS^TANT_A;");
+ }
+
+ public void testEnums_Case_01a() throws Exception {
+ findUsages(" case Cas^e1;");
+ }
+
+ public void testEnums_Case_01b() throws Exception {
+ findUsages(" case C = EnumA::Cas^e1;");
+ }
+
+ public void testEnums_Case_02a() throws Exception {
+ findUsages(" case ^A = 'A';");
+ }
+
+ public void testEnums_Case_02b() throws Exception {
+ findUsages("EnumB::A^->publicMethod();");
+ }
+
+ public void testEnums_Case_02c() throws Exception {
+ findUsages("EnumB::^A::publicStaticMethod();");
+ }
+
+ public void testEnums_Method_01a() throws Exception {
+ findUsages(" $this->publicMeth^od();");
+ }
+
+ public void testEnums_Method_01b() throws Exception {
+ findUsages(" public function publicMet^hod(): void { // EnumA");
+ }
+
+ public void testEnums_Method_02a() throws Exception {
+ findUsages(" public function publicM^ethod(): void { // EnumB");
+ }
+
+ public void testEnums_Method_02b() throws Exception {
+ findUsages("EnumB::A->publicMet^hod();");
+ }
+
+ public void testEnums_StaticMethod_01a() throws Exception {
+ findUsages(" self::publicStaticMet^hod();");
+ }
+
+ public void testEnums_StaticMethod_01b() throws Exception {
+ findUsages(" static::publicStaticMe^thod();");
+ }
+
+ public void testEnums_StaticMethod_01c() throws Exception {
+ findUsages(" public static function publicStati^cMethod(): string {
// EnumA");
+ }
+
+ public void testEnums_StaticMethod_02a() throws Exception {
+ findUsages(" public static function publicStatic^Method(): string {
// EnumB");
+ }
+
+ public void testEnums_StaticMethod_02b() throws Exception {
+ findUsages("EnumB::A::publicStati^cMethod();");
+ }
+
+ public void testEnums_Interface_01a() throws Exception {
+ findUsages("interface Interfac^eB {");
+ }
+
+ public void testEnums_Interface_01b() throws Exception {
+ findUsages("enum EnumB: string implements Inter^faceB {");
+ }
+
}
---------------------------------------------------------------------
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
