From d05c5a5afbeac88122a2f2144758d2d6433448a3 Mon Sep 17 00:00:00 2001
From: Junichi Yamamoto <junichi11@apache.org>
Date: Tue, 25 Oct 2022 14:00:54 +0900
Subject: [PATCH 1/3] PHP 8.2 Support: Add PHP 8.2 to the `PhpVersion`

- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc#php_82
- https://wiki.php.net/todo/php82
---
 php/php.api.phpmodule/manifest.mf             |  2 +-
 .../netbeans/modules/php/api/PhpVersion.java  | 21 ++++++++++++++++++-
 php/php.editor/nbproject/project.properties   |  2 +-
 php/php.editor/nbproject/project.xml          |  2 +-
 php/php.project/manifest.mf                   |  2 +-
 php/php.project/nbproject/project.xml         |  2 +-
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/php/php.api.phpmodule/manifest.mf b/php/php.api.phpmodule/manifest.mf
index 82ffd45eb277..02ff8924b93f 100644
--- a/php/php.api.phpmodule/manifest.mf
+++ b/php/php.api.phpmodule/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.api.phpmodule
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.86
+OpenIDE-Module-Specification-Version: 2.87
diff --git a/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java b/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java
index 9f0893ab3a90..daa1865bdd8c 100644
--- a/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java
+++ b/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java
@@ -38,6 +38,7 @@
     "PhpVersion.PHP_74=PHP 7.4",
     "PhpVersion.PHP_80=PHP 8.0",
     "PhpVersion.PHP_81=PHP 8.1",
