From 965586d69e8f4ba7193969b3d06caa33a9d7ac2d Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 20 Jun 2024 16:29:43 +0900
Subject: [PATCH] Fix tests

---
 tests/7.4/typed-property.php.faces           |  4 ++--
 tests/8.0/attribute/class.php.faces          | 12 +++++-----
 tests/8.0/attribute/function.php.faces       |  8 +++----
 tests/constants.php.faces                    |  2 +-
 tests/identifiers.php.faces                  |  6 ++---
 tests/issue-197.php.faces                    |  4 ++--
 tests/issue-201.php.faces                    |  6 ++---
 tests/issue-439.php.faces                    |  4 ++--
 tests/lang/class/anonymous-class.php.faces   |  2 +-
 tests/lang/doc-comment/comments.php.24.faces |  2 +-
 tests/lang/doc-comment/comments.php.27.faces |  2 +-
 tests/lang/doc-comment/comments.php.faces    |  2 +-
 tests/lang/function/calls.php.faces          | 24 ++++++++++----------
 tests/lang/function/closure.php.faces        |  6 ++---
 tests/static-method-calls.php.faces          | 18 +++++++--------
 tests/variables.php.faces                    |  2 +-
 16 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/tests/7.4/typed-property.php.faces b/tests/7.4/typed-property.php.faces
index 93779d5c..660b7b0a 100644
--- a/tests/7.4/typed-property.php.faces
+++ b/tests/7.4/typed-property.php.faces
@@ -48,7 +48,7 @@
  (" ")
  ("print" . php-function-name)
  ("()\n    {\n        ")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("$" . php-this-sigil)
  ("this" . php-this)
@@ -60,5 +60,5 @@
  ("Typed" . font-lock-type-face)
  (")")
  ("->" . php-object-op)
- ("print" . php-method-call)
+ ("print" . php-method-call-traditional)
  ("();\n"))
