Fix face tests

Author: zonuexe

Diff for: tests/arrays.php.faces

@@ -5,17 +5,23 @@
  ("Array should be treated like a normal keyword\n" . font-lock-comment-face)
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("array" . php-keyword)
  ("();\n\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("function" . php-keyword)
  ("(")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("array" . php-keyword)
  ("()) {\n};\n\n")
  ("// " . font-lock-comment-delimiter-face)
@@ -28,15 +34,19 @@
  ("- return type, should look like `: int`\n" . font-lock-comment-face)
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = (")
+ (" ")
+ ("=" . php-assignment-op)
+ (" (")
  ("array" . font-lock-type-face)
  (")")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("function" . php-keyword)
  ("(")
  ("array" . font-lock-type-face)

Diff for: tests/constants.php.faces

@@ -4,15 +4,21 @@
  ("// " . font-lock-comment-delimiter-face)
  ("Test c-lang-defconst c-constant-kwds\n" . font-lock-comment-face)
  ("true" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("TRUE" . php-constant)
  (";\n")
  ("false" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("FALSE" . php-constant)
  (";\n")
  ("null" . php-constant)
- (" === ")
+ (" ")
+ ("===" . php-comparison-op)
+ (" ")
  ("NULL" . php-constant)
  (";\n\n")
  ("// " . font-lock-comment-delimiter-face)

Diff for: tests/identifiers.php.faces

@@ -3,28 +3,36 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("UnqualifiedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("\\FullyQualifiedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("SpaceName\\NamespacedClassName" . font-lock-type-face)
  (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("new" . php-keyword)
  (" ")
  ("NOTACONSTANT\\ClassName" . font-lock-type-face)

Diff for: tests/issue-439.php.faces

@@ -7,47 +7,62 @@
  ("\n\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<ABC\nLet'go Justin\nABC" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("b" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<A_B_C\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("c" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<'A_B_C'\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("d" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<\"A_B_C\"\nLet'go Justin\nA_B_C" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("e" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<いろは\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("f" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<'いろは'\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("$" . php-variable-sigil)
  ("g" . php-variable-name)
- (" = ")
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
  ("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
  ("var_dump" . php-function-call)
  ("(")
  ("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
  (");\n\n")
  ("if" . php-keyword)
- (" (1 === 1) {\n    ")
+ (" (1 ")
+ ("===" . php-comparison-op)
+ (" 1) {\n    ")
  ("var_dump" . php-function-call)
  ("(")
  ("<<<\"ABC\"\n    Let'go Justin\n    ABC" . php-string)
- (");\n}\n")
- )
+ (");\n}\n"))

Diff for: tests/issue-443.php.27.faces

@@ -4,19 +4,21 @@
  ("declare" . php-keyword)
  ("(")
  ("strict_types" . php-keyword)
- ("=1); ")
+ ("=" . php-assignment-op)
+ ("1); ")
  ("?>" . php-php-tag)
  ("\n")
  ("/** GitHub Issue: " . font-lock-doc-face)
  ("https://github.com/emacs-php/php-mode/issues/443" link font-lock-doc-face)
  (" */" . font-lock-doc-face)
  ("\n")
  ("<?xml" . php-php-tag)
- (" version=")
+ (" version")
+ ("=" . php-assignment-op)
  ("\"1.0\"" . php-string)
  (" ")
  ("encoding" . php-keyword)
- ("=")
+ ("=" . php-assignment-op)
  ("\"UTF-8\"" . php-string)
  ("?>" . php-php-tag)
  ("\n")
@@ -51,7 +53,9 @@
  ("?>" . php-php-tag)
  ("\n")
  ("<?=" . php-php-tag)
- (" 1 + 1 ")
+ (" 1 ")
+ ("+" . php-arithmetic-op)
+ (" 1 ")
  ("?>" . php-php-tag)
  ("\n")
  ("<?php" . php-php-tag)

Diff for: tests/issue-443.php.faces

@@ -4,19 +4,21 @@
  ("declare" . php-keyword)
  ("(")
  ("strict_types" . php-keyword)
- ("=1); ")
+ ("=" . php-assignment-op)
+ ("1); ")
  ("?>" . php-php-tag)
  ("\n")
  ("/** GitHub Issue: " . font-lock-doc-face)
  ("https://github.com/emacs-php/php-mode/issues/443" link font-lock-doc-face)
  (" */" . font-lock-doc-face)
  ("\n")
  ("<?xml" . php-php-tag)
- (" version=")
+ (" version")
+ ("=" . php-assignment-op)
  ("\"1.0\"" . php-string)
  (" ")
  ("encoding" . php-keyword)
- ("=")
+ ("=" . php-assignment-op)
  ("\"UTF-8\"" . php-string)
  ("?>" . php-php-tag)
  ("\n")
@@ -51,7 +53,9 @@
  ("?>" . php-php-tag)
  ("\n")
  ("<?=" . php-php-tag)
- (" 1 + 1 ")
+ (" 1 ")
+ ("+" . php-arithmetic-op)
+ (" 1 ")
  ("?>" . php-php-tag)
  ("\n")
  ("<?php" . php-php-tag)