+    "PhpVersion.PHP_82=PHP 8.2",
 })
 public enum PhpVersion {
 
@@ -96,7 +97,13 @@ public enum PhpVersion {
      * PHP 8.1.
      * @since 2.80
      */
-    PHP_81(Bundle.PhpVersion_PHP_81());
+    PHP_81(Bundle.PhpVersion_PHP_81()),
+    /**
+     * PHP 8.2.
+     * @since 2.87
+     */
+    PHP_82(Bundle.PhpVersion_PHP_82()),
+    ;
 
     private final String displayName;
     private final boolean namespaces;
@@ -220,6 +227,17 @@ public boolean hasNeverType() {
         return this.compareTo(PhpVersion.PHP_81) >= 0;
     }
 
+    /**
+     * Check whether this version supports the null, false, and true types.
+     *
+     * @return {@code true} if this version supports null, false, and true
+     * types, {@code false} otherwise
+     * @since 2.87
+     */
+    public boolean hasNullAndFalseAndTrueTypes() {
+        return this.compareTo(PhpVersion.PHP_82) >= 0;
+    }
+
     /**
      * Check whether this is supported version yet by PHP official.
      *
@@ -254,6 +272,7 @@ private enum Period {
         PHP_74(LocalDate.of(2019, 11, 28), LocalDate.of(2021, 11, 28), LocalDate.of(2022, 11, 28)),
         PHP_80(LocalDate.of(2020, 11, 26), LocalDate.of(2022, 11, 26), LocalDate.of(2023, 11, 26)),
         PHP_81(LocalDate.of(2021, 11, 25), LocalDate.of(2023, 11, 25), LocalDate.of(2024, 11, 25)),
+        PHP_82(LocalDate.of(2022, 11, 24), LocalDate.of(2024, 11, 24), LocalDate.of(2025, 11, 24)),
         ;
 
         private final LocalDate initialRelease;
diff --git a/php/php.editor/nbproject/project.properties b/php/php.editor/nbproject/project.properties
index bcc848165849..8d67a775347c 100644
--- a/php/php.editor/nbproject/project.properties
+++ b/php/php.editor/nbproject/project.properties
@@ -20,7 +20,7 @@ build.compiler=extJavac
 nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
 javac.compilerargs=-J-Xmx512m
 nbm.needs.restart=true
-spec.version.base=2.19.0
+spec.version.base=2.20.0
 release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
 sigtest.gen.fail.on.error=false
 
diff --git a/php/php.editor/nbproject/project.xml b/php/php.editor/nbproject/project.xml
index 3ab8d579668e..e5d659e31abd 100644
--- a/php/php.editor/nbproject/project.xml
+++ b/php/php.editor/nbproject/project.xml
@@ -304,7 +304,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>2.83</specification-version>
+                        <specification-version>2.87</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/php/php.project/manifest.mf b/php/php.project/manifest.mf
index 6d7827f6a5de..8a0e17a4f4b9 100644
--- a/php/php.project/manifest.mf
+++ b/php/php.project/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.160
+OpenIDE-Module-Specification-Version: 2.161
 OpenIDE-Module: org.netbeans.modules.php.project
 OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
diff --git a/php/php.project/nbproject/project.xml b/php/php.project/nbproject/project.xml
index c1e55879fee0..de7f5dbf9b13 100644
--- a/php/php.project/nbproject/project.xml
+++ b/php/php.project/nbproject/project.xml
@@ -284,7 +284,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>2.74</specification-version>
+                        <specification-version>2.87</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

From fc440131547658fde6d7f7ebcb89cd06f53c7d1a Mon Sep 17 00:00:00 2001
From: Junichi Yamamoto <junichi11@apache.org>
Date: Wed, 26 Oct 2022 14:11:48 +0900
Subject: [PATCH 2/3] PHP 8.2 Support: Allow null and false as stand-alone
 types

- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/null-false-standalone-types
- Fix `UnusableTypesHintError`
- Add/Fix unit tests
---
 .../verification/UnusableTypesHintError.java  | 37 +++++++++++--
 .../testNullableTypes_01.php                  | 44 ++++++++++++++++
 ...bleTypes_01.php.testNullableTypes_01.hints | 18 +++++++
 ...es_01.php.testNullableTypes_01_PHP81.hints | 26 ++++++++++
 .../testUnionTypes_01.php                     |  1 +
 ...tUnionTypes_01.php.testUnionTypes_01.hints | 18 -------
 ...Types_01.php.testUnionTypes_01_PHP81.hints | 52 +++++++++++++++++++
 .../UnusableTypesHintErrorTest.java           | 28 ++++++++++
 8 files changed, 203 insertions(+), 21 deletions(-)
 create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01.hints
 create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
 create mode 100644 php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
index 2de53aeb9cd6..9dc4a7e8165d 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
@@ -86,13 +86,17 @@ public void invoke(PHPRuleContext context, List<Hint> result) {
         if (phpParseResult.getProgram() != null) {
             FileObject fileObject = phpParseResult.getSnapshot().getSource().getFileObject();
             if (fileObject != null) {
-                CheckVisitor checkVisitor = new CheckVisitor(this, fileObject, phpParseResult.getModel(), CodeUtils.getPhpVersion(fileObject));
+                CheckVisitor checkVisitor = new CheckVisitor(this, fileObject, phpParseResult.getModel(), getPhpVersion(fileObject));
                 phpParseResult.getProgram().accept(checkVisitor);
                 result.addAll(checkVisitor.getHints());
             }
         }
     }
 
+    protected PhpVersion getPhpVersion(FileObject fileObject) {
+        return CodeUtils.getPhpVersion(fileObject);
+    }
+
     //~ Inner classes
     private static final class CheckVisitor extends DefaultVisitor {
 
@@ -229,6 +233,8 @@ public void visit(NullableType nullableType) {
             Expression type = nullableType.getType();
             if (phpVersion.hasMixedType() && type instanceof NamespaceName && isMixedType((NamespaceName) type)) {
                 createError(type, Type.MIXED, UnusableType.Context.Nullable);
+            } else if (type instanceof NamespaceName && isNullType((NamespaceName) type)) {
+                createError(type, Type.NULL, UnusableType.Context.Nullable);
             }
             super.visit(nullableType);
         }
@@ -328,16 +334,41 @@ private void checkReturnType(@NullAllowed Expression returnType, boolean isInUni
         }
 
         private void checkFalseAndNullTypes(NamespaceName type) {
-            if (isFalseType(type)) {
+            if (isFalseType(type) && !phpVersion.hasNullAndFalseAndTrueTypes()) {
                 createError(type, Type.FALSE, UnusableType.Context.Standalone);
-            } else if (isNullType(type)) {
+            } else if (isNullType(type) && !phpVersion.hasNullAndFalseAndTrueTypes()) {
                 createError(type, Type.NULL, UnusableType.Context.Standalone);
             }
         }
 
+        private void checkFalseAndNullTypes(UnionType unionType) {
+            // null|false or false|null
+            if (phpVersion.hasNullAndFalseAndTrueTypes() || unionType.getTypes().size() != 2) {
+                return;
+            }
+            Expression falseType = null;
+            boolean hasNull = false;
+            for (Expression type : unionType.getTypes()) {
+                if (CancelSupport.getDefault().isCancelled()) {
+                    return;
+                }
+                if (type instanceof NamespaceName) {
+                    if (isFalseType((NamespaceName) type)) {
+                        falseType = type;
+                    } else if (isNullType((NamespaceName) type)) {
+                        hasNull = true;
+                    }
+                }
+            }
+            if (falseType != null && hasNull) {
+                createError(falseType, Type.FALSE, UnusableType.Context.Standalone);
+            }
+        }
+
         private void checkUnionType(UnionType unionType) {
             checkDuplicateType(unionType.getTypes());
             checkRedundantTypeCombination(unionType);
+            checkFalseAndNullTypes(unionType); // null|false or false|null
         }
 
         private void checkDuplicateType(List<Expression> types) {
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
new file mode 100644
index 000000000000..c4e3c4022559
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
@@ -0,0 +1,44 @@
+<?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 NullableTypes {
+
+    private ?mixed $mixed;
+    private ?null $null;
+    private ?false $false;
+
+    public function returnMixed(): ?mixed {
+    }
+
+    public function returnNull(): ?null {
+    }
+
+    public function returnFalse(): ?false {
+    }
+
+    public function parameterMixed(?mixed $mixed) {
+    }
+
+    public function parameterNull(?null $null) {
+    }
+
+    public function parameterFalse(?false $false) {
+    }
+}
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01.hints
new file mode 100644
index 000000000000..bc748be49c49
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01.hints
@@ -0,0 +1,18 @@
+    private ?mixed $mixed;
+             -----
+HINT:"mixed" cannot be used as a nullable type.
+    private ?null $null;
+             ----
+HINT:"null" cannot be used as a nullable type.
+    public function returnMixed(): ?mixed {
+                                    -----
+HINT:"mixed" cannot be used as a nullable type.
+    public function returnNull(): ?null {
+                                   ----
+HINT:"null" cannot be used as a nullable type.
+    public function parameterMixed(?mixed $mixed) {
+                                    -----
+HINT:"mixed" cannot be used as a nullable type.
+    public function parameterNull(?null $null) {
+                                   ----
+HINT:"null" cannot be used as a nullable type.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
new file mode 100644
index 000000000000..6fde2a4b4f44
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
@@ -0,0 +1,26 @@
+    private ?mixed $mixed;
+             -----
+HINT:"mixed" cannot be used as a nullable type.
+    private ?null $null;
+             ----
+HINT:"null" cannot be used as a nullable type.
+HINT:"null" cannot be used as a standalone type.
+    private ?false $false;
+             -----
+HINT:"false" cannot be used as a standalone type.
+    public function returnMixed(): ?mixed {
+                                    -----
+HINT:"mixed" cannot be used as a nullable type.
+    public function returnNull(): ?null {
+                                   ----
+HINT:"null" cannot be used as a nullable type.
+HINT:"null" cannot be used as a standalone type.
+    public function returnFalse(): ?false {
+                                    -----
+HINT:"false" cannot be used as a standalone type.
+    public function parameterMixed(?mixed $mixed) {
+                                    -----
+HINT:"mixed" cannot be used as a nullable type.
+    public function parameterNull(?null $null) {
+                                   ----
+HINT:"null" cannot be used as a nullable type.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
index 28cd098f1859..489b729a3176 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
@@ -29,6 +29,7 @@ class UnusableTypes {
     private iterable|array $iterable1;
     private iterable|Traversable $iterable2;
     private iterable|array|Traversable $iterable3;
+    private null|false $nullFalse; // PHP 8.2: OK
 
     public function returnFalse(): false {
     }
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
index da3610438ec6..2a97d34161ef 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
@@ -1,12 +1,6 @@
     private int|callable $callable;
                 --------
 HINT:"callable" cannot be used as a property type.
-    private false $false;
-            -----
-HINT:"false" cannot be used as a standalone type.
-    private null $null;
-            ----
-HINT:"null" cannot be used as a standalone type.
     private bool|false $boolFalse;
                  -----
 HINT:Type "false" is duplicated.
@@ -26,21 +20,9 @@ HINT:Redundant combination: "iterable|Traversable" contains both "iterable" and
             --------------------------
 HINT:Redundant combination: "iterable|array|Traversable" contains both "iterable" and "Traversable".
 HINT:Redundant combination: "iterable|array|Traversable" contains both "iterable" and "array".
-    public function returnFalse(): false {
-                                   -----
-HINT:"false" cannot be used as a standalone type.
-    public function returnNull(): null {
-                                  ----
-HINT:"null" cannot be used as a standalone type.
     public function returnDuplicatedType(): UnionType2|UnionType2 {
                                                        ----------
 HINT:Type "UnionType2" is duplicated.
-    public function parameterFalse(false $false) {
-                                   -----
-HINT:"false" cannot be used as a standalone type.
-    public function parameterNull(null $null) {
-                                  ----
-HINT:"null" cannot be used as a standalone type.
     public function parameterDuplicatedType(UnionType2|UnionType2 $duplicatedType) {
                                                        ----------
 HINT:Type "UnionType2" is duplicated.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints
new file mode 100644
index 000000000000..f3d39a663365
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints
@@ -0,0 +1,52 @@
+    private int|callable $callable;
+                --------
+HINT:"callable" cannot be used as a property type.
+    private false $false;
+            -----
+HINT:"false" cannot be used as a standalone type.
+    private null $null;
+            ----
+HINT:"null" cannot be used as a standalone type.
+    private bool|false $boolFalse;
+                 -----
+HINT:Type "false" is duplicated.
+    private bool|bool $duplicatedBool;
+                 ----
+HINT:Type "bool" is duplicated.
+    private int|INT $duplicatedInt;
+                ---
+HINT:Type "INT" is duplicated.
+    private iterable|array $iterable1;
+            --------------
+HINT:Redundant combination: "iterable|array" contains both "iterable" and "array".
+    private iterable|Traversable $iterable2;
+            --------------------
+HINT:Redundant combination: "iterable|Traversable" contains both "iterable" and "Traversable".
+    private iterable|array|Traversable $iterable3;
+            --------------------------
+HINT:Redundant combination: "iterable|array|Traversable" contains both "iterable" and "Traversable".
+HINT:Redundant combination: "iterable|array|Traversable" contains both "iterable" and "array".
+    private null|false $nullFalse; // PHP 8.2: OK
+                 -----
+HINT:"false" cannot be used as a standalone type.
+    public function returnFalse(): false {
+                                   -----
+HINT:"false" cannot be used as a standalone type.
+    public function returnNull(): null {
+                                  ----
+HINT:"null" cannot be used as a standalone type.
+    public function returnDuplicatedType(): UnionType2|UnionType2 {
+                                                       ----------
+HINT:Type "UnionType2" is duplicated.
+    public function parameterFalse(false $false) {
+                                   -----
+HINT:"false" cannot be used as a standalone type.
+    public function parameterNull(null $null) {
+                                  ----
+HINT:"null" cannot be used as a standalone type.
+    public function parameterDuplicatedType(UnionType2|UnionType2 $duplicatedType) {
+                                                       ----------
+HINT:Type "UnionType2" is duplicated.
+    public function voidInUnionType(): void|int {
+                                       ----
+HINT:"void" cannot be used as a union type.
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintErrorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintErrorTest.java
index e65ece2d5f3f..5906db4cfe46 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintErrorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintErrorTest.java
@@ -18,6 +18,9 @@
  */
 package org.netbeans.modules.php.editor.verification;
 
+import org.netbeans.modules.php.api.PhpVersion;
+import org.openide.filesystems.FileObject;
+
 public class UnusableTypesHintErrorTest extends PHPHintsTestBase {
 
     public UnusableTypesHintErrorTest(String testName) {
@@ -36,6 +39,10 @@ public void testUnionTypes_01() throws Exception {
         checkHints(new UnusableTypesHintError(), "testUnionTypes_01.php");
     }
 
+    public void testUnionTypes_01_PHP81() throws Exception {
+        checkHints(new UnusableTypesHintErrorStub(PhpVersion.PHP_81), "testUnionTypes_01.php");
+    }
+
     public void testStaticReturnTypes_01() throws Exception {
         checkHints(new UnusableTypesHintError(), "testStaticReturnTypes_01.php");
     }
@@ -52,9 +59,30 @@ public void testIntersectionTypes_01() throws Exception {
         checkHints(new UnusableTypesHintError(), "testIntersectionTypes_01.php");
     }
 
+    public void testNullableTypes_01() throws Exception {
+        checkHints(new UnusableTypesHintError(), "testNullableTypes_01.php");
+    }
+
+    public void testNullableTypes_01_PHP81() throws Exception {
+        checkHints(new UnusableTypesHintErrorStub(PhpVersion.PHP_81), "testNullableTypes_01.php");
+    }
+
     @Override
     protected String getTestDirectory() {
         return TEST_DIRECTORY + "UnusableTypesHintError/";
     }
 
+    private static final class UnusableTypesHintErrorStub extends UnusableTypesHintError {
+
+        private PhpVersion phpVersion;
+
+        public UnusableTypesHintErrorStub(PhpVersion phpVersion) {
+            this.phpVersion = phpVersion;
+        }
+
+        @Override
+        protected PhpVersion getPhpVersion(FileObject fileObject) {
+            return phpVersion;
+        }
+    }
 }

From 4760216938d95b80d100d18a61b9d3b93e9faa1f Mon Sep 17 00:00:00 2001
From: Junichi Yamamoto <junichi11@apache.org>
Date: Sat, 29 Oct 2022 15:44:33 +0900
Subject: [PATCH 3/3] PHP 8.2 Support: Add true type

- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/true-type
- Fix `UnusableTypesHintError` and CC
- Add/Fix unit tests for the Hint, the Navigator and CC
---
 .../completion/CompletionContextFinder.java   |   9 +-
 .../editor/completion/PHPCodeCompletion.java  |  12 +-
 .../modules/php/editor/model/impl/Type.java   |   9 +-
 .../verification/UnusableTypesHintError.java  |  95 +++++++++---
 .../structure/standAloneTrueType.pass         |   8 +
 ...ferences.php.testByReferences01.completion |   1 +
 ...ferences.php.testByReferences03.completion |   1 +
 ...ferences.php.testByReferences05.completion |   1 +
 ...ferences.php.testByReferences07.completion |   1 +
 ...ferences.php.testByReferences08.completion |   1 +
 ...ferences.php.testByReferences10.completion |   1 +
 ...ferences.php.testByReferences12.completion |   1 +
 ...ferences.php.testByReferences14.completion |   1 +
 ...ferences.php.testByReferences16.completion |   1 +
 ...ferences.php.testByReferences18.completion |   1 +
 ...ferences.php.testByReferences20.completion |   1 +
 ...ferences.php.testByReferences22.completion |   1 +
 ...ferences.php.testByReferences24.completion |   1 +
 ...ferences.php.testByReferences26.completion |   1 +
 ...ferences.php.testByReferences28.completion |   1 +
 ...ferences.php.testByReferences30.completion |   1 +
 ...ferences.php.testByReferences32.completion |   1 +
 ...ferences.php.testByReferences34.completion |   1 +
 ...ferences.php.testByReferences36.completion |   1 +
 ...ltypes.php.testParamDeclTypes11.completion |   1 +
 ...ltypes.php.testParamDeclTypes14.completion |   1 +
 ...cltypes.php.testParamDeclTypes5.completion |   1 +
 ...cltypes.php.testParamDeclTypes8.completion |   1 +
 ...int.php.testCallableTypeHint_01.completion |   1 +
 ...int.php.testCallableTypeHint_03.completion |   1 +
 ...eturnTypes.php.testReturnType01.completion |   1 +
 ...eturnTypes.php.testReturnType03.completion |   1 +
 ...eturnTypes.php.testReturnType05.completion |   1 +
 ...eturnTypes.php.testReturnType07.completion |   1 +
 ...eturnTypes.php.testReturnType12.completion |   1 +
 ...eturnTypes.php.testReturnType13.completion |   1 +
 ...eturnTypes.php.testReturnType14.completion |   1 +
 ...g01.php.testReturnTypesTyping01.completion |   1 +
 ...g02.php.testReturnTypesTyping02.completion |   1 +
 ...g03.php.testReturnTypesTyping03.completion |   1 +
 ...04.php.testReturnTypesTyping04a.completion |   1 +
 ...04.php.testReturnTypesTyping04b.completion |   1 +
 ...g05.php.testReturnTypesTyping05.completion |   1 +
 ...g06.php.testReturnTypesTyping06.completion |   1 +
 ...g07.php.testReturnTypesTyping07.completion |   1 +
 ...08.php.testReturnTypesTyping08a.completion |   1 +
 ...08.php.testReturnTypesTyping08b.completion |   1 +
 ...g09.php.testReturnTypesTyping09.completion |   1 +
 ...g10.php.testReturnTypesTyping10.completion |   1 +
 ...g11.php.testReturnTypesTyping11.completion |   1 +
 ...12.php.testReturnTypesTyping12a.completion |   1 +
 ...12.php.testReturnTypesTyping12b.completion |   1 +
 ...ypeHints.php.testBoolTypeHint01.completion |   1 +
 ...ypeHints.php.testBoolTypeHint03.completion |   1 +
 ...peHints.php.testFloatTypeHint01.completion |   1 +
 ...peHints.php.testFloatTypeHint03.completion |   1 +
 ...TypeHints.php.testIntTypeHint01.completion |   1 +
 ...TypeHints.php.testIntTypeHint03.completion |   1 +
 ...eHints.php.testStringTypeHint01.completion |   1 +
 ...eHints.php.testStringTypeHint03.completion |   1 +
 ...stNullableTypes_ParameterType01.completion |   2 +
 ...stNullableTypes_ParameterType03.completion |   2 +
 ...stNullableTypes_ParameterType07.completion |   2 +
 ...stNullableTypes_ParameterType09.completion |   2 +
 ...stNullableTypes_ParameterType11.completion |   2 +
 ...stNullableTypes_ParameterType13.completion |   2 +
 ....testNullableTypes_ReturnType01.completion |   2 +
 ....testNullableTypes_ReturnType03.completion |   2 +
 ....testNullableTypes_ReturnType05.completion |   2 +
 ....testNullableTypes_ReturnType09.completion |   2 +
 ....testNullableTypes_ReturnType11.completion |   2 +
 ....testNullableTypes_ReturnType13.completion |   2 +
 ....testNullableTypes_ReturnType15.completion |   2 +
 ...ableTypes_TypingParameterType01.completion |   2 +
 ...ableTypes_TypingParameterType02.completion |   2 +
 ...ableTypes_TypingParameterType03.completion |   2 +
 ...ableTypes_TypingParameterType04.completion |   2 +
 ...ableTypes_TypingParameterType05.completion |   2 +
 ...ableTypes_TypingParameterType06.completion |   2 +
 ...ableTypes_TypingParameterType07.completion |   2 +
 ...ableTypes_TypingParameterType08.completion |   2 +
 ...ableTypes_TypingParameterType09.completion |   2 +
 ...ableTypes_TypingParameterType10.completion |   2 +
 ...ableTypes_TypingParameterType11.completion |   2 +
 ...ableTypes_TypingParameterType12.completion |   2 +
 ...ullableTypes_TypingReturnType01.completion |   2 +
 ...ullableTypes_TypingReturnType02.completion |   2 +
 ...ullableTypes_TypingReturnType03.completion |   2 +
 ...ullableTypes_TypingReturnType04.completion |   2 +
 ...ullableTypes_TypingReturnType05.completion |   2 +
 ...ullableTypes_TypingReturnType06.completion |   2 +
 ...ullableTypes_TypingReturnType07.completion |   2 +
 ...ullableTypes_TypingReturnType08.completion |   2 +
 ...ullableTypes_TypingReturnType09.completion |   2 +
 ...ullableTypes_TypingReturnType10.completion |   2 +
 ...ullableTypes_TypingReturnType11.completion |   2 +
 ...ullableTypes_TypingReturnType12.completion |   2 +
 ...bleTypesInPHPDoc_NullableType04.completion |   2 +
 ...bleTypesInPHPDoc_NullableType06.completion |   2 +
 ....php.testVoidReturnType_Class01.completion |   1 +
 ...p.testVoidReturnType_Function01.completion |   1 +
 ....testVoidReturnType_Interface01.completion |   1 +
 ...tObjectTypeHint_ParameterType01.completion |   1 +
 ...testObjectTypeHint_ReturnType02.completion |   1 +
 ...ions.php.testArrowFunctions_03a.completion |   1 +
 ...ions.php.testArrowFunctions_04a.completion |   1 +
 ...ions.php.testArrowFunctions_05a.completion |   1 +
 ...ions.php.testArrowFunctions_06a.completion |   2 +
 ...ions.php.testArrowFunctions_17b.completion |   1 +
 ...ions.php.testArrowFunctions_23a.completion |   1 +
 ...ions.php.testArrowFunctions_23b.completion |   2 +
 ...p.testTypedProperties20Class_06.completion |   1 +
 ...p.testTypedProperties20Class_08.completion |   1 +
 ...p.testTypedProperties20Class_10.completion |   2 +
 ...p.testTypedProperties20Class_16.completion |   1 +
 ...p.testTypedProperties20Class_17.completion |   1 +
 ...p.testTypedProperties20Trait_06.completion |   1 +
 ...p.testTypedProperties20Trait_08.completion |   1 +
 ...p.testTypedProperties20Trait_09.completion |   2 +
 ...p.testTypedProperties20Trait_11.completion |   2 +
 ...p.testTypedProperties20Trait_17.completion |   1 +
 ...p.testTypedProperties20Trait_18.completion |   1 +
 ...ConstructorPropertyPromotion01a.completion |   1 +
 ...ConstructorPropertyPromotion01b.completion |   1 +
 ...ConstructorPropertyPromotion03a.completion |   1 +
 ...ConstructorPropertyPromotion03b.completion |   1 +
 ...ConstructorPropertyPromotion04a.completion |   2 +
 ...ConstructorPropertyPromotion04b.completion |   2 +
 ...ConstructorPropertyPromotion05a.completion |   1 +
 ...ConstructorPropertyPromotion05b.completion |   1 +
 ...ConstructorPropertyPromotion06a.completion |   1 +
 ...ConstructorPropertyPromotion06b.completion |   1 +
 ...ConstructorPropertyPromotion07a.completion |   1 +
 ...ConstructorPropertyPromotion07b.completion |   1 +
 .../mixedType.php.testMixedType_01.completion |   1 +
 .../mixedType.php.testMixedType_03.completion |   1 +
 .../mixedType.php.testMixedType_05.completion |   1 +
 .../mixedType.php.testMixedType_07.completion |   1 +
 .../mixedType.php.testMixedType_08.completion |   1 +
 .../mixedType.php.testMixedType_09.completion |   1 +
 ...ds01.php.testUnionTypesFields01.completion |   1 +
 ...ds03.php.testUnionTypesFields03.completion |   1 +
 ...ds05.php.testUnionTypesFields05.completion |   1 +
 ...ds06.php.testUnionTypesFields06.completion |   1 +
 ...ionTypesFunctionParameterType01.completion |   1 +
 ...ionTypesFunctionParameterType03.completion |   1 +
 ...ionTypesFunctionParameterType04.completion |   1 +
 ...ionTypesFunctionParameterType05.completion |   1 +
 ...ionTypesFunctionParameterType07.completion |   1 +
 ...tUnionTypesFunctionReturnType01.completion |   1 +
 ...tUnionTypesFunctionReturnType04.completion |   1 +
 ....php.testUnionTypesFunctions_02.completion |   1 +
 ....php.testUnionTypesFunctions_04.completion |   1 +
 ....php.testUnionTypesFunctions_05.completion |   1 +
 ....php.testUnionTypesFunctions_08.completion |   1 +
 ....php.testUnionTypesFunctions_09.completion |   1 +
 ....php.testUnionTypesFunctions_10.completion |   1 +
 ....php.testUnionTypesFunctions_12.completion |   1 +
 ....php.testUnionTypesFunctions_13.completion |   1 +
 ....php.testUnionTypesFunctions_15.completion |   1 +
 ....php.testUnionTypesFunctions_17.completion |   1 +
 ....php.testUnionTypesFunctions_19.completion |   1 +
 ...ds.php.testUnionTypesMethods_01.completion |   1 +
 ...ds.php.testUnionTypesMethods_03.completion |   1 +
 ...ds.php.testUnionTypesMethods_05.completion |   1 +
 ...ds.php.testUnionTypesMethods_07.completion |   1 +
 ...ds.php.testUnionTypesMethods_08.completion |   1 +
 ...ds.php.testUnionTypesMethods_11.completion |   1 +
 ...ds.php.testUnionTypesMethods_12.completion |   1 +
 ...ds.php.testUnionTypesMethods_14.completion |   1 +
 ...ds.php.testUnionTypesMethods_17.completion |   1 +
 ...ds.php.testUnionTypesMethods_18.completion |   1 +
 ...ds.php.testUnionTypesMethods_20.completion |   1 +
 ...ds.php.testUnionTypesMethods_22.completion |   1 +
 ...Type.php.testEnumsFieldType_01a.completion |   1 +
 ...Type.php.testEnumsFieldType_02a.completion |   1 +
 ....php.testEnumsFieldTypeTyping01.completion |   1 +
 ....php.testEnumsFieldTypeTyping03.completion |   1 +
 ...mType.php.testEnumsParamType_01.completion |   1 +
 ...mType.php.testEnumsParamType_09.completion |   2 +
 ...Type.php.testEnumsReturnType_01.completion |   1 +
 ...Type.php.testEnumsReturnType_03.completion |   1 +
 ...Type.php.testEnumsReturnType_08.completion |   2 +
 ...stIntersectionTypesFunctions_04.completion |   1 +
 ...stIntersectionTypesFunctions_09.completion |   1 +
 ...stIntersectionTypesFunctions_15.completion |   1 +
 ...testIntersectionTypesMethods_01.completion |   1 +
 ...testIntersectionTypesMethods_05.completion |   1 +
 ...testIntersectionTypesMethods_07.completion |   1 +
 ...php.testNeverReturnType_Class01.completion |   1 +
 ....testNeverReturnType_Function01.completion |   1 +
 ...testNeverReturnType_Interface01.completion |   1 +
 ...php.testNeverReturnType_Trait01.completion |   1 +
 ...donlyPromotedPropertiesTyping01.completion |   1 +
 ...donlyPromotedPropertiesTyping03.completion |   1 +
 ...donlyPromotedPropertiesTyping05.completion |   1 +
 ...donlyPromotedPropertiesTyping06.completion |   1 +
 ...donlyPromotedPropertiesTyping08.completion |   1 +
 ...donlyPromotedPropertiesTyping10.completion |   1 +
 ...donlyPromotedPropertiesTyping12.completion |   1 +
 ....testReadonlyPropertiesTyping03.completion |   1 +
 ....testReadonlyPropertiesTyping05.completion |   1 +
 ....testReadonlyPropertiesTyping07.completion |   1 +
 ....testReadonlyPropertiesTyping09.completion |   1 +
 ....testReadonlyPropertiesTyping10.completion |   2 +
 .../testNullAndFalseType/nullAndFalseType.php |  38 +++++
 ...ype.php.testNullAndFalseType_01.completion |   6 +
 ...ype.php.testNullAndFalseType_02.completion |   5 +
 ...ype.php.testNullAndFalseType_03.completion |   5 +
 ...ype.php.testNullAndFalseType_04.completion |   6 +
 ...ype.php.testNullAndFalseType_05.completion |   6 +
 ...ype.php.testNullAndFalseType_06.completion |   5 +
 ...ype.php.testNullAndFalseType_07.completion |   5 +
 ...ype.php.testNullAndFalseType_08.completion |   5 +
 ...ype.php.testNullAndFalseType_09.completion |   5 +
 .../lib/php82/testTrueType/trueType.php       |  39 +++++
 .../trueType.php.testTrueType_01.completion   |   6 +
 .../trueType.php.testTrueType_02.completion   |   6 +
 .../trueType.php.testTrueType_03.completion   |   6 +
 .../trueType.php.testTrueType_04.completion   |   6 +
 .../trueType.php.testTrueType_05.completion   |   6 +
 .../trueType.php.testTrueType_06.completion   |   6 +
 .../trueType.php.testTrueType_07.completion   |   6 +
 .../trueType.php.testTrueType_08.completion   |   6 +
 .../trueType.php.testTrueType_09.completion   |   6 +
 .../trueType.php.testTrueType_10.completion   |   6 +
 .../issue204958.php.testUseCase1.completion   |   1 +
 .../tests225089.php.testUseCase1.completion   |   1 +
 .../tests225089.php.testUseCase2.completion   |   1 +
 .../tests225089.php.testUseCase3.completion   |   1 +
 .../tests225089.php.testUseCase4.completion   |   1 +
 ...issue242398_01.php.testUseCase1.completion |   1 +
 ...issue242398_02.php.testUseCase2.completion |   1 +
 .../structure/standAloneTrueType.php          |  39 +++++
 .../testIntersectionTypes_01.php              |   3 +
 ...ypes_01.php.testIntersectionTypes_01.hints |   9 ++
 .../testNullableTypes_01.php                  |   7 +
 ...es_01.php.testNullableTypes_01_PHP81.hints |  13 ++
 .../testUnionTypes_01.php                     |  10 ++
 ...tUnionTypes_01.php.testUnionTypes_01.hints |  11 ++
 ...Types_01.php.testUnionTypes_01_PHP81.hints |  20 +++
 .../completion/PHP82CodeCompletionTest.java   | 139 ++++++++++++++++++
 .../modules/php/editor/csl/NavigatorTest.java |   4 +
 243 files changed, 798 insertions(+), 31 deletions(-)
 create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/standAloneTrueType.pass
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_01.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_02.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_03.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_04.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_05.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_06.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_07.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_08.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_09.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_01.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_02.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_03.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_04.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_05.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_06.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_07.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_08.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_09.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_10.completion
 create mode 100644 php/php.editor/test/unit/data/testfiles/structure/standAloneTrueType.php
 create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP82CodeCompletionTest.java

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 e9b5488e2b51..74651920cede 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
@@ -1228,6 +1228,7 @@ private static boolean isType(Token<PHPTokenId> token) {
                 || id == PHPTokenId.PHP_STATIC
                 || id == PHPTokenId.PHP_NULL
                 || id == PHPTokenId.PHP_FALSE
+                || id == PHPTokenId.PHP_TRUE
                 || id == PHPTokenId.PHP_ARRAY
                 || id == PHPTokenId.PHP_ITERABLE
                 || id == PHPTokenId.PHP_CALLABLE;
@@ -1285,8 +1286,12 @@ private static List<? extends Token<PHPTokenId>> getPreceedingLineTokens(Token<P
                     break;
                 }
                 Token<PHPTokenId> cToken = tokenSequence.token();
-                if (cToken.id() == PHPTokenId.WHITESPACE
-                        && TokenUtilities.indexOf(cToken.text(), '\n') != -1) { // NOI18N
+                if ((cToken.id() == PHPTokenId.WHITESPACE
+                        && TokenUtilities.indexOf(cToken.text(), '\n') != -1) // NOI18N
+                        || cToken.id() == PHPTokenId.PHP_LINE_COMMENT) {
+                    // e.g.
+                    // public bool $bool = true; // line comment
+                    // public tru^e $true = true;
                     break;
                 }
                 tokens.addLast(cToken);
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 a510e1cedfc0..c4c826db03f3 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
@@ -266,7 +266,7 @@ private static enum UseType {
             PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING, PHPTokenId.PHP_NS_SEPARATOR,
             PHPTokenId.PHP_TYPE_BOOL, PHPTokenId.PHP_TYPE_FLOAT, PHPTokenId.PHP_TYPE_INT, PHPTokenId.PHP_TYPE_STRING, PHPTokenId.PHP_TYPE_VOID,
             PHPTokenId.PHP_TYPE_OBJECT, PHPTokenId.PHP_TYPE_MIXED, PHPTokenId.PHP_SELF, PHPTokenId.PHP_PARENT, PHPTokenId.PHP_STATIC,
-            PHPTokenId.PHP_NULL, PHPTokenId.PHP_FALSE, PHPTokenId.PHP_ARRAY, PHPTokenId.PHP_ITERABLE, PHPTokenId.PHP_CALLABLE,
+            PHPTokenId.PHP_NULL, PHPTokenId.PHP_FALSE, PHPTokenId.PHP_TRUE, PHPTokenId.PHP_ARRAY, PHPTokenId.PHP_ITERABLE, PHPTokenId.PHP_CALLABLE,
             PHPTokenId.PHPDOC_COMMENT_START, PHPTokenId.PHPDOC_COMMENT, PHPTokenId.PHPDOC_COMMENT_END,
             PHPTokenId.PHP_COMMENT_START, PHPTokenId.PHP_COMMENT, PHPTokenId.PHP_COMMENT_END
     );
@@ -319,7 +319,6 @@ public CodeCompletionResult complete(CodeCompletionContext completionContext) {
         if (CancelSupport.getDefault().isCancelled()) {
             return CodeCompletionResult.NONE;
         }
-
         CompletionContext context = CompletionContextFinder.findCompletionContext(info, caretOffset);
         LOGGER.log(Level.FINE, "CC context: {0}", context);
 
@@ -534,7 +533,7 @@ public CodeCompletionResult complete(CodeCompletionContext completionContext) {
                         typesForTypeName.addAll(Type.getSpecialTypesForType());
                     }
                     if (isNullableType(info, caretOffset)) {
-                        typesForTypeName.remove(Type.FALSE);
+                        // ?false, ?true is OK since PHP 8.2
                         typesForTypeName.remove(Type.NULL);
                     }
                     if (isUnionType(info, caretOffset)) {
@@ -555,7 +554,7 @@ public CodeCompletionResult complete(CodeCompletionContext completionContext) {
                         typesForReturnTypeName.add(Type.STATIC);
                     }
                     if (isNullableType(info, caretOffset)) {
-                        typesForReturnTypeName.remove(Type.FALSE);
+                        // ?false, ?true is OK since PHP 8.2
                         typesForReturnTypeName.remove(Type.NULL);
                         typesForReturnTypeName.remove(Type.VOID);
                         typesForReturnTypeName.remove(Type.NEVER);
@@ -1154,7 +1153,7 @@ private void autoCompleteKeywordsInPHPDoc(final PHPCompletionResult completionRe
                 String prefix = doc.getText(start, 1);
                 if (CodeUtils.NULLABLE_TYPE_PREFIX.equals(prefix)) {
                     List<String> keywords = new ArrayList<>(Type.getTypesForEditor());
-                    keywords.remove(Type.FALSE);
+                    // ?false, ?true is OK since PHP 8.2
                     keywords.remove(Type.NULL);
                     autoCompleteKeywords(completionResult, request, keywords);
                 } else {
@@ -1301,7 +1300,7 @@ private void autoCompleteFieldType(ParserResult info, int caretOffset, final PHP
             }
         }
         if (isNullableType) {
-            keywords.remove(Type.FALSE);
+            // ?false, ?true is OK since PHP 8.2
             keywords.remove(Type.NULL);
         }
         if (isUnionType(info, caretOffset)) {
@@ -1350,6 +1349,7 @@ private boolean completeFieldTypes(TokenSequence<PHPTokenId> tokenSequence, int
                 PHPTokenId.PHP_ITERABLE,
                 PHPTokenId.PHP_SELF,
                 PHPTokenId.PHP_PARENT,
+                PHPTokenId.PHP_TRUE,
                 PHPTokenId.PHP_FALSE,
                 PHPTokenId.PHP_NULL,
                 PHPTokenId.PHP_STRING,
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
index 7ddce89d0ee4..d589e3c5e4d7 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
@@ -90,9 +90,9 @@ private Type() {
     public static final String STATIC = "static"; //NOI18N NETBEANS-4443 PHP 8.0
     public static final String NEVER = "never"; //NOI18N NETBEANS-5599 PHP 8.1
 
-    private static final List<String> TYPES_FOR_EDITOR = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT, NULL, FALSE, MIXED);
-    private static final List<String> TYPES_FOR_RETURN_TYPE = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, VOID, OBJECT, NULL, FALSE, MIXED, NEVER);
-    private static final List<String> TYPES_FOR_FIELD_TYPE = Arrays.asList(ARRAY, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT, SELF, PARENT, NULL, FALSE, MIXED); // PHP 7.4 Typed Properties 2.0
+    private static final List<String> TYPES_FOR_EDITOR = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT, NULL, FALSE, MIXED, TRUE);
+    private static final List<String> TYPES_FOR_RETURN_TYPE = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, VOID, OBJECT, NULL, FALSE, MIXED, NEVER, TRUE);
+    private static final List<String> TYPES_FOR_FIELD_TYPE = Arrays.asList(ARRAY, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT, SELF, PARENT, NULL, FALSE, MIXED, TRUE); // PHP 7.4 Typed Properties 2.0
     private static final List<String> SPECIAL_TYPES_FOR_TYPE = Arrays.asList(SELF, PARENT);
     private static final List<String> TYPES_FOR_PHP_DOC = Arrays.asList(STRING, INTEGER, INT, BOOLEAN, BOOL, FLOAT, DOUBLE, OBJECT, MIXED, ARRAY,
             RESOURCE, VOID, NULL, CALLBACK, CALLABLE, ITERABLE, FALSE, TRUE, SELF);
@@ -107,7 +107,8 @@ public static boolean isPrimitive(String typeName) {
                 || NUMBER.equals(typeName) || CALLBACK.equals(typeName) || RESOURCE.equals(typeName)
                 || DOUBLE.equals(typeName) || STRING.equals(typeName) || NULL.equals(typeName)
                 || VOID.equals(typeName) || CALLABLE.equals(typeName) || ITERABLE.equals(typeName)
-                || FALSE.equals(typeName) || STATIC.equals(typeName) || NEVER.equals(typeName)) {
+                || FALSE.equals(typeName) || STATIC.equals(typeName) || NEVER.equals(typeName)
+                || TRUE.equals(typeName)) {
             retval = true;
         }
         return retval;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
index 9dc4a7e8165d..ce89f8c02f13 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesHintError.java
@@ -71,7 +71,7 @@ public class UnusableTypesHintError extends HintErrorRule {
     private static final List<String> INVALID_TYPES_WITH_INTERSECTION_TYPES = Arrays.asList(
             Type.ARRAY, Type.BOOL, Type.CALLABLE, Type.FALSE, Type.FLOAT,
             Type.INT, Type.ITERABLE, Type.MIXED, Type.NEVER, Type.NULL,
-            Type.OBJECT, Type.PARENT, Type.SELF, Type.STATIC, Type.STRING, Type.VOID
+            Type.OBJECT, Type.PARENT, Type.SELF, Type.STATIC, Type.STRING, Type.TRUE, Type.VOID
     );
 
     @Override
@@ -259,7 +259,7 @@ private void checkFieldType(@NullAllowed Expression fieldType, boolean isInUnion
                     createError(type, Type.NEVER, UnusableType.Context.Property);
                 }
                 if (!isInUnionType) {
-                    checkFalseAndNullTypes((NamespaceName) type);
+                    checkTrueAndFalseAndNullTypes((NamespaceName) type);
                 }
             } else if (type instanceof UnionType) {
                 ((UnionType) type).getTypes().forEach(unionType -> checkFieldType(unionType, true));
@@ -268,17 +268,21 @@ private void checkFieldType(@NullAllowed Expression fieldType, boolean isInUnion
 
         private void checkParameterType(Expression parameterType, boolean isInUnionType) {
             // unusable type: void, never
-            if (parameterType instanceof NamespaceName) {
-                if (isVoidType((NamespaceName) parameterType)) {
-                    createError(parameterType, Type.VOID, UnusableType.Context.Parameter);
-                } else if (isNeverType((NamespaceName) parameterType)) {
-                    createError(parameterType, Type.NEVER, UnusableType.Context.Parameter);
+            Expression paramType = parameterType;
+            if (parameterType instanceof NullableType) {
+                paramType = ((NullableType) parameterType).getType();
+            }
+            if (paramType instanceof NamespaceName) {
+                if (isVoidType((NamespaceName) paramType)) {
+                    createError(paramType, Type.VOID, UnusableType.Context.Parameter);
+                } else if (isNeverType((NamespaceName) paramType)) {
+                    createError(paramType, Type.NEVER, UnusableType.Context.Parameter);
                 }
                 if (!isInUnionType) {
-                    checkFalseAndNullTypes((NamespaceName) parameterType);
+                    checkTrueAndFalseAndNullTypes((NamespaceName) paramType);
                 }
-            } else if (parameterType instanceof UnionType) {
-                ((UnionType) parameterType).getTypes().forEach(type -> checkParameterType(type, true));
+            } else if (paramType instanceof UnionType) {
+                ((UnionType) paramType).getTypes().forEach(type -> checkParameterType(type, true));
             }
         }
 
@@ -291,7 +295,7 @@ private void checkArrowFunctionReturnType(Expression returnType, boolean isInUni
                     createError(returnType, Type.NEVER, UnusableType.Context.ArrowFunctionReturn);
                 }
                 if (!isInUnionType) {
-                    checkFalseAndNullTypes((NamespaceName) returnType);
+                    checkTrueAndFalseAndNullTypes((NamespaceName) returnType);
                 }
             } else if (returnType instanceof UnionType) {
                 ((UnionType) returnType).getTypes().forEach(type -> checkArrowFunctionReturnType(type, true));
@@ -309,7 +313,7 @@ private void checkReturnType(@NullAllowed Expression returnType, boolean isInUni
 
             if (type instanceof NamespaceName) {
                 if (!isInUnionType) {
-                    checkFalseAndNullTypes((NamespaceName) type);
+                    checkTrueAndFalseAndNullTypes((NamespaceName) type);
                 } else {
                     // "void" can't be part of a union type
                     if (isVoidType((NamespaceName) type)) {
@@ -333,19 +337,23 @@ private void checkReturnType(@NullAllowed Expression returnType, boolean isInUni
             }
         }
 
-        private void checkFalseAndNullTypes(NamespaceName type) {
+        private void checkTrueAndFalseAndNullTypes(NamespaceName type) {
             if (isFalseType(type) && !phpVersion.hasNullAndFalseAndTrueTypes()) {
                 createError(type, Type.FALSE, UnusableType.Context.Standalone);
+            } else if (isTrueType(type) && !phpVersion.hasNullAndFalseAndTrueTypes()) {
+                createError(type, Type.TRUE, UnusableType.Context.Standalone);
             } else if (isNullType(type) && !phpVersion.hasNullAndFalseAndTrueTypes()) {
                 createError(type, Type.NULL, UnusableType.Context.Standalone);
             }
         }
 
-        private void checkFalseAndNullTypes(UnionType unionType) {
+        private void checkTrueAndFalseAndNullTypes(UnionType unionType) {
             // null|false or false|null
+            // null|true or true|null
             if (phpVersion.hasNullAndFalseAndTrueTypes() || unionType.getTypes().size() != 2) {
                 return;
             }
+            Expression trueType = null;
             Expression falseType = null;
             boolean hasNull = false;
             for (Expression type : unionType.getTypes()) {
@@ -355,6 +363,8 @@ private void checkFalseAndNullTypes(UnionType unionType) {
                 if (type instanceof NamespaceName) {
                     if (isFalseType((NamespaceName) type)) {
                         falseType = type;
+                    } else if (isTrueType((NamespaceName) type)) {
+                        trueType = type;
                     } else if (isNullType((NamespaceName) type)) {
                         hasNull = true;
                     }
@@ -362,13 +372,40 @@ private void checkFalseAndNullTypes(UnionType unionType) {
             }
             if (falseType != null && hasNull) {
                 createError(falseType, Type.FALSE, UnusableType.Context.Standalone);
+            } else if (trueType != null && hasNull) {
+                createError(falseType, Type.TRUE, UnusableType.Context.Standalone);
+            }
+        }
+
+        private void checkBothTrueAndFalseTypes(UnionType unionType) {
+            // e.g. true|false -> bool, false|true -> bool, int|true|false -> int|bool
+            Expression trueType = null;
+            Expression falseType = null;
+            for (Expression type : unionType.getTypes()) {
+                if (CancelSupport.getDefault().isCancelled()) {
+                    return;
+                }
+                QualifiedName qualifiedName = QualifiedName.create(type);
+                assert qualifiedName != null;
+                String name = qualifiedName.toString().toLowerCase(Locale.ENGLISH);
+                if (Type.TRUE.equals(name)) {
+                    trueType = type;
+                } else if (Type.FALSE.equals(name)) {
+                    falseType = type;
+                }
+                if (trueType != null && falseType != null) {
+                    createError(trueType, Type.TRUE, UnusableType.Context.BothTrueAndFalse);
+                    createError(falseType, Type.FALSE, UnusableType.Context.BothTrueAndFalse);
+                    return;
+                }
             }
         }
 
         private void checkUnionType(UnionType unionType) {
             checkDuplicateType(unionType.getTypes());
             checkRedundantTypeCombination(unionType);
-            checkFalseAndNullTypes(unionType); // null|false or false|null
+            checkTrueAndFalseAndNullTypes(unionType); // null|false or false|null
+            checkBothTrueAndFalseTypes(unionType); // true|false -> bool
         }
 
         private void checkDuplicateType(List<Expression> types) {
@@ -380,13 +417,21 @@ private void checkDuplicateType(List<Expression> types) {
                 QualifiedName qualifiedName = QualifiedName.create(type);
                 assert qualifiedName != null;
                 String name = qualifiedName.toString().toLowerCase(Locale.ENGLISH);
-                if (Type.FALSE.equals(name)) {
-                    // check bool|false
-                    name = Type.BOOL;
-                }
                 if (checkedTypes.contains(name)) {
                     createDuplicateTypeError(type, qualifiedName.toString());
                     return;
+                } else if (checkedTypes.contains(Type.BOOL)) {
+                    // bool|false bool|true
+                    if (Type.FALSE.equals(name) || Type.TRUE.equals(name)) {
+                        createDuplicateTypeError(type, qualifiedName.toString());
+                        return;
+                    }
+                } else if (checkedTypes.contains(Type.FALSE) || checkedTypes.contains(Type.TRUE)) {
+                    // false|bool true|bool
+                    if (Type.BOOL.equals(name)) {
+                        createDuplicateTypeError(type, qualifiedName.toString());
+                        return;
+                    }
                 }
                 checkedTypes.add(name);
             }
@@ -539,6 +584,10 @@ private static boolean isNeverType(NamespaceName namespaceName) {
             return Type.NEVER.equals(CodeUtils.extractUnqualifiedName(namespaceName));
         }
 
+        private static boolean isTrueType(NamespaceName namespaceName) {
+            return Type.TRUE.equals(CodeUtils.extractUnqualifiedName(namespaceName));
+        }
+
         private static boolean isFalseType(NamespaceName namespaceName) {
             return Type.FALSE.equals(CodeUtils.extractUnqualifiedName(namespaceName));
         }
@@ -574,6 +623,8 @@ private static boolean isTraversableType(NamespaceName namespaceName) {
         "UnusableType.Context.union=a union",
         "UnusableType.Context.intersection=an intersection",
         "UnusableType.Context.nullable=a nullable",
+        "UnusableType.Context.bothTrueAndFalse=both \"true\" and \"false\"",
+        "UnusableType.Context.bothTrueAndFalse.description=Contains both \"true\" and \"false\", \"bool\" should be used.",
         "# {0} - type",
         "# {1} - context",
         "UnusableType.description=\"{0}\" cannot be used as {1} type.",
@@ -589,6 +640,12 @@ enum Context {
             Union(Bundle.UnusableType_Context_union()),
             Intersection(Bundle.UnusableType_Context_intersection()),
             Nullable(Bundle.UnusableType_Context_nullable()),
+            BothTrueAndFalse(Bundle.UnusableType_Context_bothTrueAndFalse()) {
+                @Override
+                public String getDescription(String type) {
+                    return Bundle.UnusableType_Context_bothTrueAndFalse_description();
+                }
+            },
             ;
             private final String context;
 
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/standAloneTrueType.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/standAloneTrueType.pass
new file mode 100644
index 000000000000..ce650ddc5edc
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/standAloneTrueType.pass
@@ -0,0 +1,8 @@
+|-TrueType [820, 1281] : ESCAPED{TrueType}
+|--$true [848, 852] : ESCAPED{$true}<font color="#999999">:ESCAPED{true}</font>
+|--$true2 [894, 899] : ESCAPED{$true2}<font color="#999999">:ESCAPED{?}ESCAPED{true}</font>
+|--$true3 [944, 949] : ESCAPED{$true3}<font color="#999999">:ESCAPED{int}ESCAPED{|}ESCAPED{true}</font>
+|--$true4 [995, 1000] : ESCAPED{$true4}<font color="#999999">:ESCAPED{true}ESCAPED{|}ESCAPED{int}</font>
+|--test [1046, 1098] : ESCAPED{test}ESCAPED{(}<font color="#999999">ESCAPED{true}ESCAPED{ }</font>ESCAPED{$true}ESCAPED{)}<font color="#999999">:ESCAPED{true}</font>
+|--testNullable [1120, 1182] : ESCAPED{testNullable}ESCAPED{(}<font color="#999999">ESCAPED{?}ESCAPED{true}ESCAPED{ }</font>ESCAPED{$true}ESCAPED{)}<font color="#999999">:ESCAPED{?}ESCAPED{true}</font>
+|--testUnionType [1204, 1279] : ESCAPED{testUnionType}ESCAPED{(}<font color="#999999">ESCAPED{true}ESCAPED{|}ESCAPED{string}ESCAPED{ }</font>ESCAPED{$true}ESCAPED{)}<font color="#999999">:ESCAPED{string}ESCAPED{|}ESCAPED{true}</font>
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences01.completion
index 97bb7ebb50bf..f2c8086b78b7 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences01.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences03.completion
index c5f41848126c..e0e4d2ae6e57 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences03.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences05.completion
index b0eb8ad080ca..ea7ff5ec3870 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences05.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences07.completion
index 01f4d66cb7fb..85daa15bb291 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences07.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences08.completion
index 8bb2fcc74873..086e2a3826cd 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences08.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences10.completion
index b9696702e272..b5b82e850d9f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences10.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences12.completion
index 4e6f49cff847..ac3e8c66eef0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences12.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences14.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences14.completion
index 2e839d623648..10c8f32f662d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences14.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences14.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences16.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences16.completion
index f14073967743..5315147ca700 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences16.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences16.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences18.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences18.completion
index db603938d71c..7ebf0828008c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences18.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences18.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences20.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences20.completion
index 005ce9a6908d..885a8903dfd9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences20.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences20.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences22.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences22.completion
index 3d89069e3d85..d11f78c3e2b5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences22.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences22.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences24.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences24.completion
index c5947426d831..3a5e27848cba 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences24.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences24.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences26.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences26.completion
index c49299041fba..24e560b44c39 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences26.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences26.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences28.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences28.completion
index 5b59f00ee769..2a1d3d746083 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences28.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences28.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences30.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences30.completion
index 6e3c640e2188..6f2250b6b0d5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences30.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences30.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences32.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences32.completion
index ae00d53538ec..f8d0e6d3583c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences32.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences32.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences34.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences34.completion
index a3f51085fc9d..1a55bced9b3e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences34.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences34.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences36.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences36.completion
index 60c1e89da0a8..fbd42b4e9191 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences36.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/byReferences/byReferences.php.testByReferences36.completion
@@ -16,3 +16,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes11.completion
index 9b3130e24160..407ec7d0630e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes11.completion
@@ -15,3 +15,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes14.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes14.completion
index 4e0351e99ced..26a27ed65fd8 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes14.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes14.completion
@@ -15,3 +15,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes5.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes5.completion
index 9bd8844bb008..ec92605cb349 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes5.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes5.completion
@@ -15,3 +15,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes8.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes8.completion
index 5350f86f78a0..e287bcefbbf9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes8.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes8.completion
@@ -15,3 +15,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_01.completion
index 058616e73f2e..7f35e0401138 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_01.completion
@@ -22,3 +22,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_03.completion
index d77122df0139..7cb11fff46bc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php54/callableTypeHint.php.testCallableTypeHint_03.completion
@@ -24,3 +24,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType01.completion
index 99193b49ded1..b8cfb032f32a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType01.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType03.completion
index 89afcd7704b6..168d666d92fa 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType03.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType05.completion
index 7e7d457b7244..4b8099aad83e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType05.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType07.completion
index 46de26eccb2c..1f63f02aaf91 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType07.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType12.completion
index e544aa44ac5c..40da76b7f401 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType12.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType13.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType13.completion
index 5b007f383f49..442b86e45f63 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType13.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType13.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType14.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType14.completion
index 9ebc1c3ddcdc..81674a4ebf1a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType14.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypes.php.testReturnType14.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping01.php.testReturnTypesTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping01.php.testReturnTypesTyping01.completion
index ba3500f01f35..e94db3bcd3b6 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping01.php.testReturnTypesTyping01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping01.php.testReturnTypesTyping01.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping02.php.testReturnTypesTyping02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping02.php.testReturnTypesTyping02.completion
index d8b590bcf83e..0c2ddaab64e8 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping02.php.testReturnTypesTyping02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping02.php.testReturnTypesTyping02.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping03.php.testReturnTypesTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping03.php.testReturnTypesTyping03.completion
index 40d0dc5c366f..2d09e8ee4482 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping03.php.testReturnTypesTyping03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping03.php.testReturnTypesTyping03.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04a.completion
index 121c98f9ed5e..c90cb06e0cc8 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04a.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04b.completion
index dcb51aecf005..69ce45de7ab0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping04.php.testReturnTypesTyping04b.completion
@@ -59,4 +59,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping05.php.testReturnTypesTyping05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping05.php.testReturnTypesTyping05.completion
index 5e650ad5a059..04a932cd2914 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping05.php.testReturnTypesTyping05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping05.php.testReturnTypesTyping05.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping06.php.testReturnTypesTyping06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping06.php.testReturnTypesTyping06.completion
index 19f558f4c8b0..5a0cc00d2f50 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping06.php.testReturnTypesTyping06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping06.php.testReturnTypesTyping06.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping07.php.testReturnTypesTyping07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping07.php.testReturnTypesTyping07.completion
index 1ddddddb0b4a..f548f6ea63b0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping07.php.testReturnTypesTyping07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping07.php.testReturnTypesTyping07.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08a.completion
index c15f604b8114..53e7c480bde4 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08a.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08b.completion
index fc0e87b8d441..5408a2298bf9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping08.php.testReturnTypesTyping08b.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping09.php.testReturnTypesTyping09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping09.php.testReturnTypesTyping09.completion
index 99e13c402fc3..6f2cba994a76 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping09.php.testReturnTypesTyping09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping09.php.testReturnTypesTyping09.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping10.php.testReturnTypesTyping10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping10.php.testReturnTypesTyping10.completion
index f082ecfcc28f..fb093feec267 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping10.php.testReturnTypesTyping10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping10.php.testReturnTypesTyping10.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping11.php.testReturnTypesTyping11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping11.php.testReturnTypesTyping11.completion
index bda5b6a77170..a55375e358a3 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping11.php.testReturnTypesTyping11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping11.php.testReturnTypesTyping11.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12a.completion
index b0b5c6e1353b..909f666055dc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12a.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12b.completion
index b003504c3444..9bd4275bdd27 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/returnTypesTyping12.php.testReturnTypesTyping12b.completion
@@ -62,4 +62,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint01.completion
index fa9a56a32d66..e801dd548d98 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint01.completion
@@ -58,3 +58,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion
index b0762781a9c0..8844e169cfc5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion
@@ -64,3 +64,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint01.completion
index 48180923ebf6..f9e942642439 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint01.completion
@@ -58,3 +58,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion
index 6d570add84f4..121c02a6b178 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion
@@ -64,3 +64,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint01.completion
index ead22ed35276..c468dbc197c5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint01.completion
@@ -58,3 +58,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion
index 11612a086053..7e9d77e14c09 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion
@@ -64,3 +64,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint01.completion
index 0a51aadbfe8b..95cbfd33667c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint01.completion
@@ -58,3 +58,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion
index 800e0419f0ca..63b5bdbfeda4 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion
@@ -64,3 +64,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType01.completion
index 6638242dc9a6..1394e69e0ec4 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType01.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType03.completion
index d36c60c26800..b8f42f2bc252 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType03.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType07.completion
index 5bf3e1684d96..dd0272b35951 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType07.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType09.completion
index 835fd904e9a9..82ab4bf1488e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType09.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType11.completion
index 40b553ce1196..949555f40cea 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType11.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType13.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType13.completion
index 0865ee70ae6a..27d9ac77ae95 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType13.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ParameterType13.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType01.completion
index 0499644a5a01..e78397c5a2d2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType01.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType03.completion
index 500a4a9c3ae8..b9d193ca33fa 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType03.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType05.completion
index cd362ba10675..d11153149069 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType05.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType09.completion
index 4966e0b20339..ed7197e6898b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType09.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType11.completion
index 47aa51ab943e..c03d3240ee0c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType11.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType13.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType13.completion
index 0118ff0a335f..c33c60950dc9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType13.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType13.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType15.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType15.completion
index f71d10fb6db5..bd392dace66f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType15.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/nullableTypes.php.testNullableTypes_ReturnType15.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType01.php.testNullableTypes_TypingParameterType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType01.php.testNullableTypes_TypingParameterType01.completion
index eba832b93265..747f74b89da4 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType01.php.testNullableTypes_TypingParameterType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType01.php.testNullableTypes_TypingParameterType01.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType02.php.testNullableTypes_TypingParameterType02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType02.php.testNullableTypes_TypingParameterType02.completion
index 09265ac72cec..75af0b58ca25 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType02.php.testNullableTypes_TypingParameterType02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType02.php.testNullableTypes_TypingParameterType02.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType03.php.testNullableTypes_TypingParameterType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType03.php.testNullableTypes_TypingParameterType03.completion
index 094f4050d38f..af34d8c637c0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType03.php.testNullableTypes_TypingParameterType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType03.php.testNullableTypes_TypingParameterType03.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType04.php.testNullableTypes_TypingParameterType04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType04.php.testNullableTypes_TypingParameterType04.completion
index b3232f206498..de1995acde49 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType04.php.testNullableTypes_TypingParameterType04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType04.php.testNullableTypes_TypingParameterType04.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType05.php.testNullableTypes_TypingParameterType05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType05.php.testNullableTypes_TypingParameterType05.completion
index 016bf9b96620..804ce5552a1a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType05.php.testNullableTypes_TypingParameterType05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType05.php.testNullableTypes_TypingParameterType05.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType06.php.testNullableTypes_TypingParameterType06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType06.php.testNullableTypes_TypingParameterType06.completion
index a40e4add2dc4..95ae8a02383e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType06.php.testNullableTypes_TypingParameterType06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType06.php.testNullableTypes_TypingParameterType06.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType07.php.testNullableTypes_TypingParameterType07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType07.php.testNullableTypes_TypingParameterType07.completion
index c21ab81e4a70..fd85df9b324a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType07.php.testNullableTypes_TypingParameterType07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType07.php.testNullableTypes_TypingParameterType07.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType08.php.testNullableTypes_TypingParameterType08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType08.php.testNullableTypes_TypingParameterType08.completion
index 4acf54b13b38..ec91c4913ee7 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType08.php.testNullableTypes_TypingParameterType08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType08.php.testNullableTypes_TypingParameterType08.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType09.php.testNullableTypes_TypingParameterType09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType09.php.testNullableTypes_TypingParameterType09.completion
index d8900d5dc24a..cf9c1da86a2b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType09.php.testNullableTypes_TypingParameterType09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType09.php.testNullableTypes_TypingParameterType09.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType10.php.testNullableTypes_TypingParameterType10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType10.php.testNullableTypes_TypingParameterType10.completion
index 32fd3b2cfc1c..07f5958b474f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType10.php.testNullableTypes_TypingParameterType10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType10.php.testNullableTypes_TypingParameterType10.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType11.php.testNullableTypes_TypingParameterType11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType11.php.testNullableTypes_TypingParameterType11.completion
index ebe512c8422b..a1920d625611 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType11.php.testNullableTypes_TypingParameterType11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType11.php.testNullableTypes_TypingParameterType11.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType12.php.testNullableTypes_TypingParameterType12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType12.php.testNullableTypes_TypingParameterType12.completion
index 174c60be9bbb..8879fe6996e8 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType12.php.testNullableTypes_TypingParameterType12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingParameterType12.php.testNullableTypes_TypingParameterType12.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -34,3 +35,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType01.php.testNullableTypes_TypingReturnType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType01.php.testNullableTypes_TypingReturnType01.completion
index 803837b7452c..152f65dc6999 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType01.php.testNullableTypes_TypingReturnType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType01.php.testNullableTypes_TypingReturnType01.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType02.php.testNullableTypes_TypingReturnType02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType02.php.testNullableTypes_TypingReturnType02.completion
index 6dd6f9cacee0..09d0412cab81 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType02.php.testNullableTypes_TypingReturnType02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType02.php.testNullableTypes_TypingReturnType02.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType03.php.testNullableTypes_TypingReturnType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType03.php.testNullableTypes_TypingReturnType03.completion
index e6c8564ff657..657f2b556efb 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType03.php.testNullableTypes_TypingReturnType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType03.php.testNullableTypes_TypingReturnType03.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType04.php.testNullableTypes_TypingReturnType04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType04.php.testNullableTypes_TypingReturnType04.completion
index 94e28aa0c75c..35430b938ecf 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType04.php.testNullableTypes_TypingReturnType04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType04.php.testNullableTypes_TypingReturnType04.completion
@@ -26,9 +26,11 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType05.php.testNullableTypes_TypingReturnType05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType05.php.testNullableTypes_TypingReturnType05.completion
index 2df5aca27332..51b2c3e10c2b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType05.php.testNullableTypes_TypingReturnType05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType05.php.testNullableTypes_TypingReturnType05.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType06.php.testNullableTypes_TypingReturnType06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType06.php.testNullableTypes_TypingReturnType06.completion
index 00128a650cbf..891fd04e5711 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType06.php.testNullableTypes_TypingReturnType06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType06.php.testNullableTypes_TypingReturnType06.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType07.php.testNullableTypes_TypingReturnType07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType07.php.testNullableTypes_TypingReturnType07.completion
index 786a4cc73798..70daff1e5a27 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType07.php.testNullableTypes_TypingReturnType07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType07.php.testNullableTypes_TypingReturnType07.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType08.php.testNullableTypes_TypingReturnType08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType08.php.testNullableTypes_TypingReturnType08.completion
index ee2376e65369..4fe204eeca6e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType08.php.testNullableTypes_TypingReturnType08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType08.php.testNullableTypes_TypingReturnType08.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType09.php.testNullableTypes_TypingReturnType09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType09.php.testNullableTypes_TypingReturnType09.completion
index e8efe8410702..57e739b6d383 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType09.php.testNullableTypes_TypingReturnType09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType09.php.testNullableTypes_TypingReturnType09.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType10.php.testNullableTypes_TypingReturnType10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType10.php.testNullableTypes_TypingReturnType10.completion
index 0dc9b5acb6ed..ae0cdf579238 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType10.php.testNullableTypes_TypingReturnType10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType10.php.testNullableTypes_TypingReturnType10.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType11.php.testNullableTypes_TypingReturnType11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType11.php.testNullableTypes_TypingReturnType11.completion
index 5cae01a4671c..098abae849fc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType11.php.testNullableTypes_TypingReturnType11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType11.php.testNullableTypes_TypingReturnType11.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType12.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType12.php.testNullableTypes_TypingReturnType12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType12.php.testNullableTypes_TypingReturnType12.completion
index 3cb72409ebd1..1c4565b91ffa 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType12.php.testNullableTypes_TypingReturnType12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypes/typingReturnType12.php.testNullableTypes_TypingReturnType12.completion
@@ -26,6 +26,7 @@ CLASS      NullableTypesInterface          [PUBLIC]   typingReturnType08.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -35,3 +36,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType04.completion
index c39013db982c..7d64f27e5bf2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType04.completion
@@ -6,9 +6,11 @@ CLASS      PHPDocTags                      [PUBLIC]   nullableTypesInPHPDoc.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType06.completion
index 85c2cd496163..b773337d18e7 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testNullableTypesInPHPDoc/nullableTypesInPHPDoc.php.testNullableTypesInPHPDoc_NullableType06.completion
@@ -6,9 +6,11 @@ CLASS      PHPDocTags                      [PUBLIC]   nullableTypesInPHPDoc.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion
index 108ece1bea8e..9fe57f41485f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Class01.completion
@@ -19,4 +19,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Function01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Function01.completion
index 01b812adf132..36a3e434c561 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Function01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Function01.completion
@@ -16,4 +16,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Interface01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Interface01.completion
index be3bbb242d3f..9445d7e9d3f1 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Interface01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testVoidReturnType/voidReturnType.php.testVoidReturnType_Interface01.completion
@@ -19,4 +19,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ParameterType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ParameterType01.completion
index ed5f8b4f3874..e07148402627 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ParameterType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ParameterType01.completion
@@ -14,3 +14,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ReturnType02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ReturnType02.completion
index 497e24c02183..b5852876abc0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ReturnType02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php72/testObjectTypeHint/objectTypeHint.php.testObjectTypeHint_ReturnType02.completion
@@ -15,4 +15,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_03a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_03a.completion
index 118757027dcf..252992db947f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_03a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_03a.completion
@@ -14,3 +14,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_04a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_04a.completion
index a54ac0aca249..45560577a4a0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_04a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_04a.completion
@@ -14,3 +14,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05a.completion
index eee41183ad43..e62516b70934 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05a.completion
@@ -15,4 +15,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_06a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_06a.completion
index 0d18b1fa82b2..534d26bd5e6b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_06a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_06a.completion
@@ -6,9 +6,11 @@ CLASS      ArrowFunctions                  [PUBLIC]   arrowFunctions.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17b.completion
index 6000f0cbb4cd..05f774f6a1b1 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17b.completion
@@ -14,3 +14,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion
index 83abe72f3221..207a1a0e75de 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23a.completion
@@ -16,3 +16,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23b.completion
index ac83929bbcdf..2c481b2bf360 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_23b.completion
@@ -6,6 +6,7 @@ CLASS      ArrowFunctions                  [PUBLIC]   arrowFunctions.php
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -15,3 +16,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion
index bbfc140fd772..ff22f10eb883 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion
@@ -27,4 +27,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion
index 3491f0bed325..27247daede6d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion
@@ -27,4 +27,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_10.completion
index 08852992ab3e..a0975c6cf008 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_10.completion
@@ -8,6 +8,7 @@ CLASS      TypedPropertiesClass            [PUBLIC]   Foo
 ------------------------------------
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -16,3 +17,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion
index dbe6c64d2e9f..f10f894f959a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion
@@ -27,4 +27,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion
index 89d99cc2e309..f761f00ce1ec 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion
@@ -27,4 +27,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion
index b899f101ff8b..eb514910cb46 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion
@@ -26,4 +26,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion
index e37f953e2967..cda944861e2d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion
@@ -26,4 +26,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_09.completion
index b9886198fc79..1d084c2885f0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_09.completion
@@ -7,6 +7,7 @@ CLASS      MyClass                         [PUBLIC]   Bar
 ------------------------------------
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -15,3 +16,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_11.completion
index a22cd1b0927e..de3767819af0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_11.completion
@@ -7,6 +7,7 @@ CLASS      MyClass                         [PUBLIC]   Bar
 ------------------------------------
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -15,3 +16,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion
index f65f45c2813b..f7ca55178233 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion
@@ -26,4 +26,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion
index ddfe0e8e46c7..b0e123056872 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion
@@ -26,4 +26,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion
index f8fc4699321f..0f375e591fc7 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion
index 653de49adfca..0b74ad7b4496 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion
@@ -21,3 +21,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion
index eb1feee968ff..45b5503d2ce7 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion
index a50b73a21684..e44328b4b272 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04a/constructorPropertyPromotion04a.php.testConstructorPropertyPromotion04a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04a/constructorPropertyPromotion04a.php.testConstructorPropertyPromotion04a.completion
index 6471e7b239fd..9b8b538aab5d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04a/constructorPropertyPromotion04a.php.testConstructorPropertyPromotion04a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04a/constructorPropertyPromotion04a.php.testConstructorPropertyPromotion04a.completion
@@ -5,9 +5,11 @@ public function __construct(private ?|) {
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
 KEYWORD    mixed                                      null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04b/constructorPropertyPromotion04b.php.testConstructorPropertyPromotion04b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04b/constructorPropertyPromotion04b.php.testConstructorPropertyPromotion04b.completion
index c137c189abd4..8cbb22bb90f9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04b/constructorPropertyPromotion04b.php.testConstructorPropertyPromotion04b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion04b/constructorPropertyPromotion04b.php.testConstructorPropertyPromotion04b.completion
@@ -6,6 +6,7 @@ CLASS      ConstructorPropertyPromotion    [PUBLIC]   constructorPropertyPromoti
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -14,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05a/constructorPropertyPromotion05a.php.testConstructorPropertyPromotion05a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05a/constructorPropertyPromotion05a.php.testConstructorPropertyPromotion05a.completion
index cae3e3464426..946b5a1804f5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05a/constructorPropertyPromotion05a.php.testConstructorPropertyPromotion05a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05a/constructorPropertyPromotion05a.php.testConstructorPropertyPromotion05a.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05b/constructorPropertyPromotion05b.php.testConstructorPropertyPromotion05b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05b/constructorPropertyPromotion05b.php.testConstructorPropertyPromotion05b.completion
index e9624c744cd1..3d01c8c8212c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05b/constructorPropertyPromotion05b.php.testConstructorPropertyPromotion05b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion05b/constructorPropertyPromotion05b.php.testConstructorPropertyPromotion05b.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion
index 9475ec22a331..e8f818e5a86a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion
index b9e78d876512..287a12a509ac 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion
index 6eddc84e5de9..7c3b887978ed 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion
index f41314bd7d83..c9f45f0115d2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion
index dee476e4c74a..0b098b49ed9f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion
@@ -24,4 +24,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_03.completion
index 8160108bc16e..331ffbb4d92d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_03.completion
@@ -16,3 +16,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_05.completion
index d0db2f86c245..e096d2be4959 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_05.completion
@@ -18,4 +18,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_07.completion
index 701aeac6d1f9..04d3b2737287 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_07.completion
@@ -14,3 +14,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_08.completion
index 02fd23b154f5..288d0ed4a5cf 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_08.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_09.completion
index e17794ae5aa1..3b399b57fbbc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_09.completion
@@ -16,3 +16,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields01/unionTypesFields01.php.testUnionTypesFields01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields01/unionTypesFields01.php.testUnionTypesFields01.completion
index 10a970fc4f1c..8e03e986341d 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields01/unionTypesFields01.php.testUnionTypesFields01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields01/unionTypesFields01.php.testUnionTypesFields01.completion
@@ -18,3 +18,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields03/unionTypesFields03.php.testUnionTypesFields03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields03/unionTypesFields03.php.testUnionTypesFields03.completion
index c9b363084558..cfe66a5a5215 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields03/unionTypesFields03.php.testUnionTypesFields03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields03/unionTypesFields03.php.testUnionTypesFields03.completion
@@ -18,3 +18,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields05/unionTypesFields05.php.testUnionTypesFields05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields05/unionTypesFields05.php.testUnionTypesFields05.completion
index acc25aab3a19..0f8597ee09f8 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields05/unionTypesFields05.php.testUnionTypesFields05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields05/unionTypesFields05.php.testUnionTypesFields05.completion
@@ -18,3 +18,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields06/unionTypesFields06.php.testUnionTypesFields06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields06/unionTypesFields06.php.testUnionTypesFields06.completion
index 2c22464bfcb9..1a1d026d4680 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields06/unionTypesFields06.php.testUnionTypesFields06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFields06/unionTypesFields06.php.testUnionTypesFields06.completion
@@ -18,3 +18,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType01/unionTypesFunctionParameterType01.php.testUnionTypesFunctionParameterType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType01/unionTypesFunctionParameterType01.php.testUnionTypesFunctionParameterType01.completion
index 1787416b460e..2b83b7736d95 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType01/unionTypesFunctionParameterType01.php.testUnionTypesFunctionParameterType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType01/unionTypesFunctionParameterType01.php.testUnionTypesFunctionParameterType01.completion
@@ -14,3 +14,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType03/unionTypesFunctionParameterType03.php.testUnionTypesFunctionParameterType03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType03/unionTypesFunctionParameterType03.php.testUnionTypesFunctionParameterType03.completion
index 6e9debdc963c..2639d223c7a0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType03/unionTypesFunctionParameterType03.php.testUnionTypesFunctionParameterType03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType03/unionTypesFunctionParameterType03.php.testUnionTypesFunctionParameterType03.completion
@@ -14,3 +14,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType04/unionTypesFunctionParameterType04.php.testUnionTypesFunctionParameterType04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType04/unionTypesFunctionParameterType04.php.testUnionTypesFunctionParameterType04.completion
index b456b86a92c6..273533522ab5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType04/unionTypesFunctionParameterType04.php.testUnionTypesFunctionParameterType04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType04/unionTypesFunctionParameterType04.php.testUnionTypesFunctionParameterType04.completion
@@ -15,3 +15,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType05/unionTypesFunctionParameterType05.php.testUnionTypesFunctionParameterType05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType05/unionTypesFunctionParameterType05.php.testUnionTypesFunctionParameterType05.completion
index c45719f6176f..9f6e8fa1eeed 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType05/unionTypesFunctionParameterType05.php.testUnionTypesFunctionParameterType05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType05/unionTypesFunctionParameterType05.php.testUnionTypesFunctionParameterType05.completion
@@ -14,3 +14,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType07/unionTypesFunctionParameterType07.php.testUnionTypesFunctionParameterType07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType07/unionTypesFunctionParameterType07.php.testUnionTypesFunctionParameterType07.completion
index 6fd9f41a46d4..69ff6688e48e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType07/unionTypesFunctionParameterType07.php.testUnionTypesFunctionParameterType07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionParameterType07/unionTypesFunctionParameterType07.php.testUnionTypesFunctionParameterType07.completion
@@ -14,3 +14,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType01/unionTypesFunctionReturnType01.php.testUnionTypesFunctionReturnType01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType01/unionTypesFunctionReturnType01.php.testUnionTypesFunctionReturnType01.completion
index 608944c4c48c..9ddc30104451 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType01/unionTypesFunctionReturnType01.php.testUnionTypesFunctionReturnType01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType01/unionTypesFunctionReturnType01.php.testUnionTypesFunctionReturnType01.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType04/unionTypesFunctionReturnType04.php.testUnionTypesFunctionReturnType04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType04/unionTypesFunctionReturnType04.php.testUnionTypesFunctionReturnType04.completion
index 4caeb6de43fe..2d032a666582 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType04/unionTypesFunctionReturnType04.php.testUnionTypesFunctionReturnType04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctionReturnType04/unionTypesFunctionReturnType04.php.testUnionTypesFunctionReturnType04.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_02.completion
index bb07a895968e..bd475d6d410a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_02.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_04.completion
index 6dcc6901c311..246abdc53a60 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_04.completion
@@ -17,4 +17,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_05.completion
index fc851571f7f0..e147e2bf800a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_05.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_08.completion
index 1ef7cdd2462f..025c07fccf1e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_08.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_09.completion
index e1e21f5a4957..d8682def8bb5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_09.completion
@@ -17,4 +17,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_10.completion
index f77621c7acf7..9df0ec2cf722 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_10.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_12.completion
index 20fb8da837a7..fc12914412a1 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_12.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_13.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_13.completion
index 0d44b06a4336..c9276ee5f4d1 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_13.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_13.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_15.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_15.completion
index e682e49c4ced..7cd15a585ac0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_15.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_15.completion
@@ -17,4 +17,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_17.completion
index d01e025d75a3..12d0e86a12e4 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_17.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_17.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_19.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_19.completion
index 1a9a55ad7de9..80717bb6a2f0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_19.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesFunctions/unionTypesFunctions.php.testUnionTypesFunctions_19.completion
@@ -15,3 +15,4 @@ KEYWORD    iterable                                   null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_01.completion
index 612dd23a9306..4e6a22532ce0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_01.completion
@@ -23,3 +23,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_03.completion
index 8208a6df3398..ea3cd52fc0fb 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_03.completion
@@ -22,3 +22,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_05.completion
index 8d8f51b18a5c..d7c613cde037 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_05.completion
@@ -23,3 +23,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_07.completion
index f7666d4e646e..74afbb8ec6cd 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_07.completion
@@ -25,4 +25,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_08.completion
index 2d562a0a3e61..3c22d10b9d95 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_08.completion
@@ -23,3 +23,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_11.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_11.completion
index 0dd3f09c3ec3..3e1a73e657fa 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_11.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_11.completion
@@ -22,3 +22,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_12.completion
index 07ea7e398a53..65d83d712049 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_12.completion
@@ -23,3 +23,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_14.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_14.completion
index 7ec1f9fe203c..cb90d9981426 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_14.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_14.completion
@@ -22,3 +22,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_17.completion
index 5a71c6de9328..e403e5cf4195 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_17.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_17.completion
@@ -22,3 +22,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_18.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_18.completion
index 6a982bcaf9b8..e76a0d0ad640 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_18.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_18.completion
@@ -23,3 +23,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_20.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_20.completion
index 14147a7e34eb..41b0b7bd1dad 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_20.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_20.completion
@@ -23,3 +23,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_22.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_22.completion
index f40690b2331f..a97564a453d9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_22.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testUnionTypesMethods/unionTypesMethods.php.testUnionTypesMethods_22.completion
@@ -23,3 +23,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion
index 2439c841e137..005796fb5628 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion
@@ -30,4 +30,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion
index 68ad6abf7857..9b021e58d5ac 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion
@@ -30,4 +30,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion
index 66f511ace1a2..90b42ec30955 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion
@@ -30,4 +30,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion
index 47c7b0fc24ba..e4f677959e7f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion
@@ -22,3 +22,4 @@ KEYWORD    parent                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_01.completion
index 3df432db389f..20780fcf2345 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_01.completion
@@ -18,3 +18,4 @@ KEYWORD    mixed                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_09.completion
index e65d15317bf8..1e82b3a73bcc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsParamType/enumsParamType.php.testEnumsParamType_09.completion
@@ -10,6 +10,7 @@ CLASS      EnumTest                        [PUBLIC]   EnumTestNamespace1
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -18,3 +19,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_01.completion
index 2102250a7f82..23e550d2cfa2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_01.completion
@@ -18,4 +18,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_03.completion
index 42a368f48df1..de0b2b487ae5 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_03.completion
@@ -21,4 +21,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_08.completion
index 3e0e254722e4..07d149b5f790 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsReturnType/enumsReturnType.php.testEnumsReturnType_08.completion
@@ -9,6 +9,7 @@ CLASS      EnumTest                        [PUBLIC]   EnumTestNamespace
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
 KEYWORD    callable                                   null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -18,3 +19,4 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_04.completion
index 96d5b69b078c..0521d93af45b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_04.completion
@@ -18,4 +18,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_09.completion
index 7e568914e853..b49683306a56 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_09.completion
@@ -18,4 +18,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_15.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_15.completion
index 9a4eb3fa96b5..4ee6f82d5ad0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_15.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesFunctions/intersectionTypesFunctions.php.testIntersectionTypesFunctions_15.completion
@@ -18,4 +18,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_01.completion
index c96cacf72782..9fb3b294d83f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_01.completion
@@ -23,3 +23,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_05.completion
index 7732eca687af..4aea90501bce 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_05.completion
@@ -23,3 +23,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_07.completion
index 678524fe8e14..d94b59bf8e50 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testIntersectionTypesMethods/intersectionTypesMethods.php.testIntersectionTypesMethods_07.completion
@@ -25,4 +25,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class01.completion
index 0fa12b8fb693..bedc0dc4364e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Class01.completion
@@ -19,4 +19,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function01.completion
index c434035cfee3..e793146b4670 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Function01.completion
@@ -16,4 +16,5 @@ KEYWORD    never                                      null
 KEYWORD    null                                       null
 KEYWORD    object                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface01.completion
index 23fdec80da52..45fdbf19ccfd 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Interface01.completion
@@ -19,4 +19,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait01.completion
index 91dd72c5c3ef..bb3235e4eae3 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNeverReturnType/neverReturnType.php.testNeverReturnType_Trait01.completion
@@ -19,4 +19,5 @@ KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    void                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion
index d1bc3b65b148..72206a911df1 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion
index 61ae2fa1b22a..49a3fbb3a790 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion
index 9e939d0cdfef..529caa097621 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion
index c27b853c50f2..1eff452bc811 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping08/readonlyPropertiesTyping08.php.testReadonlyPromotedPropertiesTyping08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping08/readonlyPropertiesTyping08.php.testReadonlyPromotedPropertiesTyping08.completion
index 79df58e68deb..275ed44ffedf 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping08/readonlyPropertiesTyping08.php.testReadonlyPromotedPropertiesTyping08.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping08/readonlyPropertiesTyping08.php.testReadonlyPromotedPropertiesTyping08.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion
index ee305b10b097..8a4147c82f43 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion
index 3cc090be4276..eff90684cf85 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion
@@ -20,3 +20,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion
index ce995485e311..cdcf9405632c 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion
@@ -24,4 +24,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion
index 2f99892c9e6a..f7392767db4f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion
index 34f959e717ab..1cb1eee51dda 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion
@@ -24,4 +24,5 @@ KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    static                                     null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
 KEYWORD    var                                        null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion
index dd439acdcf0e..72f7338838c2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion
@@ -15,3 +15,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPropertiesTyping10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPropertiesTyping10.completion
index ffd2bbc190ed..3cc1bc37a98a 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPropertiesTyping10.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPropertiesTyping10.completion
@@ -5,6 +5,7 @@ CLASS      ReadonlyProperties              [PUBLIC]   readonlyPropertiesTyping10
 ------------------------------------
 KEYWORD    array                                      null
 KEYWORD    bool                                       null
+KEYWORD    false                                      null
 KEYWORD    float                                      null
 KEYWORD    int                                        null
 KEYWORD    iterable                                   null
@@ -13,3 +14,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php
new file mode 100644
index 000000000000..62467cfc689b
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php
@@ -0,0 +1,38 @@
+<?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 NullAndFalseType
+{
+    public null $null = null; // PHP 8.2: OK
+    public false $false = false; // PHP 8.2: OK
+    public ?false $false2 = null; // PHP 8.2: OK
+
+    public function testNull(null $null): null {
+        return $null;
+    }
+
+    public function testFalse(false $false): false {
+        return $false;
+    }
+
+    public function testNullableFalse(?false $false): ?false {
+        return $false;
+    }
+}
+
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_01.completion
new file mode 100644
index 000000000000..857152ef150a
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_01.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public nu|ll $null = null; // PHP 8.2: OK
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      NullAndFalseType                [PUBLIC]   nullAndFalseType.php
+------------------------------------
+KEYWORD    null                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_02.completion
new file mode 100644
index 000000000000..916aa4b5bef6
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_02.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public fal|se $false = false; // PHP 8.2: OK
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_03.completion
new file mode 100644
index 000000000000..599ce3b23b11
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_03.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public ?fals|e $false2 = null; // PHP 8.2: OK
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_04.completion
new file mode 100644
index 000000000000..f499bb2d015a
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_04.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testNull(nu|ll $null): null {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      NullAndFalseType                [PUBLIC]   nullAndFalseType.php
+------------------------------------
+KEYWORD    null                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_05.completion
new file mode 100644
index 000000000000..b975eb604dfc
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_05.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testNull(null $null): nu|ll {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      NullAndFalseType                [PUBLIC]   nullAndFalseType.php
+------------------------------------
+KEYWORD    null                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_06.completion
new file mode 100644
index 000000000000..0cb3958e3625
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_06.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public function testFalse(fal|se $false): false {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_07.completion
new file mode 100644
index 000000000000..aee504a3f8ff
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_07.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public function testFalse(false $false): fal|se {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_08.completion
new file mode 100644
index 000000000000..8bcfcd53aea9
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_08.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public function testNullableFalse(?fal|se $false): ?false {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_09.completion
new file mode 100644
index 000000000000..2173d133c339
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testNullAndFalseType/nullAndFalseType.php.testNullAndFalseType_09.completion
@@ -0,0 +1,5 @@
+Code completion result for source line:
+public function testNullableFalse(?false $false): ?fal|se {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+KEYWORD    false                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php
new file mode 100644
index 000000000000..eecce20cf595
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php
@@ -0,0 +1,39 @@
+<?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 TrueType
+{
+    public true $true = true; // PHP 8.2: OK
+    public ?true $true2 = true; // PHP 8.2: OK
+    public int|true $true3 = true; // line comment
+    public true|int $true4 = true; // line comment
+
+    public function test(true $true): true {
+        return $true;
+    }
+
+    public function testNullable(?true $true): ?true {
+        return $true;
+    }
+
+    public function testUnionType(true|string $true): string|true {
+        return $true;
+    }
+}
+
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_01.completion
new file mode 100644
index 000000000000..b36ef7a345bc
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_01.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public tru|e $true = true; // PHP 8.2: OK
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_02.completion
new file mode 100644
index 000000000000..5af25aab0f02
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_02.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public ?tru|e $true2 = true; // PHP 8.2: OK
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_03.completion
new file mode 100644
index 000000000000..5f5502ba1178
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_03.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public int|tr|ue $true3 = true; // line comment
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_04.completion
new file mode 100644
index 000000000000..564572c55546
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_04.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public tru|e|int $true4 = true; // line comment
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_05.completion
new file mode 100644
index 000000000000..6ffcb701000d
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_05.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function test(tr|ue $true): true {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_06.completion
new file mode 100644
index 000000000000..8e31d5978cb4
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_06.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function test(true $true): tru|e {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_07.completion
new file mode 100644
index 000000000000..2eab9022ba7c
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_07.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testNullable(?tr|ue $true): ?true {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_08.completion
new file mode 100644
index 000000000000..37ed17e3ae79
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_08.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testNullable(?true $true): ?tr|ue {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_09.completion
new file mode 100644
index 000000000000..2f2d068c9b11
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_09.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testUnionType(tr|ue|string $true): string|true {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_10.completion
new file mode 100644
index 000000000000..60be08504edf
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php82/testTrueType/trueType.php.testTrueType_10.completion
@@ -0,0 +1,6 @@
+Code completion result for source line:
+public function testUnionType(true|string $true): string|tru|e {
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+CLASS      TrueType                        [PUBLIC]   trueType.php
+------------------------------------
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/test204958/issue204958.php.testUseCase1.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/test204958/issue204958.php.testUseCase1.completion
index 436652a94e88..247728d0ead9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/test204958/issue204958.php.testUseCase1.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/test204958/issue204958.php.testUseCase1.completion
@@ -19,3 +19,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase1.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase1.completion
index 6cce3666ca0d..3f286a5ffbc0 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase1.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase1.completion
@@ -24,3 +24,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase2.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase2.completion
index 3e1a8f5237dc..18600437ce57 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase2.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase2.completion
@@ -24,3 +24,4 @@ KEYWORD    public                                     null
 KEYWORD    readonly                                   null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase3.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase3.completion
index d2113b8623d5..7f7141a23d7e 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase3.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase3.completion
@@ -20,3 +20,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase4.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase4.completion
index 81955affb1c4..7d9609537df2 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase4.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests225089/tests225089.php.testUseCase4.completion
@@ -20,3 +20,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_01.php.testUseCase1.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_01.php.testUseCase1.completion
index 6c36574c15c2..2441b9ef6470 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_01.php.testUseCase1.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_01.php.testUseCase1.completion
@@ -17,3 +17,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_02.php.testUseCase2.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_02.php.testUseCase2.completion
index 459959001522..9be2dd47a49b 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_02.php.testUseCase2.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/tests242398/issue242398_02.php.testUseCase2.completion
@@ -17,3 +17,4 @@ KEYWORD    object                                     null
 KEYWORD    parent                                     null
 KEYWORD    self                                       null
 KEYWORD    string                                     null
+KEYWORD    true                                       null
diff --git a/php/php.editor/test/unit/data/testfiles/structure/standAloneTrueType.php b/php/php.editor/test/unit/data/testfiles/structure/standAloneTrueType.php
new file mode 100644
index 000000000000..eecce20cf595
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/structure/standAloneTrueType.php
@@ -0,0 +1,39 @@
+<?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 TrueType
+{
+    public true $true = true; // PHP 8.2: OK
+    public ?true $true2 = true; // PHP 8.2: OK
+    public int|true $true3 = true; // line comment
+    public true|int $true4 = true; // line comment
+
+    public function test(true $true): true {
+        return $true;
+    }
+
+    public function testNullable(?true $true): ?true {
+        return $true;
+    }
+
+    public function testUnionType(true|string $true): string|true {
+        return $true;
+    }
+}
+
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php
index e62a0c6b823c..04f203c3758e 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php
@@ -33,6 +33,7 @@ function testReturnParent(): parent&Iterator {}
 function testReturnSelf(): self&Iterator {}
 function testReturnStatic(): static&Iterator {}
 function testReturnString(): string&Iterator {}
+function testReturnTrue(): true&Iterator {}
 function testReturnVoid(): void&Iterator {}
 
 function testParamArray(Iterator&array $param): Iterator {}
@@ -50,6 +51,7 @@ function testParamParent(Iterator&parent $param): parent {}
 function testParamSelf(Iterator&self $param): self {}
 //function testParamStatic(Iterator&static $param): void {} // syntax error
 function testParamString(Iterator&string $param): string {}
+function testParamString(Iterator&true $param): true {}
 function testParamVoid(Iterator&void $param): void {}
 //function testReturnNullable(): ?Test&Iterator {} // syntax erro
 
@@ -72,6 +74,7 @@ class InvalidField {
     public self&Iterator $self;
 //    public static&Iterator $static; // syntax error
     public string&Iterator $string;
+    public true&Iterator $true;
     public void&Iterator $void;
     public Iterator&Iterator $duplicate;
 }
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php.testIntersectionTypes_01.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php.testIntersectionTypes_01.hints
index f92d0eba75bf..82e4ea306ffb 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php.testIntersectionTypes_01.hints
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testIntersectionTypes_01.php.testIntersectionTypes_01.hints
@@ -43,6 +43,9 @@ HINT:"static" cannot be used as an intersection type.
 function testReturnString(): string&Iterator {}
                              ------
 HINT:"string" cannot be used as an intersection type.
+function testReturnTrue(): true&Iterator {}
+                           ----
+HINT:"true" cannot be used as an intersection type.
 function testReturnVoid(): void&Iterator {}
                            ----
 HINT:"void" cannot be used as an intersection type.
@@ -88,6 +91,9 @@ HINT:"self" cannot be used as an intersection type.
 function testParamString(Iterator&string $param): string {}
                                   ------
 HINT:"string" cannot be used as an intersection type.
+function testParamString(Iterator&true $param): true {}
+                                  ----
+HINT:"true" cannot be used as an intersection type.
 function testParamVoid(Iterator&void $param): void {}
                                 ----
 HINT:"void" cannot be used as an intersection type.
@@ -139,6 +145,9 @@ HINT:"self" cannot be used as an intersection type.
     public string&Iterator $string;
            ------
 HINT:"string" cannot be used as an intersection type.
+    public true&Iterator $true;
+           ----
+HINT:"true" cannot be used as an intersection type.
     public void&Iterator $void;
            ----
 HINT:"void" cannot be used as an intersection type.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
index c4e3c4022559..4baa7d3f0e73 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php
@@ -23,6 +23,7 @@ class NullableTypes {
     private ?mixed $mixed;
     private ?null $null;
     private ?false $false;
+    private ?true $true;
 
     public function returnMixed(): ?mixed {
     }
@@ -33,6 +34,9 @@ public function returnNull(): ?null {
     public function returnFalse(): ?false {
     }
 
+    public function returnTrue(): ?true {
+    }
+
     public function parameterMixed(?mixed $mixed) {
     }
 
@@ -41,4 +45,7 @@ public function parameterNull(?null $null) {
 
     public function parameterFalse(?false $false) {
     }
+
+    public function parameterTrue(?true $true) {
+    }
 }
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
index 6fde2a4b4f44..0d71e2734860 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testNullableTypes_01.php.testNullableTypes_01_PHP81.hints
@@ -8,6 +8,9 @@ HINT:"null" cannot be used as a standalone type.
     private ?false $false;
              -----
 HINT:"false" cannot be used as a standalone type.
+    private ?true $true;
+             ----
+HINT:"true" cannot be used as a standalone type.
     public function returnMixed(): ?mixed {
                                     -----
 HINT:"mixed" cannot be used as a nullable type.
@@ -18,9 +21,19 @@ HINT:"null" cannot be used as a standalone type.
     public function returnFalse(): ?false {
                                     -----
 HINT:"false" cannot be used as a standalone type.
+    public function returnTrue(): ?true {
+                                   ----
+HINT:"true" cannot be used as a standalone type.
     public function parameterMixed(?mixed $mixed) {
                                     -----
 HINT:"mixed" cannot be used as a nullable type.
     public function parameterNull(?null $null) {
                                    ----
 HINT:"null" cannot be used as a nullable type.
+HINT:"null" cannot be used as a standalone type.
+    public function parameterFalse(?false $false) {
+                                    -----
+HINT:"false" cannot be used as a standalone type.
+    public function parameterTrue(?true $true) {
+                                   ----
+HINT:"true" cannot be used as a standalone type.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
index 489b729a3176..f9df21285234 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php
@@ -23,14 +23,21 @@ class UnusableTypes {
     private int|callable $callable;
     private false $false;
     private null $null;
+    private true $true;
     private bool|false $boolFalse;
+    private true|bool $trueBool;
     private bool|bool $duplicatedBool;
+    private true|false $bothTrueAndFalse;
+    private int|false|true $bothTrueAndFalse2;
     private int|INT $duplicatedInt;
     private iterable|array $iterable1;
     private iterable|Traversable $iterable2;
     private iterable|array|Traversable $iterable3;
     private null|false $nullFalse; // PHP 8.2: OK
 
+    public function returnFalse(): true {
+    }
+
     public function returnFalse(): false {
     }
 
@@ -40,6 +47,9 @@ public function returnNull(): null {
     public function returnDuplicatedType(): UnionType2|UnionType2 {
     }
 
+    public function parameterTrue(true $true) {
+    }
+
     public function parameterFalse(false $false) {
     }
 
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
index 2a97d34161ef..107dc49a2eb7 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01.hints
@@ -4,9 +4,20 @@ HINT:"callable" cannot be used as a property type.
     private bool|false $boolFalse;
                  -----
 HINT:Type "false" is duplicated.
+    private true|bool $trueBool;
+                 ----
+HINT:Type "bool" is duplicated.
     private bool|bool $duplicatedBool;
                  ----
 HINT:Type "bool" is duplicated.
+    private true|false $bothTrueAndFalse;
+                 -----
+HINT:Contains both "true" and "false", "bool" should be used.
+HINT:Contains both "true" and "false", "bool" should be used.
+    private int|false|true $bothTrueAndFalse2;
+                      ----
+HINT:Contains both "true" and "false", "bool" should be used.
+HINT:Contains both "true" and "false", "bool" should be used.
     private int|INT $duplicatedInt;
                 ---
 HINT:Type "INT" is duplicated.
diff --git a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints
index f3d39a663365..3ce1504f27ba 100644
--- a/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints
+++ b/php/php.editor/test/unit/data/testfiles/verification/UnusableTypesHintError/testUnionTypes_01.php.testUnionTypes_01_PHP81.hints
@@ -7,12 +7,26 @@ HINT:"false" cannot be used as a standalone type.
     private null $null;
             ----
 HINT:"null" cannot be used as a standalone type.
+    private true $true;
+            ----
+HINT:"true" cannot be used as a standalone type.
     private bool|false $boolFalse;
                  -----
 HINT:Type "false" is duplicated.
+    private true|bool $trueBool;
+                 ----
+HINT:Type "bool" is duplicated.
     private bool|bool $duplicatedBool;
                  ----
 HINT:Type "bool" is duplicated.
+    private true|false $bothTrueAndFalse;
+                 -----
+HINT:Contains both "true" and "false", "bool" should be used.
+HINT:Contains both "true" and "false", "bool" should be used.
+    private int|false|true $bothTrueAndFalse2;
+                      ----
+HINT:Contains both "true" and "false", "bool" should be used.
+HINT:Contains both "true" and "false", "bool" should be used.
     private int|INT $duplicatedInt;
                 ---
 HINT:Type "INT" is duplicated.
@@ -29,6 +43,9 @@ HINT:Redundant combination: "iterable|array|Traversable" contains both "iterable
     private null|false $nullFalse; // PHP 8.2: OK
                  -----
 HINT:"false" cannot be used as a standalone type.
+    public function returnFalse(): true {
+                                   ----
+HINT:"true" cannot be used as a standalone type.
     public function returnFalse(): false {
                                    -----
 HINT:"false" cannot be used as a standalone type.
@@ -38,6 +55,9 @@ HINT:"null" cannot be used as a standalone type.
     public function returnDuplicatedType(): UnionType2|UnionType2 {
                                                        ----------
 HINT:Type "UnionType2" is duplicated.
+    public function parameterTrue(true $true) {
+                                  ----
+HINT:"true" cannot be used as a standalone type.
     public function parameterFalse(false $false) {
                                    -----
 HINT:"false" cannot be used as a standalone type.
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP82CodeCompletionTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP82CodeCompletionTest.java
new file mode 100644
index 000000000000..7c5f297c38a1
--- /dev/null
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP82CodeCompletionTest.java
@@ -0,0 +1,139 @@
+/*
+ * 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 PHP82CodeCompletionTest extends PHPCodeCompletionTestBase {
+
+    public PHP82CodeCompletionTest(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/php82/" + 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/php82/%s/%s.php", getTestDirName(), fileName);
+    }
+
+    private void checkCompletion(String fileName, String caretPosition) throws Exception {
+        checkCompletion(getTestPath(fileName), caretPosition, false);
+    }
+
+    public void testNullAndFalseType_01() throws Exception {
+        checkCompletion("nullAndFalseType", "    public nu^ll $null = null; // PHP 8.2: OK");
+    }
+
+    public void testNullAndFalseType_02() throws Exception {
+        checkCompletion("nullAndFalseType", "    public fal^se $false = false; // PHP 8.2: OK");
+    }
+
+    public void testNullAndFalseType_03() throws Exception {
+        checkCompletion("nullAndFalseType", "    public ?fals^e $false2 = null; // PHP 8.2: OK");
+    }
+
+    public void testNullAndFalseType_04() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testNull(nu^ll $null): null {");
+    }
+
+    public void testNullAndFalseType_05() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testNull(null $null): nu^ll {");
+    }
+
+    public void testNullAndFalseType_06() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testFalse(fal^se $false): false {");
+    }
+
+    public void testNullAndFalseType_07() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testFalse(false $false): fal^se {");
+    }
+
+    public void testNullAndFalseType_08() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testNullableFalse(?fal^se $false): ?false {");
+    }
+
+    public void testNullAndFalseType_09() throws Exception {
+        checkCompletion("nullAndFalseType", "    public function testNullableFalse(?false $false): ?fal^se {");
+    }
+
+    public void testTrueType_01() throws Exception {
+        checkCompletion("trueType", "    public tru^e $true = true; // PHP 8.2: OK");
+    }
+
+    public void testTrueType_02() throws Exception {
+        checkCompletion("trueType", "    public ?tru^e $true2 = true; // PHP 8.2: OK");
+    }
+
+    public void testTrueType_03() throws Exception {
+        checkCompletion("trueType", "    public int|tr^ue $true3 = true; // line comment");
+    }
+
+    public void testTrueType_04() throws Exception {
+        checkCompletion("trueType", "    public tru^e|int $true4 = true; // line comment");
+    }
+
+    public void testTrueType_05() throws Exception {
+        checkCompletion("trueType", "    public function test(tr^ue $true): true {");
+    }
+
+    public void testTrueType_06() throws Exception {
+        checkCompletion("trueType", "    public function test(true $true): tru^e {");
+    }
+
+    public void testTrueType_07() throws Exception {
+        checkCompletion("trueType", "    public function testNullable(?tr^ue $true): ?true {");
+    }
+
+    public void testTrueType_08() throws Exception {
+        checkCompletion("trueType", "    public function testNullable(?true $true): ?tr^ue {");
+    }
+
+    public void testTrueType_09() throws Exception {
+        checkCompletion("trueType", "    public function testUnionType(tr^ue|string $true): string|true {");
+    }
+
+    public void testTrueType_10() throws Exception {
+        checkCompletion("trueType", "    public function testUnionType(true|string $true): string|tru^e {");
+    }
+
+}
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorTest.java
index 9190f044d59b..0cbb32a17ab2 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorTest.java
@@ -120,4 +120,8 @@ public void testEnumerations() throws Exception {
         performTest("structure/enumerations");
     }
 
+    public void testStandAloneTrueType() throws Exception {
+        performTest("structure/standAloneTrueType");
+    }
+
 }