diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
index 74651920cede..94bdce30c0dc 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
@@ -61,6 +61,7 @@ final class CompletionContextFinder {
     private static final String MULTI_CATCH_EXCEPTION_TOKENS = "MULTI_CATCH_EXCEPTION_TOKENS"; //NOI18N
     private static final String COMBINED_USE_STATEMENT_TOKENS = "COMBINED_USE_STATEMENT_TOKENS"; //NOI18N
     private static final String CONST_STATEMENT_TOKENS = "CONST_STATEMENT_TOKENS"; //NOI18N
+    private static final String ENUM_CASE_STATEMENT_TOKENS = "ENUM_CASE_STATEMENT_TOKENS"; //NOI18N
     private static final String FIELD_UNION_OR_INTERSECTION_TYPE_TOKENS = "FIELD_UNION_TYPE_TOKENS"; //NOI18N
     private static final String FIELD_MODIFIERS_TOKENS = "FIELD_MODIFIERS_TOKENS"; //NOI18N
     private static final String OBJECT_OPERATOR_TOKEN = "OBJECT_OPERATOR_TOKEN"; //NOI18N
@@ -204,6 +205,10 @@ final class CompletionContextFinder {
             new Object[]{PHPTokenId.PHP_CONST, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING, PHPTokenId.WHITESPACE, CONST_STATEMENT_TOKENS},
             new Object[]{PHPTokenId.PHP_CONST, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING, CONST_STATEMENT_TOKENS}
     );
+    private static final List<Object[]> ENUM_CASE_TOKENCHAINS = Arrays.asList(
+            new Object[]{PHPTokenId.PHP_CASE, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING, PHPTokenId.WHITESPACE, CONST_STATEMENT_TOKENS},
+            new Object[]{PHPTokenId.PHP_CASE, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING, CONST_STATEMENT_TOKENS}
+    );
     private static final List<Object[]> SERVER_ARRAY_TOKENCHAINS = Collections.singletonList(
             new Object[]{PHPTokenId.PHP_VARIABLE, PHPTokenId.PHP_TOKEN});
     private static final List<String> SERVER_ARRAY_TOKENTEXTS =
@@ -211,7 +216,7 @@ final class CompletionContextFinder {
 
     public static enum CompletionContext {
 
-        EXPRESSION, GLOBAL_CONST_EXPRESSION, CLASS_CONST_EXPRESSION, MATCH_EXPRESSION,
+        EXPRESSION, GLOBAL_CONST_EXPRESSION, CLASS_CONST_EXPRESSION, MATCH_EXPRESSION, ENUM_CASE_EXPRESSION,
         HTML, CLASS_NAME, INTERFACE_NAME, BACKING_TYPE,
         TYPE_NAME, RETURN_TYPE_NAME, RETURN_UNION_OR_INTERSECTION_TYPE_NAME, FIELD_TYPE_NAME, VISIBILITY_MODIFIER_OR_TYPE_NAME, STRING,
         CLASS_MEMBER, STATIC_CLASS_MEMBER, PHPDOC, INHERITANCE, EXTENDS, IMPLEMENTS, METHOD_NAME,
@@ -328,6 +333,8 @@ static CompletionContext findCompletionContext(ParserResult info, int caretOffse
                     return CompletionContext.FIELD_TYPE_NAME;
                 } else if (acceptTokenChains(tokenSequence, CONST_TOKENCHAINS, moveNextSucces)) {
                     return CompletionContext.CLASS_CONST_EXPRESSION;
+                } else if (acceptTokenChains(tokenSequence, ENUM_CASE_TOKENCHAINS, moveNextSucces)) {
+                    return CompletionContext.ENUM_CASE_EXPRESSION;
                 } else if (acceptTokenChains(tokenSequence, CLASS_CONTEXT_KEYWORDS_TOKENCHAINS, moveNextSucces)) {
                     return CompletionContext.CLASS_CONTEXT_KEYWORDS;
                 }
@@ -540,6 +547,11 @@ private static boolean acceptTokenChain(TokenSequence tokenSequence, Object[] to
                     accept = false;
                     break;
                 }
+            } else if (tokenID == ENUM_CASE_STATEMENT_TOKENS) {
+                if (!consumeUntilEnumCaseEqual(tokenSequence)) {
+                    accept = false;
+                    break;
+                }
             } else if (tokenID == OBJECT_OPERATOR_TOKEN) {
                 if (!consumeObjectOperator(tokenSequence)) {
                     accept = false;
@@ -749,9 +761,25 @@ private static boolean consumeUntilTypeKeyword(TokenSequence tokenSequence) {
     private static boolean consumeUntilConstEqual(TokenSequence tokenSequence) {
         boolean hasEqual = false;
         do {
-            if (tokenSequence.token().id() == PHPTokenId.PHP_SEMICOLON
-                    || tokenSequence.token().id() == PHPTokenId.PHP_CURLY_OPEN
-                    || tokenSequence.token().id() == PHPTokenId.PHP_CURLY_CLOSE) {
+            if (tokenSequence.token().id() == PHPTokenId.PHP_CONST
+                    || tokenSequence.token().id() == PHPTokenId.PHP_SEMICOLON) {
+                break;
+            }
+            if (isEqualSign(tokenSequence.token())) {
+                hasEqual = true;
+                tokenSequence.movePrevious();
+                break;
+            }
+        } while (tokenSequence.movePrevious());
+
+        return hasEqual;
+    }
+
+    private static boolean consumeUntilEnumCaseEqual(TokenSequence tokenSequence) {
+        boolean hasEqual = false;
+        do {
+            if (tokenSequence.token().id() == PHPTokenId.PHP_CASE
+                    || tokenSequence.token().id() == PHPTokenId.PHP_SEMICOLON) {
                 break;
             }
             if (isEqualSign(tokenSequence.token())) {
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
index 8508907eb7d0..d710c11283d0 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
@@ -447,7 +447,8 @@ public CodeCompletionResult complete(CodeCompletionContext completionContext) {
                 autoCompleteConstants(completionResult, request);
                 autoCompleteKeywords(completionResult, request, PHP_GLOBAL_CONST_KEYWORDS);
                 break;
-            case CLASS_CONST_EXPRESSION:
+            case CLASS_CONST_EXPRESSION: // no break
+            case ENUM_CASE_EXPRESSION:
                 autoCompleteNamespaces(completionResult, request);
                 autoCompleteTypeNames(completionResult, request, null, true);
                 autoCompleteConstants(completionResult, request);
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php
new file mode 100644
index 000000000000..d9859f9dce72
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php
@@ -0,0 +1,58 @@
+<?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 TEST = 'test';
+    public const TES = 'TES';
+    public const T = 'T';
+    public const TEST1 = self::{'TEST'};
+    public const TEST2 = self::{'TES' . 'T'};
+    public const TEST3 = self::{self::TES . self::T};
+
+    public static function method(): void {
+        
+    }
+}
+
+enum EnumTest: string {
+
+    case TEST = 'test';
+    case TES = 'TES';
+    case T = 'T';
+    case TEST1 = self::{'TEST'};
+    case TEST2 = self::{'TES' . 'T'};
+    case TEST3 = self::{self::TES . self::T};
+    case TEST4 = EnumTest::{self::{self::TES} . self::T};
+}
+
+function test(string $param = "test"): void {
+    
+}
+
+$variable = 'TEST';
+$e = 'e';
+$test = "Test";
+
+Test::{$variable};
+$test::{$variable . $e};
+
+Test::{Test::method()}::{test($variable)};
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.completion
new file mode 100644
index 000000000000..31db592276f9
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_01.completion
@@ -0,0 +1,9 @@
+Code completion result for source line:
+public const TEST3 = self::{self::T|ES . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CONSTANT   T 'T'                           [PUBLIC]   Test
+CONSTANT   TES 'TES'                       [PUBLIC]   Test
+CONSTANT   TEST 'test'                     [PUBLIC]   Test
+CONSTANT   TEST1 ?                         [PUBLIC]   Test
+CONSTANT   TEST2 ?                         [PUBLIC]   Test
+CONSTANT   TEST3 ?                         [PUBLIC]   Test
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.completion
new file mode 100644
index 000000000000..1eb3fc9a61d0
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_02.completion
@@ -0,0 +1,21 @@
+Code completion result for source line:
+Test::{$|variable};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+VARIABLE   string $e                       [PUBLIC]   dynamicClassConstantFetch.php
+VARIABLE   string $test                    [PUBLIC]   dynamicClassConstantFetch.php
+VARIABLE   string $variable                [PUBLIC]   dynamicClassConstantFetch.php
+------------------------------------
+VARIABLE   $GLOBALS                                   PHP Platform
+VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
+VARIABLE   $_COOKIE                                   PHP Platform
+VARIABLE   $_ENV                                      PHP Platform
+VARIABLE   $_FILES                                    PHP Platform
+VARIABLE   $_GET                                      PHP Platform
+VARIABLE   $_POST                                     PHP Platform
+VARIABLE   $_REQUEST                                  PHP Platform
+VARIABLE   $_SERVER                                   PHP Platform
+VARIABLE   $_SESSION                                  PHP Platform
+VARIABLE   $argc                                      PHP Platform
+VARIABLE   $argv                                      PHP Platform
+VARIABLE   $http_response_header                      PHP Platform
+VARIABLE   $php_errormsg                              PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.completion
new file mode 100644
index 000000000000..0239234121e2
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_03.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+Test::{$var|iable};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+VARIABLE   string $variable                [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.completion
new file mode 100644
index 000000000000..f3b8d4893129
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_04.completion
@@ -0,0 +1,21 @@
+Code completion result for source line:
+$test::{$variable . $|e};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+VARIABLE   string $e                       [PUBLIC]   dynamicClassConstantFetch.php
+VARIABLE   string $test                    [PUBLIC]   dynamicClassConstantFetch.php
+VARIABLE   string $variable                [PUBLIC]   dynamicClassConstantFetch.php
+------------------------------------
+VARIABLE   $GLOBALS                                   PHP Platform
+VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
+VARIABLE   $_COOKIE                                   PHP Platform
+VARIABLE   $_ENV                                      PHP Platform
+VARIABLE   $_FILES                                    PHP Platform
+VARIABLE   $_GET                                      PHP Platform
+VARIABLE   $_POST                                     PHP Platform
+VARIABLE   $_REQUEST                                  PHP Platform
+VARIABLE   $_SERVER                                   PHP Platform
+VARIABLE   $_SESSION                                  PHP Platform
+VARIABLE   $argc                                      PHP Platform
+VARIABLE   $argv                                      PHP Platform
+VARIABLE   $http_response_header                      PHP Platform
+VARIABLE   $php_errormsg                              PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.completion
new file mode 100644
index 000000000000..523f7fe70244
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_05.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+$test::{$variable . $e|};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+VARIABLE   string $e                       [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06a.completion
new file mode 100644
index 000000000000..e6dd62b0d11f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06a.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+Test::{Tes|t::method()}::{test($variable)};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      Test                            [PUBLIC]   dynamicClassConstantFetch.php
+METHOD     test()                          [PUBLIC]   dynamicClassConstantFetch.php
+METHOD     test(string $param = "test")    [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06b.completion
new file mode 100644
index 000000000000..94957736af61
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06b.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+Test::{Test::met|hod()}::{test($variable)};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+METHOD     method()                        [STATIC]   Test
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06c.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06c.completion
new file mode 100644
index 000000000000..8a2a1170a2a0
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06c.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+Test::{Test::method()}::{te|st($variable)};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      Test                            [PUBLIC]   dynamicClassConstantFetch.php
+METHOD     test()                          [PUBLIC]   dynamicClassConstantFetch.php
+METHOD     test(string $param = "test")    [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06d.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06d.completion
new file mode 100644
index 000000000000..d12342094884
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_06d.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+Test::{Test::method()}::{test($var|iable)};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+VARIABLE   string $variable                [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07a.completion
new file mode 100644
index 000000000000..8dd7fceb2ab7
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07a.completion
@@ -0,0 +1,11 @@
+Code completion result for source line:
+case TEST3 = self::|{self::TES . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CONSTANT   T 'T'                           [PUBLIC]   EnumTest
+CONSTANT   TES 'TES'                       [PUBLIC]   EnumTest
+CONSTANT   TEST 'test'                     [PUBLIC]   EnumTest
+CONSTANT   TEST1 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST2 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST3 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST4 ?                         [PUBLIC]   EnumTest
+CONSTANT   class \EnumTest                 [PUBLIC]   Magic Constant
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07b.completion
new file mode 100644
index 000000000000..112c09e8ca72
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07b.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+case TEST3 = self::{sel|f::TES . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+KEYWORD    self::                                     null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07c.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07c.completion
new file mode 100644
index 000000000000..e6783be3f5bb
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_07c.completion
@@ -0,0 +1,9 @@
+Code completion result for source line:
+case TEST3 = self::{self::TE|S . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CONSTANT   TES 'TES'                       [PUBLIC]   EnumTest
+CONSTANT   TEST 'test'                     [PUBLIC]   EnumTest
+CONSTANT   TEST1 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST2 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST3 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST4 ?                         [PUBLIC]   EnumTest
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08a.completion
new file mode 100644
index 000000000000..dd32663d54ba
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08a.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+case TEST4 = EnumTe|st::{self::{self::TES} . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      EnumTest                        [PUBLIC]   dynamicClassConstantFetch.php
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08b.completion
new file mode 100644
index 000000000000..14ecf1572345
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08b.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+case TEST4 = EnumTest::{se|lf::{self::TES} . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+KEYWORD    self::                                     null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08c.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08c.completion
new file mode 100644
index 000000000000..f42b6aa9de73
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08c.completion
@@ -0,0 +1,4 @@
+Code completion result for source line:
+case TEST4 = EnumTest::{self::{sel|f::TES} . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+KEYWORD    self::                                     null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08d.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08d.completion
new file mode 100644
index 000000000000..a2953a29b4c5
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08d.completion
@@ -0,0 +1,9 @@
+Code completion result for source line:
+case TEST4 = EnumTest::{self::{self::TE|S} . self::T};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CONSTANT   TES 'TES'                       [PUBLIC]   EnumTest
+CONSTANT   TEST 'test'                     [PUBLIC]   EnumTest
+CONSTANT   TEST1 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST2 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST3 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST4 ?                         [PUBLIC]   EnumTest
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08e.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08e.completion
new file mode 100644
index 000000000000..786a4ef2752a
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetch/dynamicClassConstantFetch.php.testDynamicClassConstantFetch_08e.completion
@@ -0,0 +1,10 @@
+Code completion result for source line:
+case TEST4 = EnumTest::{self::{self::TES} . self::T|};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CONSTANT   T 'T'                           [PUBLIC]   EnumTest
+CONSTANT   TES 'TES'                       [PUBLIC]   EnumTest
+CONSTANT   TEST 'test'                     [PUBLIC]   EnumTest
+CONSTANT   TEST1 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST2 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST3 ?                         [PUBLIC]   EnumTest
+CONSTANT   TEST4 ?                         [PUBLIC]   EnumTest
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php
new file mode 100644
index 000000000000..365762c1490c
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php
@@ -0,0 +1,25 @@
+<?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 TEST = "Test";
+    public const TEST1 = self::{};
+}
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php.testDynamicClassConstantFetchInConstDeclTyping_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php.testDynamicClassConstantFetchInConstDeclTyping_01.completion
new file mode 100644
index 000000000000..fb5f22de7224
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInConstDeclTyping/inConstantDeclarationTyping.php.testDynamicClassConstantFetchInConstDeclTyping_01.completion
@@ -0,0 +1,7 @@
+Code completion result for source line:
+public const TEST1 = self::{|};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+KEYWORD    parent::                                   null
+KEYWORD    self::                                     null
+------------------------------------
+KEYWORD    array                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php
new file mode 100644
index 000000000000..0835c52ce661
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php
@@ -0,0 +1,25 @@
+<?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.
+ */
+
+enum Test: string {
+    case TEST = "Test";
+    case TEST1 = self::{};
+}
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php.testDynamicClassConstantFetchInEnumCaseTyping_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php.testDynamicClassConstantFetchInEnumCaseTyping_01.completion
new file mode 100644
index 000000000000..a12e81b16374
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchInEnumCaseTyping/inEnumCaseTyping.php.testDynamicClassConstantFetchInEnumCaseTyping_01.completion
@@ -0,0 +1,7 @@
+Code completion result for source line:
+case TEST1 = self::{|};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+KEYWORD    parent::                                   null
+KEYWORD    self::                                     null
+------------------------------------
+KEYWORD    array                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php
new file mode 100644
index 000000000000..c65228588afa
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php
@@ -0,0 +1,56 @@
+<?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 TEST = 'test';
+    public const TES = 'TES';
+    public const T = 'T';
+    public const TEST1 = self::{'TEST'};
+    public const TEST2 = self::{'TES' . 'T'};
+    public const TEST3 = self::{self::TES . self::T};
+
+    public static function method(): void {
+        
+    }
+}
+
+enum EnumTest: string {
+
+    case TEST = 'test';
+    case TES = 'TES';
+    case T = 'T';
+    case TEST1 = self::{'TEST'};
+    case TEST2 = self::{'TES' . 'T'};
+    case TEST3 = self::{self::TES . self::T};
+}
+
+function test(string $param = "test"): void {
+    
+}
+
+$variable = 'TEST';
+$e = 'e';
+$test = "Test";
+
+Test::test();
+
+Test::{};
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion
new file mode 100644
index 000000000000..678ffc7d3a23
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion
@@ -0,0 +1,94 @@
+Code completion result for source line:
+Test::{|};
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      EnumTest                        [PUBLIC]   dynamicClassConstantFetchTyping.php
+CLASS      Test                            [PUBLIC]   dynamicClassConstantFetchTyping.php
+METHOD     test()                          [PUBLIC]   dynamicClassConstantFetchTyping.php
+METHOD     test(string $param = "test")    [PUBLIC]   dynamicClassConstantFetchTyping.php
+VARIABLE   string $e                       [PUBLIC]   dynamicClassConstantFetchTyping.php
+VARIABLE   string $test                    [PUBLIC]   dynamicClassConstantFetchTyping.php
+VARIABLE   string $variable                [PUBLIC]   dynamicClassConstantFetchTyping.php
+------------------------------------
+VARIABLE   $GLOBALS                                   PHP Platform
+VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
+VARIABLE   $_COOKIE                                   PHP Platform
+VARIABLE   $_ENV                                      PHP Platform
+VARIABLE   $_FILES                                    PHP Platform
+VARIABLE   $_GET                                      PHP Platform
+VARIABLE   $_POST                                     PHP Platform
+VARIABLE   $_REQUEST                                  PHP Platform
+VARIABLE   $_SERVER                                   PHP Platform
+VARIABLE   $_SESSION                                  PHP Platform
+VARIABLE   $argc                                      PHP Platform
+VARIABLE   $argv                                      PHP Platform
+VARIABLE   $http_response_header                      PHP Platform
+VARIABLE   $php_errormsg                              PHP Platform
+KEYWORD    abstract                                   null
+KEYWORD    and                                        null
+KEYWORD    array                                      null
+KEYWORD    as                                         null
+KEYWORD    break                                      null
+KEYWORD    case                                       null
+KEYWORD    catch                                      null
+KEYWORD    class                                      null
+KEYWORD    clone                                      null
+KEYWORD    const                                      null
+KEYWORD    continue                                   null
+KEYWORD    declare                                    null
+KEYWORD    default                                    null
+KEYWORD    die()                                      Language Construct
+KEYWORD    do                                         null
+KEYWORD    echo '';                                   Language Construct
+KEYWORD    else                                       null
+KEYWORD    elseif                                     null
+KEYWORD    empty()                                    Language Construct
+KEYWORD    enddeclare                                 null
+KEYWORD    endfor                                     null
+KEYWORD    endforeach                                 null
+KEYWORD    endif                                      null
+KEYWORD    endswitch                                  null
+KEYWORD    endwhile                                   null
+KEYWORD    enum                                       null
+KEYWORD    eval()                                     Language Construct
+KEYWORD    exit()                                     Language Construct
+KEYWORD    extends                                    null
+KEYWORD    final                                      null
+KEYWORD    finally                                    null
+KEYWORD    fn                                         null
+KEYWORD    for                                        null
+KEYWORD    foreach                                    null
+KEYWORD    function                                   null
+KEYWORD    global                                     null
+KEYWORD    goto                                       null
+KEYWORD    if                                         null
+KEYWORD    implements                                 null
+KEYWORD    include '';                                Language Construct
+KEYWORD    include_once '';                           Language Construct
+KEYWORD    instanceof                                 null
+KEYWORD    interface                                  null
+KEYWORD    isset()                                    Language Construct
+KEYWORD    list()                                     Language Construct
+KEYWORD    match                                      null
+KEYWORD    namespace                                  null
+KEYWORD    new                                        null
+KEYWORD    or                                         null
+KEYWORD    print '';                                  Language Construct
+KEYWORD    private                                    null
+KEYWORD    protected                                  null
+KEYWORD    public                                     null
+KEYWORD    readonly                                   null
+KEYWORD    require '';                                Language Construct
+KEYWORD    require_once '';                           Language Construct
+KEYWORD    return ;                                   Language Construct
+KEYWORD    static                                     null
+KEYWORD    switch                                     null
+KEYWORD    throw                                      null
+KEYWORD    trait                                      null
+KEYWORD    try                                        null
+KEYWORD    unset()                                    Language Construct
+KEYWORD    use                                        null
+KEYWORD    var                                        null
+KEYWORD    while                                      null
+KEYWORD    xor                                        null
+KEYWORD    yield                                      null
+KEYWORD    yield from                                 null
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/PHPBracesMatcherTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/PHPBracesMatcherTest.java
index a58413015a06..fcdd18a810f7 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/PHPBracesMatcherTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/PHPBracesMatcherTest.java
@@ -522,7 +522,7 @@ public void testAttributeSyntax_05b() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method~(#[Class1(6)] $param1, #[Class1('foo', 'bar', 7)] int $pram2@)^ {}\n"
                 + "\n"
-                + "@}^"
+                + "}"
         );
         matchesForward(""
                 + "#[Class1(1)]\n"
@@ -534,7 +534,7 @@ public void testAttributeSyntax_05b() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method@^(#[Class1(6)] $param1, #[Class1('foo', 'bar', 7)] int $pram2~) {}\n"
                 + "\n"
-                + "~}"
+                + "}"
         );
     }
 
@@ -549,7 +549,7 @@ public void testAttributeSyntax_05c() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method(#[Class1(6)] $param1, ~#[Class1('foo', 'bar', 7)@]^ int $pram2) {}\n"
                 + "\n"
-                + "@}^"
+                + "}"
         );
         matchesForward(""
                 + "#[Class1(1)]\n"
@@ -561,7 +561,7 @@ public void testAttributeSyntax_05c() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method(#[Class1(6)] $param1, @^#[Class1('foo', 'bar', 7)~] int $pram2) {}\n"
                 + "\n"
-                + "~}"
+                + "}"
         );
     }
 
@@ -576,7 +576,7 @@ public void testAttributeSyntax_05d() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method(#[Class1(6)] $param1, #[Class1~('foo', 'bar', 7@)^] int $pram2) {}\n"
                 + "\n"
-                + "@}^"
+                + "}"
         );
         matchesForward(""
                 + "#[Class1(1)]\n"
@@ -588,7 +588,138 @@ public void testAttributeSyntax_05d() throws Exception {
                 + "    #[Class1(5)]\n"
                 + "    public function method(#[Class1(6)] $param1, #[Class1@^('foo', 'bar', 7~)] int $pram2) {}\n"
                 + "\n"
-                + "~}"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_01a() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::TES . self::T@}^;\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@^{self::TES . self::T~};\n"
+                + "}"
+        );
+    }
+
+
+    public void testDynamicClassConstantFetch_01b() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@{^self::TES . self::T~};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::TES . self::T@^};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_02a() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::{self::TES} . self::T@}^;\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@^{self::{self::TES} . self::T~};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_02b() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@{^self::{self::TES} . self::T~};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::{self::TES} . self::T@^};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_02c() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::~{self::TES@}^ . self::T};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::@^{self::TES~} . self::T};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_02d() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::@{^self::TES~} . self::T};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::~{self::TES@^} . self::T};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_03a() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::{self::TES}@}^;\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@^{self::{self::TES}~};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_03b() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::@{^self::{self::TES}~};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::~{self::{self::TES}@^};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_03c() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::~{self::TES@}^};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::@^{self::TES~}};\n"
+                + "}"
+        );
+    }
+
+    public void testDynamicClassConstantFetch_03d() throws Exception {
+        matchesBackward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::@{^self::TES~}};\n"
+                + "}"
+        );
+        matchesForward(""
+                + "class Test {\n"
+                + "    public const TEST = self::{self::~{self::TES@^}};\n"
+                + "}"
         );
     }
 
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP83CodeCompletionTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP83CodeCompletionTest.java
new file mode 100644
index 000000000000..27bd06e2731f
--- /dev/null
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP83CodeCompletionTest.java
@@ -0,0 +1,142 @@
+/*
+ * 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.
+ */
+package org.netbeans.modules.php.editor.completion;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.Map;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.modules.php.project.api.PhpSourcePath;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+public class PHP83CodeCompletionTest extends PHPCodeCompletionTestBase {
+
+    public PHP83CodeCompletionTest(String testName) {
+        super(testName);
+    }
+
+    @Override
+    protected Map<String, ClassPath> createClassPathsForTest() {
+        return Collections.singletonMap(
+            PhpSourcePath.SOURCE_CP,
+            ClassPathSupport.createClassPath(new FileObject[]{
+                FileUtil.toFileObject(new File(getDataDir(), "/testfiles/completion/lib/php83/" + getTestDirName()))
+            })
+        );
+    }
+
+    private String getTestDirName() {
+        String name = getName();
+        int indexOf = name.indexOf("_");
+        if (indexOf != -1) {
+            name = name.substring(0, indexOf);
+        }
+        return name;
+    }
+
+    private String getTestPath(String fileName) {
+        return String.format("testfiles/completion/lib/php83/%s/%s.php", getTestDirName(), fileName);
+    }
+
+    private void checkCompletion(String fileName, String caretPosition) throws Exception {
+        checkCompletion(getTestPath(fileName), caretPosition, false);
+    }
+
+    public void testDynamicClassConstantFetchInConstDeclTyping_01() throws Exception {
+        checkCompletion("inConstantDeclarationTyping", "    public const TEST1 = self::{^};");
+    }
+
+    public void testDynamicClassConstantFetchInEnumCaseTyping_01() throws Exception {
+        checkCompletion("inEnumCaseTyping", "    case TEST1 = self::{^};");
+    }
+
+    public void testDynamicClassConstantFetchTyping_01() throws Exception {
+        checkCompletion("dynamicClassConstantFetchTyping", "Test::{^};");
+    }
+
+    public void testDynamicClassConstantFetch_01() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    public const TEST3 = self::{self::T^ES . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_02() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{$^variable};");
+    }
+
+    public void testDynamicClassConstantFetch_03() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{$var^iable};");
+    }
+
+    public void testDynamicClassConstantFetch_04() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "$test::{$variable . $^e};");
+    }
+
+    public void testDynamicClassConstantFetch_05() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "$test::{$variable . $e^};");
+    }
+
+    public void testDynamicClassConstantFetch_06a() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{Tes^t::method()}::{test($variable)};");
+    }
+
+    public void testDynamicClassConstantFetch_06b() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{Test::met^hod()}::{test($variable)};");
+    }
+
+    public void testDynamicClassConstantFetch_06c() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{Test::method()}::{te^st($variable)};");
+    }
+
+    public void testDynamicClassConstantFetch_06d() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "Test::{Test::method()}::{test($var^iable)};");
+    }
+
+    public void testDynamicClassConstantFetch_07a() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST3 = self::^{self::TES . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_07b() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST3 = self::{sel^f::TES . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_07c() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST3 = self::{self::TE^S . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_08a() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST4 = EnumTe^st::{self::{self::TES} . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_08b() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST4 = EnumTest::{se^lf::{self::TES} . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_08c() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST4 = EnumTest::{self::{sel^f::TES} . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_08d() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST4 = EnumTest::{self::{self::TE^S} . self::T};");
+    }
+
+    public void testDynamicClassConstantFetch_08e() throws Exception {
+        checkCompletion("dynamicClassConstantFetch", "    case TEST4 = EnumTest::{self::{self::TES} . self::T^};");
+    }
+}