Merge pull request #633 from emacs-php/feature/mixed-type

Add mixed type

Author: zonuexe

Diff for: 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 for: tests/lang/types/keywords.php

@@ -12,3 +12,4 @@
 string;
 object;
 resource;
+mixed;

Diff for: 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"))