Passed
Pull Request — master (#5)
by
unknown
08:17
created
php_codesniffer/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php 1 patch
Switch Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -43,21 +43,21 @@  discard block
 block discarded – undo
43 43
     public function getErrorList($testFile='')
44 44
     {
45 45
         switch ($testFile) {
46
-        case 'LineLengthUnitTest.1.inc':
47
-            return [
48
-                31 => 1,
49
-                34 => 1,
50
-                45 => 1,
51
-                82 => 1,
52
-            ];
53
-            break;
54
-        case 'LineLengthUnitTest.2.inc':
55
-        case 'LineLengthUnitTest.3.inc':
56
-            return [7 => 1];
57
-            break;
58
-        default:
59
-            return [];
60
-            break;
46
+            case 'LineLengthUnitTest.1.inc':
47
+                return [
48
+                    31 => 1,
49
+                    34 => 1,
50
+                    45 => 1,
51
+                    82 => 1,
52
+                ];
53
+                break;
54
+            case 'LineLengthUnitTest.2.inc':
55
+            case 'LineLengthUnitTest.3.inc':
56
+                return [7 => 1];
57
+                break;
58
+            default:
59
+                return [];
60
+                break;
61 61
         }//end switch
62 62
 
63 63
     }//end getErrorList()
@@ -76,33 +76,33 @@  discard block
 block discarded – undo
76 76
     public function getWarningList($testFile='')
77 77
     {
78 78
         switch ($testFile) {
79
-        case 'LineLengthUnitTest.1.inc':
80
-            return [
81
-                9  => 1,
82
-                15 => 1,
83
-                21 => 1,
84
-                24 => 1,
85
-                29 => 1,
86
-                37 => 1,
87
-                63 => 1,
88
-                73 => 1,
89
-                75 => 1,
90
-                84 => 1,
91
-            ];
92
-            break;
93
-        case 'LineLengthUnitTest.2.inc':
94
-        case 'LineLengthUnitTest.3.inc':
95
-            return [6 => 1];
96
-            break;
97
-        case 'LineLengthUnitTest.4.inc':
98
-            return [
99
-                10 => 1,
100
-                14 => 1,
101
-            ];
102
-            break;
103
-        default:
104
-            return [];
105
-            break;
79
+            case 'LineLengthUnitTest.1.inc':
80
+                return [
81
+                    9  => 1,
82
+                    15 => 1,
83
+                    21 => 1,
84
+                    24 => 1,
85
+                    29 => 1,
86
+                    37 => 1,
87
+                    63 => 1,
88
+                    73 => 1,
89
+                    75 => 1,
90
+                    84 => 1,
91
+                ];
92
+                break;
93
+            case 'LineLengthUnitTest.2.inc':
94
+            case 'LineLengthUnitTest.3.inc':
95
+                return [6 => 1];
96
+                break;
97
+            case 'LineLengthUnitTest.4.inc':
98
+                return [
99
+                    10 => 1,
100
+                    14 => 1,
101
+                ];
102
+                break;
103
+            default:
104
+                return [];
105
+                break;
106 106
         }//end switch
107 107
 
108 108
     }//end getWarningList()
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.6.inc 1 patch
Switch Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,1 @@
 block discarded – undo
1 1
 <?php
2
-/** Why me?
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.4.inc 1 patch
Switch Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,1 @@
 block discarded – undo
1 1
 <?php
2
-/** Why me?
3 2
\ No newline at end of file
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@
 block discarded – undo
28 28
     public function getErrorList($testFile='')
29 29
     {
30 30
         switch ($testFile) {
31
-        case 'EndFileNoNewlineUnitTest.1.inc':
32
-        case 'EndFileNoNewlineUnitTest.1.css':
33
-        case 'EndFileNoNewlineUnitTest.1.js':
34
-        case 'EndFileNoNewlineUnitTest.2.inc':
35
-            return [3 => 1];
36
-        case 'EndFileNoNewlineUnitTest.2.css':
37
-        case 'EndFileNoNewlineUnitTest.2.js':
38
-        case 'EndFileNoNewlineUnitTest.6.inc':
39
-            return [2 => 1];
40
-        default:
41
-            return [];
31
+            case 'EndFileNoNewlineUnitTest.1.inc':
32
+            case 'EndFileNoNewlineUnitTest.1.css':
33
+            case 'EndFileNoNewlineUnitTest.1.js':
34
+            case 'EndFileNoNewlineUnitTest.2.inc':
35
+                return [3 => 1];
36
+            case 'EndFileNoNewlineUnitTest.2.css':
37
+            case 'EndFileNoNewlineUnitTest.2.js':
38
+            case 'EndFileNoNewlineUnitTest.6.inc':
39
+                return [2 => 1];
40
+            default:
41
+                return [];
42 42
         }//end switch
43 43
 
44 44
     }//end getErrorList()
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,18 +28,18 @@
 block discarded – undo
28 28
     public function getErrorList($testFile='')
29 29
     {
30 30
         switch ($testFile) {
31
-        case 'InlineHTMLUnitTest.3.inc':
32
-            return [4 => 1];
33
-            break;
34
-        case 'InlineHTMLUnitTest.4.inc':
35
-            return [1 => 1];
36
-            break;
37
-        case 'InlineHTMLUnitTest.7.inc':
38
-            return [1 => 1];
39
-            break;
40
-        default:
41
-            return [];
42
-            break;
31
+            case 'InlineHTMLUnitTest.3.inc':
32
+                return [4 => 1];
33
+                break;
34
+            case 'InlineHTMLUnitTest.4.inc':
35
+                return [1 => 1];
36
+                break;
37
+            case 'InlineHTMLUnitTest.7.inc':
38
+                return [1 => 1];
39
+                break;
40
+            default:
41
+                return [];
42
+                break;
43 43
         }//end switch
44 44
 
45 45
     }//end getErrorList()
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@
 block discarded – undo
43 43
     public function getErrorList($testFile='')
44 44
     {
45 45
         switch ($testFile) {
46
-        case 'ExecutableFileUnitTest.2.inc':
47
-            return [1 => 1];
48
-        default:
49
-            return [];
46
+            case 'ExecutableFileUnitTest.2.inc':
47
+                return [1 => 1];
48
+            default:
49
+                return [];
50 50
         }//end switch
51 51
 
52 52
     }//end getErrorList()
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.6.inc 1 patch
Switch Indentation   +1 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,13 +22,4 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc 1 patch
Switch Indentation   +1 added lines, -19 removed lines patch added patch discarded remove patch
@@ -22,22 +22,4 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc 1 patch
Switch Indentation   -5 removed lines patch added patch discarded remove patch
@@ -24,8 +24,3 @@
 block discarded – undo
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
Please login to merge, or discard this patch.