From c8f2a5dfb876d48b972bcf6600504ba338b13985 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Sun, 26 Jul 2020 02:51:10 +0900
Subject: [PATCH] Add mixed type

"mixed" type declare is added in PHP 8.0.

https://wiki.php.net/rfc/mixed_type_v2
---
 php-mode.el                         | 2 +-
 tests/lang/types/keywords.php       | 1 +
 tests/lang/types/keywords.php.faces | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/php-mode.el b/php-mode.el
index 31fbd65e..5a374559 100644
--- a/php-mode.el
+++ b/php-mode.el
@@ -472,7 +472,7 @@ In that case set to `NIL'."
 
 (c-lang-defconst c-primitive-type-kwds
   php '("int" "integer" "bool" "boolean" "float" "double" "real"
-        "string" "object" "void"))
+        "string" "object" "void" "mixed"))
 
 (c-lang-defconst c-class-decl-kwds
   "Keywords introducing declarations where the following block (if any)
diff --git a/tests/lang/types/keywords.php b/tests/lang/types/keywords.php
index fc1b4f66..e9ba7785 100644
--- a/tests/lang/types/keywords.php
+++ b/tests/lang/types/keywords.php
@@ -12,3 +12,4 @@
 string;
 object;
 resource;
+mixed;
diff --git a/tests/lang/types/keywords.php.faces b/tests/lang/types/keywords.php.faces
index 465e035f..32d205a9 100644
--- a/tests/lang/types/keywords.php.faces
+++ b/tests/lang/types/keywords.php.faces
@@ -20,4 +20,6 @@
  ("string" . font-lock-type-face)
  (";\n")
  ("object" . font-lock-type-face)
- (";\nresource;\n"))
+ (";\nresource;\n")
+ ("mixed" . font-lock-type-face)
+ (";\n"))