@@ -51,22 +51,22 @@ discard block |
||
| 51 | 51 | public function getErrorList($testFile='') |
| 52 | 52 | { |
| 53 | 53 | switch ($testFile) { |
| 54 | - case 'DisallowShortOpenTagUnitTest.1.inc': |
|
| 55 | - return [ |
|
| 56 | - 5 => 1, |
|
| 57 | - 6 => 1, |
|
| 58 | - 7 => 1, |
|
| 59 | - 10 => 1, |
|
| 60 | - ]; |
|
| 61 | - case 'DisallowShortOpenTagUnitTest.2.inc': |
|
| 62 | - return [ |
|
| 63 | - 2 => 1, |
|
| 64 | - 3 => 1, |
|
| 65 | - 4 => 1, |
|
| 66 | - 7 => 1, |
|
| 67 | - ]; |
|
| 68 | - default: |
|
| 69 | - return []; |
|
| 54 | + case 'DisallowShortOpenTagUnitTest.1.inc': |
|
| 55 | + return [ |
|
| 56 | + 5 => 1, |
|
| 57 | + 6 => 1, |
|
| 58 | + 7 => 1, |
|
| 59 | + 10 => 1, |
|
| 60 | + ]; |
|
| 61 | + case 'DisallowShortOpenTagUnitTest.2.inc': |
|
| 62 | + return [ |
|
| 63 | + 2 => 1, |
|
| 64 | + 3 => 1, |
|
| 65 | + 4 => 1, |
|
| 66 | + 7 => 1, |
|
| 67 | + ]; |
|
| 68 | + default: |
|
| 69 | + return []; |
|
| 70 | 70 | }//end switch |
| 71 | 71 | |
| 72 | 72 | }//end getErrorList() |
@@ -85,16 +85,16 @@ discard block |
||
| 85 | 85 | public function getWarningList($testFile='') |
| 86 | 86 | { |
| 87 | 87 | switch ($testFile) { |
| 88 | - case 'DisallowShortOpenTagUnitTest.1.inc': |
|
| 89 | - return []; |
|
| 90 | - case 'DisallowShortOpenTagUnitTest.3.inc': |
|
| 91 | - return [ |
|
| 92 | - 3 => 1, |
|
| 93 | - 6 => 1, |
|
| 94 | - 11 => 1, |
|
| 95 | - ]; |
|
| 96 | - default: |
|
| 97 | - return []; |
|
| 88 | + case 'DisallowShortOpenTagUnitTest.1.inc': |
|
| 89 | + return []; |
|
| 90 | + case 'DisallowShortOpenTagUnitTest.3.inc': |
|
| 91 | + return [ |
|
| 92 | + 3 => 1, |
|
| 93 | + 6 => 1, |
|
| 94 | + 11 => 1, |
|
| 95 | + ]; |
|
| 96 | + default: |
|
| 97 | + return []; |
|
| 98 | 98 | }//end switch |
| 99 | 99 | |
| 100 | 100 | }//end getWarningList() |
@@ -55,22 +55,22 @@ |
||
| 55 | 55 | public function getErrorList($testFile='') |
| 56 | 56 | { |
| 57 | 57 | switch ($testFile) { |
| 58 | - case 'DisallowAlternativePHPTagsUnitTest.1.inc': |
|
| 59 | - return [ |
|
| 60 | - 4 => 1, |
|
| 61 | - 7 => 1, |
|
| 62 | - 8 => 1, |
|
| 63 | - 11 => 1, |
|
| 64 | - ]; |
|
| 65 | - case 'DisallowAlternativePHPTagsUnitTest.2.inc': |
|
| 66 | - return [ |
|
| 67 | - 2 => 1, |
|
| 68 | - 3 => 1, |
|
| 69 | - 4 => 1, |
|
| 70 | - 5 => 1, |
|
| 71 | - ]; |
|
| 72 | - default: |
|
| 73 | - return []; |
|
| 58 | + case 'DisallowAlternativePHPTagsUnitTest.1.inc': |
|
| 59 | + return [ |
|
| 60 | + 4 => 1, |
|
| 61 | + 7 => 1, |
|
| 62 | + 8 => 1, |
|
| 63 | + 11 => 1, |
|
| 64 | + ]; |
|
| 65 | + case 'DisallowAlternativePHPTagsUnitTest.2.inc': |
|
| 66 | + return [ |
|
| 67 | + 2 => 1, |
|
| 68 | + 3 => 1, |
|
| 69 | + 4 => 1, |
|
| 70 | + 5 => 1, |
|
| 71 | + ]; |
|
| 72 | + default: |
|
| 73 | + return []; |
|
| 74 | 74 | }//end switch |
| 75 | 75 | |
| 76 | 76 | }//end getErrorList() |
@@ -22,22 +22,4 @@ |
||
| 22 | 22 | <<<<<<< HEAD |
| 23 | 23 | $a = 1; |
| 24 | 24 | ======= |
| 25 | -$a = 2; |
|
| 26 | ->>>>>>> master |
|
| 27 | - |
|
| 28 | -/* |
|
| 29 | - * The above tests are based on "normal" tokens. |
|
| 30 | - * The below test checks that once the tokenizer breaks down because of |
|
| 31 | - * unexpected merge conflict boundaries - i.e. after the first merge conflict |
|
| 32 | - * opener in non-comment, non-heredoc/nowdoc, non-inline HTML code -, subsequent |
|
| 33 | - * merge conflict boundaries will still be detected correctly. |
|
| 34 | - */ |
|
| 35 | -?> |
|
| 36 | - |
|
| 37 | -<div class="abc"> |
|
| 38 | -<<<<<<< HEAD |
|
| 39 | - <p id="test-this">Testing a merge conflict.</p> |
|
| 40 | -======= |
|
| 41 | - <p id="test-that">Another text string.</p> |
|
| 42 | ->>>>>>> ref/heads/feature-branch |
|
| 43 | -</div> |
|
| 25 | +$a |
|
| 44 | 26 | \ No newline at end of file |
@@ -64,8 +64,4 @@ |
||
| 64 | 64 | <<<<<<< HEAD |
| 65 | 65 | can be problematic. |
| 66 | 66 | EOD; |
| 67 | -$a = 1; |
|
| 68 | -======= |
|
| 69 | -should also be detected. |
|
| 70 | -EOT; |
|
| 71 | ->>>>>>> ref/heads/other-branchname |
|
| 67 | +$a |
|
| 72 | 68 | \ No newline at end of file |
@@ -28,115 +28,115 @@ |
||
| 28 | 28 | public function getErrorList($testFile='GitMergeConflictUnitTest.1.inc') |
| 29 | 29 | { |
| 30 | 30 | switch ($testFile) { |
| 31 | - case 'GitMergeConflictUnitTest.1.inc': |
|
| 32 | - return [ |
|
| 33 | - 26 => 1, |
|
| 34 | - 28 => 1, |
|
| 35 | - 30 => 1, |
|
| 36 | - 45 => 1, |
|
| 37 | - 53 => 1, |
|
| 38 | - 55 => 1, |
|
| 39 | - 59 => 1, |
|
| 40 | - 61 => 1, |
|
| 41 | - ]; |
|
| 42 | - |
|
| 43 | - case 'GitMergeConflictUnitTest.2.inc': |
|
| 44 | - return [ |
|
| 45 | - 4 => 1, |
|
| 46 | - 6 => 1, |
|
| 47 | - 8 => 1, |
|
| 48 | - 14 => 1, |
|
| 49 | - 20 => 1, |
|
| 50 | - 22 => 1, |
|
| 51 | - 26 => 1, |
|
| 52 | - 28 => 1, |
|
| 53 | - 30 => 1, |
|
| 54 | - ]; |
|
| 55 | - |
|
| 56 | - case 'GitMergeConflictUnitTest.3.inc': |
|
| 57 | - return [ |
|
| 58 | - 3 => 1, |
|
| 59 | - 5 => 1, |
|
| 60 | - 7 => 1, |
|
| 61 | - 12 => 1, |
|
| 62 | - 14 => 1, |
|
| 63 | - 16 => 1, |
|
| 64 | - 22 => 1, |
|
| 65 | - 24 => 1, |
|
| 66 | - 26 => 1, |
|
| 67 | - 38 => 1, |
|
| 68 | - 40 => 1, |
|
| 69 | - 42 => 1, |
|
| 70 | - ]; |
|
| 71 | - |
|
| 72 | - case 'GitMergeConflictUnitTest.4.inc': |
|
| 73 | - return [ |
|
| 74 | - 6 => 1, |
|
| 75 | - 8 => 1, |
|
| 76 | - 10 => 1, |
|
| 77 | - 18 => 1, |
|
| 78 | - 22 => 1, |
|
| 79 | - 25 => 1, |
|
| 80 | - 29 => 1, |
|
| 81 | - 34 => 1, |
|
| 82 | - 39 => 1, |
|
| 83 | - 53 => 1, |
|
| 84 | - 55 => 1, |
|
| 85 | - 57 => 1, |
|
| 86 | - 64 => 1, |
|
| 87 | - 68 => 1, |
|
| 88 | - 71 => 1, |
|
| 89 | - ]; |
|
| 90 | - case 'GitMergeConflictUnitTest.5.inc': |
|
| 91 | - case 'GitMergeConflictUnitTest.6.inc': |
|
| 92 | - return [ |
|
| 93 | - 6 => 1, |
|
| 94 | - 8 => 1, |
|
| 95 | - 10 => 1, |
|
| 96 | - 15 => 1, |
|
| 97 | - 28 => 1, |
|
| 98 | - 30 => 1, |
|
| 99 | - 32 => 1, |
|
| 100 | - ]; |
|
| 101 | - |
|
| 102 | - case 'GitMergeConflictUnitTest.1.css': |
|
| 103 | - return [ |
|
| 104 | - 3 => 1, |
|
| 105 | - 5 => 1, |
|
| 106 | - 7 => 1, |
|
| 107 | - 12 => 1, |
|
| 108 | - 14 => 1, |
|
| 109 | - 16 => 1, |
|
| 110 | - 30 => 1, |
|
| 111 | - 32 => 1, |
|
| 112 | - 34 => 1, |
|
| 113 | - ]; |
|
| 114 | - |
|
| 115 | - case 'GitMergeConflictUnitTest.2.css': |
|
| 116 | - return [ |
|
| 117 | - 3 => 1, |
|
| 118 | - 8 => 1, |
|
| 119 | - 13 => 1, |
|
| 120 | - 27 => 1, |
|
| 121 | - 29 => 1, |
|
| 122 | - 31 => 1, |
|
| 123 | - ]; |
|
| 124 | - |
|
| 125 | - case 'GitMergeConflictUnitTest.js': |
|
| 126 | - return [ |
|
| 127 | - 5 => 1, |
|
| 128 | - 7 => 1, |
|
| 129 | - 9 => 1, |
|
| 130 | - 12 => 1, |
|
| 131 | - 14 => 1, |
|
| 132 | - 16 => 1, |
|
| 133 | - 24 => 1, |
|
| 134 | - 30 => 1, |
|
| 135 | - 32 => 1, |
|
| 136 | - ]; |
|
| 137 | - |
|
| 138 | - default: |
|
| 139 | - return []; |
|
| 31 | + case 'GitMergeConflictUnitTest.1.inc': |
|
| 32 | + return [ |
|
| 33 | + 26 => 1, |
|
| 34 | + 28 => 1, |
|
| 35 | + 30 => 1, |
|
| 36 | + 45 => 1, |
|
| 37 | + 53 => 1, |
|
| 38 | + 55 => 1, |
|
| 39 | + 59 => 1, |
|
| 40 | + 61 => 1, |
|
| 41 | + ]; |
|
| 42 | + |
|
| 43 | + case 'GitMergeConflictUnitTest.2.inc': |
|
| 44 | + return [ |
|
| 45 | + 4 => 1, |
|
| 46 | + 6 => 1, |
|
| 47 | + 8 => 1, |
|
| 48 | + 14 => 1, |
|
| 49 | + 20 => 1, |
|
| 50 | + 22 => 1, |
|
| 51 | + 26 => 1, |
|
| 52 | + 28 => 1, |
|
| 53 | + 30 => 1, |
|
| 54 | + ]; |
|
| 55 | + |
|
| 56 | + case 'GitMergeConflictUnitTest.3.inc': |
|
| 57 | + return [ |
|
| 58 | + 3 => 1, |
|
| 59 | + 5 => 1, |
|
| 60 | + 7 => 1, |
|
| 61 | + 12 => 1, |
|
| 62 | + 14 => 1, |
|
| 63 | + 16 => 1, |
|
| 64 | + 22 => 1, |
|
| 65 | + 24 => 1, |
|
| 66 | + 26 => 1, |
|
| 67 | + 38 => 1, |
|
| 68 | + 40 => 1, |
|
| 69 | + 42 => 1, |
|
| 70 | + ]; |
|
| 71 | + |
|
| 72 | + case 'GitMergeConflictUnitTest.4.inc': |
|
| 73 | + return [ |
|
| 74 | + 6 => 1, |
|
| 75 | + 8 => 1, |
|
| 76 | + 10 => 1, |
|
| 77 | + 18 => 1, |
|
| 78 | + 22 => 1, |
|
| 79 | + 25 => 1, |
|
| 80 | + 29 => 1, |
|
| 81 | + 34 => 1, |
|
| 82 | + 39 => 1, |
|
| 83 | + 53 => 1, |
|
| 84 | + 55 => 1, |
|
| 85 | + 57 => 1, |
|
| 86 | + 64 => 1, |
|
| 87 | + 68 => 1, |
|
| 88 | + 71 => 1, |
|
| 89 | + ]; |
|
| 90 | + case 'GitMergeConflictUnitTest.5.inc': |
|
| 91 | + case 'GitMergeConflictUnitTest.6.inc': |
|
| 92 | + return [ |
|
| 93 | + 6 => 1, |
|
| 94 | + 8 => 1, |
|
| 95 | + 10 => 1, |
|
| 96 | + 15 => 1, |
|
| 97 | + 28 => 1, |
|
| 98 | + 30 => 1, |
|
| 99 | + 32 => 1, |
|
| 100 | + ]; |
|
| 101 | + |
|
| 102 | + case 'GitMergeConflictUnitTest.1.css': |
|
| 103 | + return [ |
|
| 104 | + 3 => 1, |
|
| 105 | + 5 => 1, |
|
| 106 | + 7 => 1, |
|
| 107 | + 12 => 1, |
|
| 108 | + 14 => 1, |
|
| 109 | + 16 => 1, |
|
| 110 | + 30 => 1, |
|
| 111 | + 32 => 1, |
|
| 112 | + 34 => 1, |
|
| 113 | + ]; |
|
| 114 | + |
|
| 115 | + case 'GitMergeConflictUnitTest.2.css': |
|
| 116 | + return [ |
|
| 117 | + 3 => 1, |
|
| 118 | + 8 => 1, |
|
| 119 | + 13 => 1, |
|
| 120 | + 27 => 1, |
|
| 121 | + 29 => 1, |
|
| 122 | + 31 => 1, |
|
| 123 | + ]; |
|
| 124 | + |
|
| 125 | + case 'GitMergeConflictUnitTest.js': |
|
| 126 | + return [ |
|
| 127 | + 5 => 1, |
|
| 128 | + 7 => 1, |
|
| 129 | + 9 => 1, |
|
| 130 | + 12 => 1, |
|
| 131 | + 14 => 1, |
|
| 132 | + 16 => 1, |
|
| 133 | + 24 => 1, |
|
| 134 | + 30 => 1, |
|
| 135 | + 32 => 1, |
|
| 136 | + ]; |
|
| 137 | + |
|
| 138 | + default: |
|
| 139 | + return []; |
|
| 140 | 140 | }//end switch |
| 141 | 141 | |
| 142 | 142 | }//end getErrorList() |
@@ -22,13 +22,4 @@ |
||
| 22 | 22 | * merge conflict boundaries will still be detected correctly. |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | -$string = |
|
| 26 | - <<<"EOD" |
|
| 27 | - Merge conflicts in PHP 7.3 indented heredocs |
|
| 28 | -<<<<<<< HEAD |
|
| 29 | - can be problematic. |
|
| 30 | -======= |
|
| 31 | - should also be detected. |
|
| 32 | ->>>>>>> ref/heads/other-branchname |
|
| 33 | - And now they are. |
|
| 34 | - EOD; |
|
| 25 | +$string |
|
| 35 | 26 | \ No newline at end of file |
@@ -24,8 +24,3 @@ |
||
| 24 | 24 | |
| 25 | 25 | // Comment |
| 26 | 26 | <<<<<<< HEAD |
| 27 | -// Second comment line. NOTE: The above opener breaks the tokenizer. |
|
| 28 | -======= |
|
| 29 | -// New second comment line |
|
| 30 | ->>>>>>> master |
|
| 31 | -// Third comment line |
|
@@ -22,13 +22,4 @@ |
||
| 22 | 22 | * merge conflict boundaries will still be detected correctly. |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | -$string = |
|
| 26 | -<<<'EOD' |
|
| 27 | -can be problematic. |
|
| 28 | -<<<<<<< HEAD |
|
| 29 | -were previously not detected. |
|
| 30 | -======= |
|
| 31 | -should also be detected. |
|
| 32 | ->>>>>>> ref/heads/other-branchname |
|
| 33 | -And now they are. |
|
| 34 | -EOD; |
|
| 25 | +$string |
|
| 35 | 26 | \ No newline at end of file |
@@ -57,5 +57,4 @@ |
||
| 57 | 57 | |
| 58 | 58 | // Test that stray boundaries, i.e. an opener without closer and such, are detected. |
| 59 | 59 | <<<<<<< HEAD |
| 60 | -$a = 1; |
|
| 61 | -======= |
|
| 60 | +$a |
|
| 62 | 61 | \ No newline at end of file |