Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
zonuexe committed Jun 20, 2024
1 parent e072156 commit 965586d
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 52 deletions.
4 changes: 2 additions & 2 deletions tests/7.4/typed-property.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -60,5 +60,5 @@
("Typed" . font-lock-type-face)
(")")
("->" . php-object-op)
("print" . php-method-call)
("print" . php-method-call-traditional)
("();\n"))
12 changes: 6 additions & 6 deletions tests/8.0/attribute/class.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
(", ")
Expand All @@ -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)
(", ")
Expand All @@ -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)
(")]
Expand Down
8 changes: 4 additions & 4 deletions tests/8.0/attribute/function.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
(", ")
Expand All @@ -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)
(", ")
Expand Down
2 changes: 1 addition & 1 deletion tests/constants.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions tests/identifiers.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions tests/issue-197.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
6 changes: 3 additions & 3 deletions tests/issue-201.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
4 changes: 2 additions & 2 deletions tests/issue-439.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
(" ")
("<<<\"いろは\"\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")
("if" . php-keyword)
(" (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"))
2 changes: 1 addition & 1 deletion tests/lang/class/anonymous-class.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
(" ")
Expand Down
2 changes: 1 addition & 1 deletion tests/lang/doc-comment/comments.php.24.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/lang/doc-comment/comments.php.27.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/lang/doc-comment/comments.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 12 additions & 12 deletions tests/lang/function/calls.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tests/lang/function/closure.php.faces
Original file line number Diff line number Diff line change
@@ -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)
(" ")
Expand All @@ -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)
(" ")
Expand All @@ -20,4 +20,4 @@
(" {\n ")
("// " . font-lock-comment-delimiter-face)
("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
("});\n"))
("});\n"))
18 changes: 9 additions & 9 deletions tests/static-method-calls.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
2 changes: 1 addition & 1 deletion tests/variables.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
("$" . php-variable-sigil)
("object" . php-variable-name)
("->" . php-object-op)
("funCall" . php-method-call)
("funCall" . php-method-call-traditional)
("();\n"))

0 comments on commit 965586d

Please sign in to comment.