Skip to content

Add mixed type #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonuexe merged 1 commit into from
Jul 25, 2020
Merged

Add mixed type #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add mixed type 
"mixed" type declare is added in PHP 8.0.

https://wiki.php.net/rfc/mixed_type_v2
  • Loading branch information
@zonuexe
zonuexe committed Jul 25, 2020
commit c8f2a5dfb876d48b972bcf6600504ba338b13985
2 changes: 1 addition & 1 deletion php-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions tests/lang/types/keywords.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
string;
object;
resource;
mixed;
4 changes: 3 additions & 1 deletion tests/lang/types/keywords.php.faces
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))