diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
index 84720f7184aa..effffeed3aa0 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
@@ -52,7 +52,6 @@
 import org.netbeans.modules.php.editor.model.FileScope;
 import org.netbeans.modules.php.editor.model.FunctionScope;
 import org.netbeans.modules.php.editor.model.IndexScope;
-import org.netbeans.modules.php.editor.model.InterfaceScope;
 import org.netbeans.modules.php.editor.model.MethodScope;
 import org.netbeans.modules.php.editor.model.ModelElement;
 import org.netbeans.modules.php.editor.model.ModelUtils;
@@ -1684,7 +1683,8 @@ public static Collection<? extends TypeScope> getStaticTypeName(Scope inScope, S
                 csi = (EnumScope) methodInScope;
             }
         }
-        if (inScope instanceof ClassScope || inScope instanceof InterfaceScope) {
+        if (inScope instanceof TypeScope) {
+            // e.g. const EXAMPLE = self::UNDEFINED;
             csi = (TypeScope) inScope;
         }
         if (csi != null) {
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java
index 368569f68ab0..2d9c149a5b67 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java
@@ -80,6 +80,7 @@
 import org.netbeans.modules.php.editor.parser.astnodes.Expression;
 import org.netbeans.modules.php.editor.parser.astnodes.FieldAccess;
 import org.netbeans.modules.php.editor.parser.astnodes.MethodInvocation;
+import org.netbeans.modules.php.editor.parser.astnodes.NamespaceName;
 import org.netbeans.modules.php.editor.parser.astnodes.StaticConstantAccess;
 import org.netbeans.modules.php.editor.parser.astnodes.StaticFieldAccess;
 import org.netbeans.modules.php.editor.parser.astnodes.StaticMethodInvocation;
@@ -349,7 +350,9 @@ public void visit(StaticConstantAccess staticConstantAccess) {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
-            if (lineBounds.containsInclusive(staticConstantAccess.getStartOffset())) {
+            if (!staticConstantAccess.isDynamicName()
+                    && (staticConstantAccess.getDispatcher() instanceof NamespaceName) // e.g. ClassName::CONSTANT, self::CONSTANT
+                    && lineBounds.containsInclusive(staticConstantAccess.getStartOffset())) {
                 String constName = staticConstantAccess.getConstantName().getName();
                 String clzName = CodeUtils.extractUnqualifiedClassName(staticConstantAccess);
 
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP55UnhandledError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP55UnhandledError.java
index 6cbb4bfcca43..676018087603 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP55UnhandledError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP55UnhandledError.java
@@ -124,11 +124,15 @@ public void visit(StaticConstantAccess node) {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
-            Identifier constant = node.getConstantName();
-            if (constant != null) {
-                String constantName = constant.getName();
-                if ("class".equals(constantName.toLowerCase())) { //NOI18N
-                    createError(constant);
+            if (node.isDynamicName()) {
+                super.visit(node);
+            } else {
+                Identifier constant = node.getConstantName();
+                if (constant != null) {
+                    String constantName = constant.getName();
+                    if ("class".equals(constantName.toLowerCase())) { //NOI18N
+                        createError(constant);
+                    }
                 }
             }
         }
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php
new file mode 100644
index 000000000000..c170a94ab150
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php
@@ -0,0 +1,50 @@
+<?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.
+ */
+
+class Test {
+    public const BAR = 'bar';
+    public const BA = 'BA';
+    public const A = self::{'BAR'};
+    public const B = self::{self::{'BA'} . 'R'};
+    public const C = self::{self::BA . self::R};
+}
+
+trait TraitTest {
+    public const TRAIT_BA = 'BA';
+    public const TRAIT_B = self::{self::{'BA'} . 'R'};
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAIT_R};
+}
+
+enum EnumTest: string {
+    case BAR = 'bar';
+    case BA = 'BA';
+    case A = self::{'BAR'};
+    case B = self::{self::{'BA'} . 'R'};
+    case C = self::{self::BA . self::R};
+}
+
+Test::{"BAR"};
+$test::{"BAR"};
+Test::{test()}::{test($bar)};
+Test::{test('foo')}::FOO;
+
+EnumTest::{"BAR"};
+EnumTest::{test()}::{test($bar)};
+EnumTest::{test('foo')}::FOO;
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.hints
new file mode 100644
index 000000000000..3aabc660e24d
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.hints
@@ -0,0 +1,4 @@
+    public const C = self::{self::BA . self::^R};
+                                       -------
+HINT:Introduce Hint
+FIX:Create Constant "R" in Class "Test" (testDynamicClassConstantFetch.php)
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03Fix.fixed b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03Fix.fixed
new file mode 100644
index 000000000000..743f99f33d92
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_03Fix.fixed
@@ -0,0 +1,51 @@
+<?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.
+ */
+
+class Test {
+    public const BAR = 'bar';
+    public const BA = 'BA';
+    public const A = self::{'BAR'};
+    public const B = self::{self::{'BA'} . 'R'};
+    public const C = self::{self::BA . self::R};
+    const R = "";
+}
+
+trait TraitTest {
+    public const TRAIT_BA = 'BA';
+    public const TRAIT_B = self::{self::{'BA'} . 'R'};
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAIT_R};
+}
+
+enum EnumTest: string {
+    case BAR = 'bar';
+    case BA = 'BA';
+    case A = self::{'BAR'};
+    case B = self::{self::{'BA'} . 'R'};
+    case C = self::{self::BA . self::R};
+}
+
+Test::{"BAR"};
+$test::{"BAR"};
+Test::{test()}::{test($bar)};
+Test::{test('foo')}::FOO;
+
+EnumTest::{"BAR"};
+EnumTest::{test()}::{test($bar)};
+EnumTest::{test('foo')}::FOO;
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_06.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_06.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_06.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_07.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_07.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_07.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase01.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase01.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase01.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase02.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase02.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase02.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03.hints
new file mode 100644
index 000000000000..858bbde10fc6
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03.hints
@@ -0,0 +1,6 @@
+    case C = self::{self::BA . self::^R};
+                               -------
+HINT:Introduce Hint
+FIX:Create Constant "R" in Enum "EnumTest" (testDynamicClassConstantFetch.php)
+HINT:Introduce Hint
+FIX:Create Enum Case "R" in Enum "EnumTest" (testDynamicClassConstantFetch.php)
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03aFix.fixed b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03aFix.fixed
new file mode 100644
index 000000000000..2691f1e2770b
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03aFix.fixed
@@ -0,0 +1,53 @@
+<?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.
+ */
+
+class Test {
+    public const BAR = 'bar';
+    public const BA = 'BA';
+    public const A = self::{'BAR'};
+    public const B = self::{self::{'BA'} . 'R'};
+    public const C = self::{self::BA . self::R};
+}
+
+trait TraitTest {
+    public const TRAIT_BA = 'BA';
+    public const TRAIT_B = self::{self::{'BA'} . 'R'};
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAIT_R};
+}
+
+enum EnumTest: string {
+
+    const R = "";
+
+    case BAR = 'bar';
+    case BA = 'BA';
+    case A = self::{'BAR'};
+    case B = self::{self::{'BA'} . 'R'};
+    case C = self::{self::BA . self::R};
+}
+
+Test::{"BAR"};
+$test::{"BAR"};
+Test::{test()}::{test($bar)};
+Test::{test('foo')}::FOO;
+
+EnumTest::{"BAR"};
+EnumTest::{test()}::{test($bar)};
+EnumTest::{test('foo')}::FOO;
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03bFix.fixed b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03bFix.fixed
new file mode 100644
index 000000000000..de8fdbc47f23
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase03bFix.fixed
@@ -0,0 +1,51 @@
+<?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.
+ */
+
+class Test {
+    public const BAR = 'bar';
+    public const BA = 'BA';
+    public const A = self::{'BAR'};
+    public const B = self::{self::{'BA'} . 'R'};
+    public const C = self::{self::BA . self::R};
+}
+
+trait TraitTest {
+    public const TRAIT_BA = 'BA';
+    public const TRAIT_B = self::{self::{'BA'} . 'R'};
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAIT_R};
+}
+
+enum EnumTest: string {
+    case BAR = 'bar';
+    case BA = 'BA';
+    case A = self::{'BAR'};
+    case B = self::{self::{'BA'} . 'R'};
+    case C = self::{self::BA . self::R};
+    case R = '';
+}
+
+Test::{"BAR"};
+$test::{"BAR"};
+Test::{test()}::{test($bar)};
+Test::{test('foo')}::FOO;
+
+EnumTest::{"BAR"};
+EnumTest::{test()}::{test($bar)};
+EnumTest::{test('foo')}::FOO;
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase04.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase04.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase04.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase05.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase05.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase05.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase06.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase06.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_EnumCase06.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait01.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait01.hints
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait01.hints
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02.hints b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02.hints
new file mode 100644
index 000000000000..f9046f96dff1
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02.hints
@@ -0,0 +1,4 @@
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRA^IT_R};
+                                                   -------------
+HINT:Introduce Hint
+FIX:Create Constant "TRAIT_R" in Trait "TraitTest" (testDynamicClassConstantFetch.php)
diff --git a/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02Fix.fixed b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02Fix.fixed
new file mode 100644
index 000000000000..38eee9f14bc9
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/IntroduceSuggestion/testDynamicClassConstantFetch/testDynamicClassConstantFetch.php.testDynamicClassConstantFetch_Trait02Fix.fixed
@@ -0,0 +1,51 @@
+<?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.
+ */
+
+class Test {
+    public const BAR = 'bar';
+    public const BA = 'BA';
+    public const A = self::{'BAR'};
+    public const B = self::{self::{'BA'} . 'R'};
+    public const C = self::{self::BA . self::R};
+}
+
+trait TraitTest {
+    public const TRAIT_BA = 'BA';
+    public const TRAIT_B = self::{self::{'BA'} . 'R'};
+    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAIT_R};
+    const TRAIT_R = "";
+}
+
+enum EnumTest: string {
+    case BAR = 'bar';
+    case BA = 'BA';
+    case A = self::{'BAR'};
+    case B = self::{self::{'BA'} . 'R'};
+    case C = self::{self::BA . self::R};
+}
+
+Test::{"BAR"};
+$test::{"BAR"};
+Test::{test()}::{test($bar)};
+Test::{test('foo')}::FOO;
+
+EnumTest::{"BAR"};
+EnumTest::{test()}::{test($bar)};
+EnumTest::{test('foo')}::FOO;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestionTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestionTest.java
index de47cea4a062..1c6fe1f6e69a 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestionTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestionTest.java
@@ -379,6 +379,82 @@ public void testConstantsInTraits01_PHP82Fix() throws Exception {
         applyHint("        echo self::CONST^ANT;", "Create Constant", PhpVersion.PHP_82);
     }
 
+    public void testDynamicClassConstantFetch_01() throws Exception {
+        checkHints("    public const A = self::{'B^AR'};");
+    }
+
+    public void testDynamicClassConstantFetch_02() throws Exception {
+        checkHints("    public const B = self::{self::{'B^A'} . 'R'};");
+    }
+
+    public void testDynamicClassConstantFetch_03() throws Exception {
+        checkHints("    public const C = self::{self::BA . self::^R};");
+    }
+
+    public void testDynamicClassConstantFetch_03Fix() throws Exception {
+        applyHint("    public const C = self::{self::BA . self::^R};", "Create Constant");
+    }
+
+    public void testDynamicClassConstantFetch_04() throws Exception {
+        checkHints("Test::{\"BA^R\"};");
+    }
+
+    public void testDynamicClassConstantFetch_05() throws Exception {
+        checkHints("$test::{\"BA^R\"};");
+    }
+
+    public void testDynamicClassConstantFetch_06() throws Exception {
+        checkHints("Test::{test()}::{tes^t($bar)};");
+    }
+
+    public void testDynamicClassConstantFetch_07() throws Exception {
+        checkHints("Test::{test('foo')}::FO^O;");
+    }
+
+    public void testDynamicClassConstantFetch_Trait01() throws Exception {
+        checkHints("    public const TRAIT_B = self::{self::{'B^A'} . 'R'};");
+    }
+
+    public void testDynamicClassConstantFetch_Trait02() throws Exception {
+        checkHints("    public const TRAIT_C = self::{self::TRAIT_BA . self::TRA^IT_R};");
+    }
+
+    public void testDynamicClassConstantFetch_Trait02Fix() throws Exception {
+        applyHint("    public const TRAIT_C = self::{self::TRAIT_BA . self::TRAI^T_R};", "Create Constant");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase01() throws Exception {
+        checkHints("    case A = self::{'BA^R'};");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase02() throws Exception {
+        checkHints("    case B = self::{self::{'B^A'} . 'R'};");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase03() throws Exception {
+        checkHints("    case C = self::{self::BA . self::^R};");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase03aFix() throws Exception {
+        applyHint("    case C = self::{self::BA . self::^R};", "Create Constant");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase03bFix() throws Exception {
+        applyHint("    case C = self::{self::BA . self::^R};", "Create Enum Case");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase04() throws Exception {
+        checkHints("EnumTest::{\"BA^R\"};");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase05() throws Exception {
+        checkHints("EnumTest::{test()}::{tes^t($bar)};");
+    }
+
+    public void testDynamicClassConstantFetch_EnumCase06() throws Exception {
+        checkHints("EnumTest::{tes^t('foo')}::FOO;");
+    }
+
     private void checkHints(String caretLine) throws Exception {
         checkHints(new IntroduceSuggestion(), getTestFileName(), caretLine);
     }