Skip to content

Commit 87f52ed

Browse files
committed
Squiz/Heredoc: move a test to its own file
Move the git conflict/parse error test to its own file. Related to 143
1 parent 77e171e commit 87f52ed

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/Standards/Squiz/Tests/PHP/HeredocUnitTest.1.inc

-15
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,3 @@ My name is "$name". I am printing some $foo->foo.
1010
Now, I am printing some {$foo->bar[1]}.
1111
This should not print a capital 'A': \x41
1212
EOT;
13-
14-
// The following function has a simulated git conflict for testing.
15-
// This is not a merge conflict - it is a valid test case.
16-
// Please do not remove.
17-
function test()
18-
{
19-
$arr = array(
20-
'a' => 'a'
21-
<<<<<<< HEAD
22-
'b' => 'b'
23-
=======
24-
'c' => 'c'
25-
>>>>>>> master
26-
);
27-
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
// Intentional parse error.
4+
// The following function has a simulated git conflict for testing.
5+
// This is not a merge conflict - it is a valid test case.
6+
// Please do not remove.
7+
function test()
8+
{
9+
$arr = array(
10+
'a' => 'a'
11+
<<<<<<< HEAD
12+
'b' => 'b'
13+
=======
14+
'c' => 'c'
15+
>>>>>>> master
16+
);
17+
}

0 commit comments

Comments
 (0)