diff --git a/tests/8.0/attribute/class.php.faces b/tests/8.0/attribute/class.php.faces
index a4381657..1d249b6a 100644
--- a/tests/8.0/attribute/class.php.faces
+++ b/tests/8.0/attribute/class.php.faces
@@ -24,10 +24,10 @@
 
     #[WithoutArgument]
     #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]
     #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -40,9 +40,9 @@
  ("() {}
 
     #[WithoutArgument] #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)] #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -55,11 +55,11 @@
  ("() {}
 
     #[")
- ("Attr2" . php-function-call)
+ ("Attr2" . php-function-call-traditional)
  ("(")
  ("\"foo\"" . php-string)
  ("), ")
- ("Attr2" . php-function-call)
+ ("Attr2" . php-function-call-traditional)
  ("(")
  ("\"bar\"" . php-string)
  (")]
diff --git a/tests/8.0/attribute/function.php.faces b/tests/8.0/attribute/function.php.faces
index da2aea6c..00cedf07 100644
--- a/tests/8.0/attribute/function.php.faces
+++ b/tests/8.0/attribute/function.php.faces
@@ -11,10 +11,10 @@
 
 #[WithoutArgument]
 #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]
 #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -27,9 +27,9 @@
  ("() {}
 
 #[WithoutArgument]#[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]#[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
diff --git a/tests/constants.php.faces b/tests/constants.php.faces
index 28f9523d..6718eb44 100644
--- a/tests/constants.php.faces
+++ b/tests/constants.php.faces
@@ -46,7 +46,7 @@
  (";\n")
  ("SomeClass" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("classIdentifier" . php-static-method-call)
+ ("classIdentifier" . php-static-method-call-traditional)
  ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
diff --git a/tests/identifiers.php.faces b/tests/identifiers.php.faces
index fbb56dfa..df098c90 100644
--- a/tests/identifiers.php.faces
+++ b/tests/identifiers.php.faces
@@ -43,15 +43,15 @@
  ("the constant face. Just like c++-mode \"NS::Class::method()\"\n" . font-lock-comment-face)
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\SpaceName\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\My_Class" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
diff --git a/tests/issue-197.php.faces b/tests/issue-197.php.faces
index 94f2abef..85469d9d 100644
--- a/tests/issue-197.php.faces
+++ b/tests/issue-197.php.faces
@@ -21,10 +21,10 @@
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
  ("->" . php-object-op)
- ("int" . php-method-call)
+ ("int" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
  ("->" . php-object-op)
- ("string" . php-method-call)
+ ("string" . php-method-call-traditional)
  ("();\n"))
diff --git a/tests/issue-201.php.faces b/tests/issue-201.php.faces
index 5801ea2a..5c3ccda8 100644
--- a/tests/issue-201.php.faces
+++ b/tests/issue-201.php.faces
@@ -16,13 +16,13 @@
  (";\n")
  ("self" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n")
  ("static" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n")
  ("parent" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n"))
diff --git a/tests/issue-439.php.faces b/tests/issue-439.php.faces
index 595bcbab..bc3094e6 100644
--- a/tests/issue-439.php.faces
+++ b/tests/issue-439.php.faces
@@ -52,7 +52,7 @@
  (" ")
  ("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
  (");\n\n")
@@ -60,7 +60,7 @@
  (" (1 ")
  ("===" . php-comparison-op)
  (" 1) {\n    ")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("<<<\"ABC\"\n    Let'go Justin\n    ABC" . php-string)
  (");\n}\n"))
diff --git a/tests/lang/class/anonymous-class.php.faces b/tests/lang/class/anonymous-class.php.faces
index 415bcaa2..bd0df9ce 100644
--- a/tests/lang/class/anonymous-class.php.faces
+++ b/tests/lang/class/anonymous-class.php.faces
@@ -17,7 +17,7 @@
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
  ("};\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(1, ")
  ("new" . php-keyword)
  (" ")
diff --git a/tests/lang/doc-comment/comments.php.24.faces b/tests/lang/doc-comment/comments.php.24.faces
index ca033603..06f70485 100644
--- a/tests/lang/doc-comment/comments.php.24.faces
+++ b/tests/lang/doc-comment/comments.php.24.faces
@@ -134,7 +134,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/doc-comment/comments.php.27.faces b/tests/lang/doc-comment/comments.php.27.faces
index 9b2fe992..70c23fb3 100644
--- a/tests/lang/doc-comment/comments.php.27.faces
+++ b/tests/lang/doc-comment/comments.php.27.faces
@@ -135,7 +135,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/doc-comment/comments.php.faces b/tests/lang/doc-comment/comments.php.faces
index ca033603..06f70485 100644
--- a/tests/lang/doc-comment/comments.php.faces
+++ b/tests/lang/doc-comment/comments.php.faces
@@ -134,7 +134,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/function/calls.php.faces b/tests/lang/function/calls.php.faces
index 19d681c5..7713374a 100644
--- a/tests/lang/function/calls.php.faces
+++ b/tests/lang/function/calls.php.faces
@@ -9,73 +9,73 @@
  ("foo" . php-variable-name)
  (")) {\n    1")
  ("+" . php-arithmetic-op)
- ("bar" . php-function-call)
+ ("bar" . php-function-call-traditional)
  ("()+")
- ("foo" . php-function-call)
+ ("foo" . php-function-call-traditional)
  ("();\n}\n\n")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
  ("->" . php-object-op)
- ("string" . php-method-call)
+ ("string" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
  ("->" . php-object-op)
- ("isset" . php-method-call)
+ ("isset" . php-method-call-traditional)
  ("();\n\n\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
  ("->" . php-object-op)
- ("b" . php-method-call)
+ ("b" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a" . php-function-call)
+ ("a" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aaa" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("aaa" . php-function-call)
+ ("aaa" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_aa" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("_aa" . php-function-call)
+ ("_aa" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a_a" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a_a" . php-function-call)
+ ("a_a" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aa_" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("aa_" . php-function-call)
+ ("aa_" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a1c" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a1c" . php-function-call)
+ ("a1c" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("あ" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("あ" . php-function-call)
+ ("あ" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_a" . php-variable-name)
diff --git a/tests/lang/function/closure.php.faces b/tests/lang/function/closure.php.faces
index 1d671f72..9bf83b50 100644
--- a/tests/lang/function/closure.php.faces
+++ b/tests/lang/function/closure.php.faces
@@ -1,7 +1,7 @@
 ;; -*- mode: emacs-lisp -*-
 (("<?php" . php-php-tag)
  ("\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(")
  ("static" . php-keyword)
  (" ")
@@ -10,7 +10,7 @@
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
  ("});\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(")
  ("static" . php-keyword)
  (" ")
@@ -20,4 +20,4 @@
  (" {\n    ")
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
- ("});\n"))
\ No newline at end of file
+ ("});\n"))
diff --git a/tests/static-method-calls.php.faces b/tests/static-method-calls.php.faces
index 34e77b91..8cdd0815 100644
--- a/tests/static-method-calls.php.faces
+++ b/tests/static-method-calls.php.faces
@@ -3,37 +3,37 @@
  ("\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n"))
diff --git a/tests/variables.php.faces b/tests/variables.php.faces
index 7a7573c5..c777aa4e 100644
--- a/tests/variables.php.faces
+++ b/tests/variables.php.faces
@@ -56,5 +56,5 @@
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
  ("->" . php-object-op)
- ("funCall" . php-method-call)
+ ("funCall" . php-method-call-traditional)
  ("();\n"))