Skip to content

Commit 965586d

Browse files
committed
Fix tests
1 parent e072156 commit 965586d

16 files changed

+52
-52
lines changed

Diff for: tests/7.4/typed-property.php.faces

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
(" ")
4949
("print" . php-function-name)
5050
("()\n {\n ")
51-
("var_dump" . php-function-call)
51+
("var_dump" . php-function-call-traditional)
5252
("(")
5353
("$" . php-this-sigil)
5454
("this" . php-this)
@@ -60,5 +60,5 @@
6060
("Typed" . font-lock-type-face)
6161
(")")
6262
("->" . php-object-op)
63-
("print" . php-method-call)
63+
("print" . php-method-call-traditional)
6464
("();\n"))

Diff for: tests/8.0/attribute/class.php.faces

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
2525
#[WithoutArgument]
2626
#[")
27-
("SingleArgument" . php-function-call)
27+
("SingleArgument" . php-function-call-traditional)
2828
("(0)]
2929
#[")
30-
("FewArguments" . php-function-call)
30+
("FewArguments" . php-function-call-traditional)
3131
("(")
3232
("'Hello'" . php-string)
3333
(", ")
@@ -40,9 +40,9 @@
4040
("() {}
4141
4242
#[WithoutArgument] #[")
43-
("SingleArgument" . php-function-call)
43+
("SingleArgument" . php-function-call-traditional)
4444
("(0)] #[")
45-
("FewArguments" . php-function-call)
45+
("FewArguments" . php-function-call-traditional)
4646
("(")
4747
("'Hello'" . php-string)
4848
(", ")
@@ -55,11 +55,11 @@
5555
("() {}
5656
5757
#[")
58-
("Attr2" . php-function-call)
58+
("Attr2" . php-function-call-traditional)
5959
("(")
6060
("\"foo\"" . php-string)
6161
("), ")
62-
("Attr2" . php-function-call)
62+
("Attr2" . php-function-call-traditional)
6363
("(")
6464
("\"bar\"" . php-string)
6565
(")]

Diff for: tests/8.0/attribute/function.php.faces

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
1212
#[WithoutArgument]
1313
#[")
14-
("SingleArgument" . php-function-call)
14+
("SingleArgument" . php-function-call-traditional)
1515
("(0)]
1616
#[")
17-
("FewArguments" . php-function-call)
17+
("FewArguments" . php-function-call-traditional)
1818
("(")
1919
("'Hello'" . php-string)
2020
(", ")
@@ -27,9 +27,9 @@
2727
("() {}
2828
2929
#[WithoutArgument]#[")
30-
("SingleArgument" . php-function-call)
30+
("SingleArgument" . php-function-call-traditional)
3131
("(0)]#[")
32-
("FewArguments" . php-function-call)
32+
("FewArguments" . php-function-call-traditional)
3333
("(")
3434
("'Hello'" . php-string)
3535
(", ")

Diff for: tests/constants.php.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
(";\n")
4747
("SomeClass" . php-constant)
4848
("::" . php-paamayim-nekudotayim)
49-
("classIdentifier" . php-static-method-call)
49+
("classIdentifier" . php-static-method-call-traditional)
5050
("();\n\n")
5151
("__halt_compiler" . php-keyword)
5252
("();\n\n")

Diff for: tests/identifiers.php.faces

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
("the constant face. Just like c++-mode \"NS::Class::method()\"\n" . font-lock-comment-face)
4444
("ClassName" . php-constant)
4545
("::" . php-paamayim-nekudotayim)
46-
("method" . php-static-method-call)
46+
("method" . php-static-method-call-traditional)
4747
("();\n")
4848
("\\SpaceName\\ClassName" . php-constant)
4949
("::" . php-paamayim-nekudotayim)
50-
("method" . php-static-method-call)
50+
("method" . php-static-method-call-traditional)
5151
("();\n")
5252
("\\My_Class" . php-constant)
5353
("::" . php-paamayim-nekudotayim)
54-
("method" . php-static-method-call)
54+
("method" . php-static-method-call-traditional)
5555
("();\n\n")
5656
("__halt_compiler" . php-keyword)
5757
("();\n\n")

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
("$" . php-variable-sigil)
2222
("test" . php-variable-name)
2323
("->" . php-object-op)
24-
("int" . php-method-call)
24+
("int" . php-method-call-traditional)
2525
("();\n")
2626
("$" . php-variable-sigil)
2727
("test" . php-variable-name)
2828
("->" . php-object-op)
29-
("string" . php-method-call)
29+
("string" . php-method-call-traditional)
3030
("();\n"))

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
(";\n")
1717
("self" . php-keyword)
1818
("::" . php-paamayim-nekudotayim)
19-
("test" . php-static-method-call)
19+
("test" . php-static-method-call-traditional)
2020
("();\n")
2121
("static" . php-keyword)
2222
("::" . php-paamayim-nekudotayim)
23-
("test" . php-static-method-call)
23+
("test" . php-static-method-call-traditional)
2424
("();\n")
2525
("parent" . php-keyword)
2626
("::" . php-paamayim-nekudotayim)
27-
("test" . php-static-method-call)
27+
("test" . php-static-method-call-traditional)
2828
("();\n"))

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
(" ")
5353
("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
5454
(";\n\n")
55-
("var_dump" . php-function-call)
55+
("var_dump" . php-function-call-traditional)
5656
("(")
5757
("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
5858
(");\n\n")
5959
("if" . php-keyword)
6060
(" (1 ")
6161
("===" . php-comparison-op)
6262
(" 1) {\n ")
63-
("var_dump" . php-function-call)
63+
("var_dump" . php-function-call-traditional)
6464
("(")
6565
("<<<\"ABC\"\n Let'go Justin\n ABC" . php-string)
6666
(");\n}\n"))

Diff for: tests/lang/class/anonymous-class.php.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
("// " . font-lock-comment-delimiter-face)
1818
("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
1919
("};\n\n")
20-
("is_object" . php-function-call)
20+
("is_object" . php-function-call-traditional)
2121
("(1, ")
2222
("new" . php-keyword)
2323
(" ")

Diff for: tests/lang/doc-comment/comments.php.24.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
(" ")
135135
("=" . php-assignment-op)
136136
(" ")
137-
("hoge" . php-function-call)
137+
("hoge" . php-function-call-traditional)
138138
("();\n\n ")
139139
("// " . font-lock-comment-delimiter-face)
140140
("one-line comment\n" . font-lock-comment-face)

Diff for: tests/lang/doc-comment/comments.php.27.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
(" ")
136136
("=" . php-assignment-op)
137137
(" ")
138-
("hoge" . php-function-call)
138+
("hoge" . php-function-call-traditional)
139139
("();\n\n ")
140140
("// " . font-lock-comment-delimiter-face)
141141
("one-line comment\n" . font-lock-comment-face)

Diff for: tests/lang/doc-comment/comments.php.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
(" ")
135135
("=" . php-assignment-op)
136136
(" ")
137-
("hoge" . php-function-call)
137+
("hoge" . php-function-call-traditional)
138138
("();\n\n ")
139139
("// " . font-lock-comment-delimiter-face)
140140
("one-line comment\n" . font-lock-comment-face)

Diff for: tests/lang/function/calls.php.faces

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,73 +9,73 @@
99
("foo" . php-variable-name)
1010
(")) {\n 1")
1111
("+" . php-arithmetic-op)
12-
("bar" . php-function-call)
12+
("bar" . php-function-call-traditional)
1313
("()+")
14-
("foo" . php-function-call)
14+
("foo" . php-function-call-traditional)
1515
("();\n}\n\n")
1616
("$" . php-variable-sigil)
1717
("foo" . php-variable-name)
1818
("->" . php-object-op)
19-
("string" . php-method-call)
19+
("string" . php-method-call-traditional)
2020
("();\n")
2121
("$" . php-variable-sigil)
2222
("foo" . php-variable-name)
2323
("->" . php-object-op)
24-
("isset" . php-method-call)
24+
("isset" . php-method-call-traditional)
2525
("();\n\n\n")
2626
("$" . php-variable-sigil)
2727
("a" . php-variable-name)
2828
("->" . php-object-op)
29-
("b" . php-method-call)
29+
("b" . php-method-call-traditional)
3030
("();\n")
3131
("$" . php-variable-sigil)
3232
("a" . php-variable-name)
3333
(" ")
3434
("=" . php-assignment-op)
3535
(" ")
36-
("a" . php-function-call)
36+
("a" . php-function-call-traditional)
3737
("();\n")
3838
("$" . php-variable-sigil)
3939
("aaa" . php-variable-name)
4040
(" ")
4141
("=" . php-assignment-op)
4242
(" ")
43-
("aaa" . php-function-call)
43+
("aaa" . php-function-call-traditional)
4444
("();\n")
4545
("$" . php-variable-sigil)
4646
("_aa" . php-variable-name)
4747
(" ")
4848
("=" . php-assignment-op)
4949
(" ")
50-
("_aa" . php-function-call)
50+
("_aa" . php-function-call-traditional)
5151
("();\n")
5252
("$" . php-variable-sigil)
5353
("a_a" . php-variable-name)
5454
(" ")
5555
("=" . php-assignment-op)
5656
(" ")
57-
("a_a" . php-function-call)
57+
("a_a" . php-function-call-traditional)
5858
("();\n")
5959
("$" . php-variable-sigil)
6060
("aa_" . php-variable-name)
6161
(" ")
6262
("=" . php-assignment-op)
6363
(" ")
64-
("aa_" . php-function-call)
64+
("aa_" . php-function-call-traditional)
6565
("();\n")
6666
("$" . php-variable-sigil)
6767
("a1c" . php-variable-name)
6868
(" ")
6969
("=" . php-assignment-op)
7070
(" ")
71-
("a1c" . php-function-call)
71+
("a1c" . php-function-call-traditional)
7272
("();\n")
7373
("$" . php-variable-sigil)
7474
("" . php-variable-name)
7575
(" ")
7676
("=" . php-assignment-op)
7777
(" ")
78-
("" . php-function-call)
78+
("" . php-function-call-traditional)
7979
("();\n")
8080
("$" . php-variable-sigil)
8181
("_a" . php-variable-name)

Diff for: tests/lang/function/closure.php.faces

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
;; -*- mode: emacs-lisp -*-
22
(("<?php" . php-php-tag)
33
("\n\n")
4-
("is_object" . php-function-call)
4+
("is_object" . php-function-call-traditional)
55
("(")
66
("static" . php-keyword)
77
(" ")
@@ -10,7 +10,7 @@
1010
("// " . font-lock-comment-delimiter-face)
1111
("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
1212
("});\n\n")
13-
("is_object" . php-function-call)
13+
("is_object" . php-function-call-traditional)
1414
("(")
1515
("static" . php-keyword)
1616
(" ")
@@ -20,4 +20,4 @@
2020
(" {\n ")
2121
("// " . font-lock-comment-delimiter-face)
2222
("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
23-
("});\n"))
23+
("});\n"))

Diff for: tests/static-method-calls.php.faces

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
("\n\n")
44
("ClassName" . php-constant)
55
("::" . php-paamayim-nekudotayim)
6-
("method" . php-static-method-call)
6+
("method" . php-static-method-call-traditional)
77
("();\n")
88
("\\Project\\Module\\ClassName" . php-constant)
99
("::" . php-paamayim-nekudotayim)
10-
("method" . php-static-method-call)
10+
("method" . php-static-method-call-traditional)
1111
("();\n")
1212
("\\ClassName" . php-constant)
1313
("::" . php-paamayim-nekudotayim)
14-
("method" . php-static-method-call)
14+
("method" . php-static-method-call-traditional)
1515
("();\n\n")
1616
("ClassName" . php-constant)
1717
("::" . php-paamayim-nekudotayim)
18-
("new" . php-static-method-call)
18+
("new" . php-static-method-call-traditional)
1919
("();\n")
2020
("\\Project\\Module\\ClassName" . php-constant)
2121
("::" . php-paamayim-nekudotayim)
22-
("new" . php-static-method-call)
22+
("new" . php-static-method-call-traditional)
2323
("();\n")
2424
("\\ClassName" . php-constant)
2525
("::" . php-paamayim-nekudotayim)
26-
("new" . php-static-method-call)
26+
("new" . php-static-method-call-traditional)
2727
("();\n\n")
2828
("ClassName" . php-constant)
2929
("::" . php-paamayim-nekudotayim)
30-
("clone" . php-static-method-call)
30+
("clone" . php-static-method-call-traditional)
3131
("();\n")
3232
("\\Project\\Module\\ClassName" . php-constant)
3333
("::" . php-paamayim-nekudotayim)
34-
("clone" . php-static-method-call)
34+
("clone" . php-static-method-call-traditional)
3535
("();\n")
3636
("\\ClassName" . php-constant)
3737
("::" . php-paamayim-nekudotayim)
38-
("clone" . php-static-method-call)
38+
("clone" . php-static-method-call-traditional)
3939
("();\n"))

Diff for: tests/variables.php.faces

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656
("$" . php-variable-sigil)
5757
("object" . php-variable-name)
5858
("->" . php-object-op)
59-
("funCall" . php-method-call)
59+
("funCall" . php-method-call-traditional)
6060
("();\n"))

0 commit comments

Comments
 (0)