Skip to content

Commit

Permalink
Squiz/Heredoc: move a test to its own file
Browse files Browse the repository at this point in the history
Move the git conflict/parse error test to its own file.

Related to 143
  • Loading branch information
jrfnl committed Dec 10, 2023
1 parent 77e171e commit 87f52ed
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/Standards/Squiz/Tests/PHP/HeredocUnitTest.1.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,3 @@ My name is "$name". I am printing some $foo->foo.
Now, I am printing some {$foo->bar[1]}.
This should not print a capital 'A': \x41
EOT;

// The following function has a simulated git conflict for testing.
// This is not a merge conflict - it is a valid test case.
// Please do not remove.
function test()
{
$arr = array(
'a' => 'a'
<<<<<<< HEAD
'b' => 'b'
=======
'c' => 'c'
>>>>>>> master
);
}
17 changes: 17 additions & 0 deletions src/Standards/Squiz/Tests/PHP/HeredocUnitTest.2.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

// Intentional parse error.
// The following function has a simulated git conflict for testing.
// This is not a merge conflict - it is a valid test case.
// Please do not remove.
function test()
{
$arr = array(
'a' => 'a'
<<<<<<< HEAD
'b' => 'b'
=======
'c' => 'c'
>>>>>>> master
);
}

0 comments on commit 87f52ed

Please sign in to comment.