gravityview / GravityView

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php

Switch Indentation +61 added lines, -61 removed lines

@@ -28,69 +28,69 @@
     public function getErrorList($testFile='InlineControlStructureUnitTest.1.inc')
     {
         switch ($testFile) {
-        case 'InlineControlStructureUnitTest.1.inc':
-            return [
-                3   => 1,
-                7   => 1,
-                11  => 1,
-                13  => 1,
-                15  => 1,
-                17  => 1,
-                23  => 1,
-                42  => 1,
-                43  => 1,
-                45  => 1,
-                46  => 1,
-                49  => 1,
-                62  => 1,
-                66  => 1,
-                78  => 1,
-                120 => 1,
-                128 => 1,
-                134 => 1,
-                142 => 1,
-                143 => 1,
-                144 => 1,
-                150 => 1,
-                158 => 1,
-                159 => 1,
-                162 => 1,
-                163 => 1,
-                164 => 1,
-                167 => 1,
-                168 => 1,
-                170 => 1,
-                178 => 1,
-                185 => 1,
-                188 => 2,
-                191 => 1,
-                195 => 1,
-                198 => 1,
-                206 => 1,
-                222 => 1,
-                226 => 1,
-                228 => 1,
-                230 => 1,
-                232 => 1,
-                235 => 1,
-                236 => 1,
-                238 => 1,
-            ];
+        	case 'InlineControlStructureUnitTest.1.inc':
+            	return [
+                	3   => 1,
+                	7   => 1,
+                	11  => 1,
+                	13  => 1,
+                	15  => 1,
+                	17  => 1,
+                	23  => 1,
+                	42  => 1,
+                	43  => 1,
+                	45  => 1,
+                	46  => 1,
+                	49  => 1,
+                	62  => 1,
+                	66  => 1,
+                	78  => 1,
+                	120 => 1,
+                	128 => 1,
+                	134 => 1,
+                	142 => 1,
+                	143 => 1,
+                	144 => 1,
+                	150 => 1,
+                	158 => 1,
+                	159 => 1,
+                	162 => 1,
+                	163 => 1,
+                	164 => 1,
+                	167 => 1,
+                	168 => 1,
+                	170 => 1,
+                	178 => 1,
+                	185 => 1,
+                	188 => 2,
+                	191 => 1,
+                	195 => 1,
+                	198 => 1,
+                	206 => 1,
+                	222 => 1,
+                	226 => 1,
+                	228 => 1,
+                	230 => 1,
+                	232 => 1,
+                	235 => 1,
+                	236 => 1,
+                	238 => 1,
+            	];
 
-        case 'InlineControlStructureUnitTest.js':
-            return [
-                3  => 1,
-                7  => 1,
-                11 => 1,
-                13 => 1,
-                15 => 1,
-                21 => 1,
-                27 => 1,
-                30 => 1,
-            ];
+        	case 'InlineControlStructureUnitTest.js':
+            	return [
+                	3  => 1,
+                	7  => 1,
+                	11 => 1,
+                	13 => 1,
+                	15 => 1,
+                	21 => 1,
+                	27 => 1,
+                	30 => 1,
+            	];
 
-        default:
-            return [];
+        	default:
+            	return [];
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php

Switch Indentation +48 added lines, -48 removed lines

@@ -47,54 +47,54 @@
     public function getErrorList($testFile='DisallowSpaceIndentUnitTest.1.inc')
     {
         switch ($testFile) {
-        case 'DisallowSpaceIndentUnitTest.1.inc':
-        case 'DisallowSpaceIndentUnitTest.2.inc':
-            return [
-                5   => 1,
-                9   => 1,
-                15  => 1,
-                22  => 1,
-                24  => 1,
-                30  => 1,
-                35  => 1,
-                50  => 1,
-                55  => 1,
-                57  => 1,
-                58  => 1,
-                59  => 1,
-                60  => 1,
-                65  => 1,
-                66  => 1,
-                67  => 1,
-                68  => 1,
-                69  => 1,
-                70  => 1,
-                73  => 1,
-                77  => 1,
-                81  => 1,
-                104 => 1,
-                105 => 1,
-                106 => 1,
-                107 => 1,
-                108 => 1,
-                110 => 1,
-                111 => 1,
-                112 => 1,
-                114 => 1,
-                115 => 1,
-                117 => 1,
-                118 => 1,
-            ];
-            break;
-        case 'DisallowSpaceIndentUnitTest.js':
-            return [3 => 1];
-            break;
-        case 'DisallowSpaceIndentUnitTest.css':
-            return [2 => 1];
-            break;
-        default:
-            return [];
-            break;
+        	case 'DisallowSpaceIndentUnitTest.1.inc':
+        	case 'DisallowSpaceIndentUnitTest.2.inc':
+            	return [
+                	5   => 1,
+                	9   => 1,
+                	15  => 1,
+                	22  => 1,
+                	24  => 1,
+                	30  => 1,
+                	35  => 1,
+                	50  => 1,
+                	55  => 1,
+                	57  => 1,
+                	58  => 1,
+                	59  => 1,
+                	60  => 1,
+                	65  => 1,
+                	66  => 1,
+                	67  => 1,
+                	68  => 1,
+                	69  => 1,
+                	70  => 1,
+                	73  => 1,
+                	77  => 1,
+                	81  => 1,
+                	104 => 1,
+                	105 => 1,
+                	106 => 1,
+                	107 => 1,
+                	108 => 1,
+                	110 => 1,
+                	111 => 1,
+                	112 => 1,
+                	114 => 1,
+                	115 => 1,
+                	117 => 1,
+                	118 => 1,
+            	];
+            	break;
+        	case 'DisallowSpaceIndentUnitTest.js':
+            	return [3 => 1];
+            	break;
+        	case 'DisallowSpaceIndentUnitTest.css':
+            	return [2 => 1];
+            	break;
+        	default:
+            	return [];
+            	break;
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

Switch Indentation +79 added lines, -79 removed lines

@@ -254,11 +254,11 @@ 
 }
 
 switch ($foo) {
-	case 1:
-		switch ($bar) {
+		case 1:
+			switch ($bar) {
 			default:
 				echo $string{1};
-		}
+			}
 	break;
 }
 
@@ -274,25 +274,25 @@ 
 }
 
 switch ($foo) {
-	case 1:
-		switch ($bar) {
-		default:
-			if ($something) {
-				echo $string{1};
-			} else if ($else) {
-				switch ($else) {
+		case 1:
+			switch ($bar) {
 				default:
+					if ($something) {
+						echo $string{1};
+					} else if ($else) {
+						switch ($else) {
+							default:
+						}
 				}
-			}
 		}
 	break;
 }
 
 switch ($name) {
-	case "1":
-	case "2":
-	case "3":
-		return true;
+		case "1":
+		case "2":
+		case "3":
+			return true;
 }
 
 switch ($name) {
@@ -314,16 +314,16 @@ 
 }
 
 switch ($name) {
-	case "1":
-		switch ($name2) {
+		case "1":
+			switch ($name2) {
 			case "1":
 			break;
 			case "2":
 			break;
-		}
-	break;
-	case "2":
+			}
 	break;
+		case "2":
+		break;
 }
 
 switch (true) {
@@ -339,17 +339,17 @@ 
 }
 
 switch (true) {
-	case true: {
-		echo 'hi';
-	}
-	// No break here.
-	case false:
-	case true:
-	case null:{
-	echo 'hi';
+		case true: {
+			echo 'hi';
+		}
+		// No break here.
+		case false:
+		case true:
+		case null:{
 		echo 'hi';
-	}
-	break;
+			echo 'hi';
+		}
+		break;
 }
 
 switch (true) {
@@ -910,29 +910,29 @@ 
 }
 
 switch ($foo) {
-	case 1:
-		return array();
-	case 2:
-		return '';
-	case 3:
-		return $function();
-	case 4:
-		return $functionCall($param[0]);
-	case 5:
-		return array() + array(); // Array Merge
-	case 6:
-		// String connect
-		return $functionReturningString('') . $functionReturningString(array());
-	case 7:
-		return functionCall(
-			$withMultiLineParam[0],
-			array(),
-			$functionReturningString(
-				$withMultiLineParam[1]
-			)
-		);
-	case 8:
-		return $param[0][0];
+		case 1:
+			return array();
+		case 2:
+			return '';
+		case 3:
+			return $function();
+		case 4:
+			return $functionCall($param[0]);
+		case 5:
+			return array() + array(); // Array Merge
+		case 6:
+			// String connect
+			return $functionReturningString('') . $functionReturningString(array());
+		case 7:
+			return functionCall(
+				$withMultiLineParam[0],
+				array(),
+				$functionReturningString(
+					$withMultiLineParam[1]
+				)
+			);
+		case 8:
+			return $param[0][0];
 }
 
 class Test {
@@ -948,10 +948,10 @@ 
 }
 
 switch ($x) {
-	case 1:
-		return [1];
-	default:
-		return [2];
+		case 1:
+			return [1];
+		default:
+			return [2];
 }
 
 switch ($foo) {
@@ -1024,16 +1024,16 @@ 
 }
 
 switch ($parameter) {
-	case null:
-		return [
-			'foo' => in_array(
-				'foo',
-				[]
-			),
-		];
+		case null:
+			return [
+				'foo' => in_array(
+					'foo',
+					[]
+				),
+			];
 
-	default:
-		return [];
+		default:
+			return [];
 }
 
 class SomeClass
@@ -1183,11 +1183,11 @@ 
 }
 
 switch ($a) {
-	case 0:
-		$a = function () {
-		};
-	case 1:
-		break;
+		case 0:
+			$a = function () {
+			};
+		case 1:
+			break;
 }
 
 class Test
@@ -1395,14 +1395,14 @@ 
 
 switch($foo)
 {
-	case 1:
-		$value = 1; break;
-	case 2:
-		if ($bar) {
-			break;
-		}
-	default:
-		$value = 0;
+		case 1:
+			$value = 1; break;
+		case 2:
+			if ($bar) {
+				break;
+			}
+		default:
+			$value = 0;
 }
 
 ?>

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

Switch Indentation +82 added lines, -82 removed lines

@@ -254,11 +254,11 @@ 
 }
 
 switch ($foo) {
-    case 1:
-        switch ($bar) {
+    	case 1:
+        	switch ($bar) {
             default:
                 echo $string{1};
-        }
+        	}
     break;
 }
 
@@ -274,25 +274,25 @@ 
 }
 
 switch ($foo) {
-    case 1:
-        switch ($bar) {
-        default:
-            if ($something) {
-                echo $string{1};
-            } else if ($else) {
-                switch ($else) {
-                default:
-                }
-            }
+    	case 1:
+        	switch ($bar) {
+        		default:
+            		if ($something) {
+                		echo $string{1};
+            		} else if ($else) {
+                		switch ($else) {
+                			default:
+                		}
+            	}
         }
     break;
 }
 
 switch ($name) {
-    case "1":
-    case "2":
-    case "3":
-        return true;
+    	case "1":
+    	case "2":
+    	case "3":
+        	return true;
 }
 
 switch ($name) {
@@ -314,16 +314,16 @@ 
 }
 
 switch ($name) {
-    case "1":
-        switch ($name2) {
+    	case "1":
+        	switch ($name2) {
             case "1":
             break;
             case "2":
             break;
-        }
-    break;
-    case "2":
+        	}
     break;
+    	case "2":
+    	break;
 }
 
 switch (true) {
@@ -339,17 +339,17 @@ 
 }
 
 switch (true) {
-    case true: {
-        echo 'hi';
-    }
-    // No break here.
-    case false:
-    case true:
-    case null:{
-    echo 'hi';
-        echo 'hi';
-    }
-    break;
+    	case true: {
+        	echo 'hi';
+    	}
+    	// No break here.
+    	case false:
+    	case true:
+    	case null:{
+    	echo 'hi';
+        	echo 'hi';
+    	}
+    	break;
 }
 
 switch (true) {
@@ -910,29 +910,29 @@ 
 }
 
 switch ($foo) {
-    case 1:
-        return array();
-    case 2:
-        return '';
-    case 3:
-        return $function();
-    case 4:
-        return $functionCall($param[0]);
-    case 5:
-        return array() + array(); // Array Merge
-    case 6:
-        // String connect
-        return $functionReturningString('') . $functionReturningString(array());
-    case 7:
-        return functionCall(
-            $withMultiLineParam[0],
-            array(),
-            $functionReturningString(
-                $withMultiLineParam[1]
-            )
-        );
-    case 8:
-        return $param[0][0];
+    	case 1:
+        	return array();
+    	case 2:
+        	return '';
+    	case 3:
+        	return $function();
+    	case 4:
+        	return $functionCall($param[0]);
+    	case 5:
+        	return array() + array(); // Array Merge
+    	case 6:
+        	// String connect
+        	return $functionReturningString('') . $functionReturningString(array());
+    	case 7:
+        	return functionCall(
+            	$withMultiLineParam[0],
+            	array(),
+            	$functionReturningString(
+                	$withMultiLineParam[1]
+            	)
+        	);
+    	case 8:
+        	return $param[0][0];
 }
 
 class Test {
@@ -948,10 +948,10 @@ 
 }
 
 switch ($x) {
-    case 1:
-        return [1];
-    default:
-        return [2];
+    	case 1:
+        	return [1];
+    	default:
+        	return [2];
 }
 
 switch ($foo) {
@@ -1024,16 +1024,16 @@ 
 }
 
 switch ($parameter) {
-    case null:
-        return [
-            'foo' => in_array(
-                'foo',
-                []
-            ),
-        ];
+    	case null:
+        	return [
+            	'foo' => in_array(
+                	'foo',
+                	[]
+            	),
+        	];
 
-    default:
-        return [];
+    	default:
+        	return [];
 }
 
 class SomeClass
@@ -1183,11 +1183,11 @@ 
 }
 
 switch ($a) {
-    case 0:
-        $a = function () {
-        };
-    case 1:
-        break;
+    	case 0:
+        	$a = function () {
+        	};
+    	case 1:
+        	break;
 }
 
 class Test
@@ -1395,14 +1395,14 @@ 
 
 switch($foo)
 {
-    case 1:
-        $value = 1; break;
-    case 2:
-        if ($bar) {
-            break;
-        }
-    default:
-        $value = 0;
+    	case 1:
+        	$value = 1; break;
+    	case 2:
+        	if ($bar) {
+            	break;
+        	}
+    	default:
+        	$value = 0;
 }
 
 ?>

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php

Switch Indentation +14 added lines, -14 removed lines

@@ -28,21 +28,21 @@
     public function getErrorList($testFile='IncrementDecrementSpacingUnitTest.inc')
     {
         switch ($testFile) {
-        case 'IncrementDecrementSpacingUnitTest.inc':
-        case 'IncrementDecrementSpacingUnitTest.js':
-            return [
-                5  => 1,
-                6  => 1,
-                8  => 1,
-                10 => 1,
-                13 => 1,
-                14 => 1,
-                16 => 1,
-                17 => 1,
-            ];
+        	case 'IncrementDecrementSpacingUnitTest.inc':
+        	case 'IncrementDecrementSpacingUnitTest.js':
+            	return [
+                	5  => 1,
+                	6  => 1,
+                	8  => 1,
+                	10 => 1,
+                	13 => 1,
+                	14 => 1,
+                	16 => 1,
+                	17 => 1,
+            	];
 
-        default:
-            return [];
+        	default:
+            	return [];
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php

Switch Indentation +57 added lines, -57 removed lines

@@ -43,63 +43,63 @@
     public function getErrorList($testFile='DisallowTabIndentUnitTest.inc')
     {
         switch ($testFile) {
-        case 'DisallowTabIndentUnitTest.inc':
-            return [
-                5  => 2,
-                9  => 1,
-                15 => 1,
-                20 => 2,
-                21 => 1,
-                22 => 2,
-                23 => 1,
-                24 => 2,
-                31 => 1,
-                32 => 2,
-                33 => 2,
-                41 => 1,
-                42 => 1,
-                43 => 1,
-                44 => 1,
-                45 => 1,
-                46 => 1,
-                47 => 1,
-                48 => 1,
-                54 => 1,
-                55 => 1,
-                56 => 1,
-                57 => 1,
-                58 => 1,
-                59 => 1,
-                79 => 1,
-                80 => 1,
-                81 => 1,
-                82 => 1,
-                83 => 1,
-                85 => 1,
-                86 => 1,
-                87 => 1,
-                89 => 1,
-                90 => 1,
-                92 => 1,
-                93 => 1,
-            ];
-            break;
-        case 'DisallowTabIndentUnitTest.js':
-            return [
-                3 => 1,
-                5 => 1,
-                6 => 1,
-            ];
-            break;
-        case 'DisallowTabIndentUnitTest.css':
-            return [
-                1 => 1,
-                2 => 1,
-            ];
-            break;
-        default:
-            return [];
-            break;
+        	case 'DisallowTabIndentUnitTest.inc':
+            	return [
+                	5  => 2,
+                	9  => 1,
+                	15 => 1,
+                	20 => 2,
+                	21 => 1,
+                	22 => 2,
+                	23 => 1,
+                	24 => 2,
+                	31 => 1,
+                	32 => 2,
+                	33 => 2,
+                	41 => 1,
+                	42 => 1,
+                	43 => 1,
+                	44 => 1,
+                	45 => 1,
+                	46 => 1,
+                	47 => 1,
+                	48 => 1,
+                	54 => 1,
+                	55 => 1,
+                	56 => 1,
+                	57 => 1,
+                	58 => 1,
+                	59 => 1,
+                	79 => 1,
+                	80 => 1,
+                	81 => 1,
+                	82 => 1,
+                	83 => 1,
+                	85 => 1,
+                	86 => 1,
+                	87 => 1,
+                	89 => 1,
+                	90 => 1,
+                	92 => 1,
+                	93 => 1,
+            	];
+            	break;
+        	case 'DisallowTabIndentUnitTest.js':
+            	return [
+                	3 => 1,
+                	5 => 1,
+                	6 => 1,
+            	];
+            	break;
+        	case 'DisallowTabIndentUnitTest.css':
+            	return [
+                	1 => 1,
+                	2 => 1,
+            	];
+            	break;
+        	default:
+            	return [];
+            	break;
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php

Switch Indentation +16 added lines, -16 removed lines

@@ -28,22 +28,22 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'DisallowLongArraySyntaxUnitTest.1.inc':
-            return [
-                2  => 1,
-                4  => 1,
-                6  => 1,
-                7  => 1,
-                12 => 1,
-                13 => 1,
-            ];
-        case 'DisallowLongArraySyntaxUnitTest.2.inc':
-            return [
-                2 => 1,
-                9 => 1,
-            ];
-        default:
-            return [];
+        	case 'DisallowLongArraySyntaxUnitTest.1.inc':
+            	return [
+                	2  => 1,
+                	4  => 1,
+                	6  => 1,
+                	7  => 1,
+                	12 => 1,
+                	13 => 1,
+            	];
+        	case 'DisallowLongArraySyntaxUnitTest.2.inc':
+            	return [
+                	2 => 1,
+                	9 => 1,
+            	];
+        	default:
+            	return [];
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc

Switch Indentation -6 removed lines

@@ -9,9 +9,3 @@
         $arr = array(
             'a' => 'a',
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php

Switch Indentation +130 added lines, -130 removed lines

@@ -77,141 +77,141 @@
             if ($phpcsFile->tokenizerType !== 'JS') {
                 switch ($tokens[$i]['code']) {
                 // Check for first non-comment, non-heredoc/nowdoc, non-inline HTML merge conflict opener.
-                case T_SL:
-                    if (isset($tokens[($i + 1)], $tokens[($i + 2)]) !== false
-                        && $tokens[($i + 1)]['code'] === T_SL
-                        && $tokens[($i + 2)]['code'] === T_STRING
-                        && trim($tokens[($i + 2)]['content']) === '<<< HEAD'
-                    ) {
-                        $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
-                        $i += 2;
-                    }
-                    break;
-
-                // Check for merge conflict closer which was opened in a heredoc/nowdoc.
-                case T_SR:
-                    if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)]) !== false
-                        && $tokens[($i + 1)]['code'] === T_SR
-                        && $tokens[($i + 2)]['code'] === T_SR
-                        && $tokens[($i + 3)]['code'] === T_GREATER_THAN
-                        && $tokens[($i + 4)]['code'] === T_WHITESPACE
-                        && $tokens[($i + 4)]['content'] === ' '
-                    ) {
-                        $phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
-                        $i += 4;
-                    }
-                    break;
-
-                // Check for merge conflict delimiter which opened in a CSS comment and closed outside.
-                case T_IS_IDENTICAL:
-                    if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false
-                        && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL
-                        && $tokens[($i + 2)]['code'] === T_EQUAL
-                        && $tokens[($i + 3)]['code'] === T_WHITESPACE
-                        && $tokens[($i + 3)]['content'] === "\n"
-                    ) {
-                        $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                        $i += 3;
-                    }
-                    break;
-
-                // - Check for delimiters and closers.
-                // - Inspect heredoc/nowdoc content, comments and inline HTML.
-                // - Check for subsequent merge conflict openers after the first broke the tokenizer.
-                case T_ENCAPSED_AND_WHITESPACE:
-                case T_COMMENT:
-                case T_DOC_COMMENT_STRING:
-                case T_INLINE_HTML:
-                case T_HEREDOC:
-                case T_NOWDOC:
-                    if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') {
-                        $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
-                        break;
-                    } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') {
-                        $phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
-                        break;
-                    }
-
-                    if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
-                        if ($tokens[$i]['content'] === '======='
-                            && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE
-                        ) {
-                            $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                            break;
-                        }
-                    } else {
-                        if ($tokens[$i]['content'] === "=======\n") {
-                            $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                        }
-                    }
-                    break;
+                	case T_SL:
+                    	if (isset($tokens[($i + 1)], $tokens[($i + 2)]) !== false
+                        	&& $tokens[($i + 1)]['code'] === T_SL
+                        	&& $tokens[($i + 2)]['code'] === T_STRING
+                        	&& trim($tokens[($i + 2)]['content']) === '<<< HEAD'
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
+                        	$i += 2;
+                    	}
+                    	break;
+
+                	// Check for merge conflict closer which was opened in a heredoc/nowdoc.
+                	case T_SR:
+                    	if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)]) !== false
+                        	&& $tokens[($i + 1)]['code'] === T_SR
+                        	&& $tokens[($i + 2)]['code'] === T_SR
+                        	&& $tokens[($i + 3)]['code'] === T_GREATER_THAN
+                        	&& $tokens[($i + 4)]['code'] === T_WHITESPACE
+                        	&& $tokens[($i + 4)]['content'] === ' '
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
+                        	$i += 4;
+                    	}
+                    	break;
+
+                	// Check for merge conflict delimiter which opened in a CSS comment and closed outside.
+                	case T_IS_IDENTICAL:
+                    	if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false
+                        	&& $tokens[($i + 1)]['code'] === T_IS_IDENTICAL
+                        	&& $tokens[($i + 2)]['code'] === T_EQUAL
+                        	&& $tokens[($i + 3)]['code'] === T_WHITESPACE
+                        	&& $tokens[($i + 3)]['content'] === "\n"
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                        	$i += 3;
+                    	}
+                    	break;
+
+                	// - Check for delimiters and closers.
+                	// - Inspect heredoc/nowdoc content, comments and inline HTML.
+                	// - Check for subsequent merge conflict openers after the first broke the tokenizer.
+                	case T_ENCAPSED_AND_WHITESPACE:
+                	case T_COMMENT:
+                	case T_DOC_COMMENT_STRING:
+                	case T_INLINE_HTML:
+                	case T_HEREDOC:
+                	case T_NOWDOC:
+                    	if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') {
+                        	$phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
+                        	break;
+                    	} else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') {
+                        	$phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
+                        	break;
+                    	}
+
+                    	if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
+                        	if ($tokens[$i]['content'] === '======='
+                            	&& $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE
+                        	) {
+                            	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                            	break;
+                        	}
+                    	} else {
+                        	if ($tokens[$i]['content'] === "=======\n") {
+                            	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                        	}
+                    	}
+                    	break;
                 }//end switch
             } else {
                 // Javascript file.
                 switch ($tokens[$i]['code']) {
                 // Merge conflict opener.
-                case T_SL:
-                    if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)], $tokens[($i + 5)]) !== false
-                        && $tokens[($i + 1)]['code'] === T_SL
-                        && $tokens[($i + 2)]['code'] === T_SL
-                        && $tokens[($i + 3)]['code'] === T_LESS_THAN
-                        && $tokens[($i + 4)]['code'] === T_WHITESPACE
-                        && trim($tokens[($i + 5)]['content']) === 'HEAD'
-                    ) {
-                        $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
-                        $i += 5;
-                    }
-                    break;
-
-                // Check for merge conflict delimiter.
-                case T_IS_IDENTICAL:
-                    if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false
-                        && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL
-                        && $tokens[($i + 2)]['code'] === T_EQUAL
-                        && $tokens[($i + 3)]['code'] === T_WHITESPACE
-                        && $tokens[($i + 3)]['content'] === "\n"
-                    ) {
-                        $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                        $i += 3;
-                    }
-                    break;
-
-                // Merge conflict closer.
-                case T_ZSR:
-                    if ($tokens[$i]['code'] === T_ZSR
-                        && isset($tokens[($i + 1)], $tokens[($i + 2)]) === true
-                        && $tokens[($i + 1)]['code'] === T_ZSR
-                        && $tokens[($i + 2)]['code'] === T_GREATER_THAN
-                    ) {
-                        $phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
-                        $i += 2;
-                    }
-                    break;
-
-                // Check for merge conflicts in all comments.
-                case T_COMMENT:
-                case T_DOC_COMMENT_STRING:
-                    if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') {
-                        $phpcsFile->addError($error, $i, 'OpenerFound');
-                        break;
-                    } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') {
-                        $phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
-                        break;
-                    }
-
-                    if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
-                        if ($tokens[$i]['content'] === '======='
-                            && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE
-                        ) {
-                            $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                            break;
-                        }
-                    } else {
-                        if ($tokens[$i]['content'] === "=======\n") {
-                            $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
-                        }
-                    }
-                    break;
+                	case T_SL:
+                    	if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)], $tokens[($i + 5)]) !== false
+                        	&& $tokens[($i + 1)]['code'] === T_SL
+                        	&& $tokens[($i + 2)]['code'] === T_SL
+                        	&& $tokens[($i + 3)]['code'] === T_LESS_THAN
+                        	&& $tokens[($i + 4)]['code'] === T_WHITESPACE
+                        	&& trim($tokens[($i + 5)]['content']) === 'HEAD'
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'OpenerFound', ['opener']);
+                        	$i += 5;
+                    	}
+                    	break;
+
+                	// Check for merge conflict delimiter.
+                	case T_IS_IDENTICAL:
+                    	if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false
+                        	&& $tokens[($i + 1)]['code'] === T_IS_IDENTICAL
+                        	&& $tokens[($i + 2)]['code'] === T_EQUAL
+                        	&& $tokens[($i + 3)]['code'] === T_WHITESPACE
+                        	&& $tokens[($i + 3)]['content'] === "\n"
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                        	$i += 3;
+                    	}
+                    	break;
+
+                	// Merge conflict closer.
+                	case T_ZSR:
+                    	if ($tokens[$i]['code'] === T_ZSR
+                        	&& isset($tokens[($i + 1)], $tokens[($i + 2)]) === true
+                        	&& $tokens[($i + 1)]['code'] === T_ZSR
+                        	&& $tokens[($i + 2)]['code'] === T_GREATER_THAN
+                    	) {
+                        	$phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
+                        	$i += 2;
+                    	}
+                    	break;
+
+                	// Check for merge conflicts in all comments.
+                	case T_COMMENT:
+                	case T_DOC_COMMENT_STRING:
+                    	if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') {
+                        	$phpcsFile->addError($error, $i, 'OpenerFound');
+                        	break;
+                    	} else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') {
+                        	$phpcsFile->addError($error, $i, 'CloserFound', ['closer']);
+                        	break;
+                    	}
+
+                    	if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
+                        	if ($tokens[$i]['content'] === '======='
+                            	&& $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE
+                        	) {
+                            	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                            	break;
+                        	}
+                    	} else {
+                        	if ($tokens[$i]['content'] === "=======\n") {
+                            	$phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']);
+                        	}
+                    	}
+                    	break;
                 }//end switch
             }//end if
         }//end for