eventespresso / event-espresso-core

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

Switch Indentation +21 added lines, -21 removed lines

@@ -34,10 +34,10 @@ 
 }
 
 switch ($foo) {
-    case'Foo': {
-        echo 'foo';
-        break;
-        }
+    	case'Foo': {
+        	echo 'foo';
+        	break;
+        	}
 }
 
 while ($i < 10) {
@@ -52,10 +52,10 @@ 
 }
 
 switch (true) {
-    case is_resource($value):
-        throw new Exception('foo');
-    case is_object($value):
-        return 'object';
+    	case is_resource($value):
+        	throw new Exception('foo');
+    	case is_object($value):
+        	return 'object';
 }
 
 switch (0) {
@@ -105,13 +105,13 @@ 
 }
 
 switch ($foo) {
-    case 1: $bar = 1; break;
-    case 2:
+    	case 1: $bar = 1; break;
+    	case 2:
     
-        $bar = 2; break;
-    case 21:
-    case 3: return 3;
-    default: $bar = 0;
+        	$bar = 2; break;
+    	case 21:
+    	case 3: return 3;
+    	default: $bar = 0;
 }
 
 switch ($foo) {
@@ -146,13 +146,13 @@ 
 }
 
 switch ($foo) {
-    case Foo::INTERFACE:
-        return self::INTERFACE;
-    case Foo::NAMESPACE:
-        return self::MODULE;
-    case Foo::TRAIT:
-    case Foo::ARRAY:
-        return self::VALUE;
+    	case Foo::INTERFACE:
+        	return self::INTERFACE;
+    	case Foo::NAMESPACE:
+        	return self::MODULE;
+    	case Foo::TRAIT:
+    	case Foo::ARRAY:
+        	return self::VALUE;
 }
 
 // OK: Every clause terminates

Spacing +14 added lines, -14 removed lines

@@ -135,7 +135,7 @@ 
         break;
 }
 
-switch($foo)
+switch ($foo)
 {
     case ('foo'):
     default:
@@ -264,7 +264,7 @@ 
 }
 
 $foo = $foo ?
-    function () {
+    function() {
         switch ($a) {
             case 'a':
                 break;
@@ -342,7 +342,7 @@ 
 }
 
 // Issue 3352.
-switch ( $test ) {
+switch ($test) {
     case 2: // comment followed by empty line
 
         break;
@@ -407,7 +407,7 @@ 
 
 // Issue #3297.
 // Okay - finally will always be executed, so all branches are covered by the `return` in finally.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             doSomething();
@@ -424,7 +424,7 @@ 
 }
 
 // Okay - all - non-finally - branches have a terminating statement.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return false;
@@ -444,7 +444,7 @@ 
 
 // Okay - finally will always be executed, so all branches are covered by the `return` in finally.
 // Non-standard structure order.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             doSomething();
@@ -462,7 +462,7 @@ 
 
 // Okay - all - non-finally - branches have a terminating statement.
 // Non-standard structure order.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return false;
@@ -479,7 +479,7 @@ 
 }
 
 // All okay, no finally. Any exception still uncaught will terminate the case anyhow, so we're good.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return false;
@@ -494,7 +494,7 @@ 
 }
 
 // All okay, no catch
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return true;
@@ -507,7 +507,7 @@ 
 }
 
 // All okay, try-catch nested in if.
-switch ( $a ) {
+switch ($a) {
     case 1:
         if ($a) {
             try {
@@ -524,7 +524,7 @@ 
 }
 
 // Missing fall-through comment.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             doSomething();
@@ -537,7 +537,7 @@ 
 }
 
 // Missing fall-through comment. One of the catches does not have a terminating statement.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return false;
@@ -554,7 +554,7 @@ 
 }
 
 // Missing fall-through comment. Try does not have a terminating statement.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             doSomething();
@@ -571,7 +571,7 @@ 
 }
 
 // Missing fall-through comment. One of the catches does not have a terminating statement.
-switch ( $a ) {
+switch ($a) {
     case 1:
         try {
             return false;

Braces +3 added lines, -2 removed lines

@@ -395,10 +395,11 @@
 
 switch ($foo) {
     case 1:
-        if ($bar > 0) /*comment*/ {
+        if ($bar > 0) {
+        	/*comment*/ {
             return doSomething();
         }
-        else {
+        } else {
             return 1;
         }
     case 2:

Indentation +410 added lines, -410 removed lines

@@ -1,598 +1,598 @@
 <?php
 switch ($expr) {
-    case 0:
-        echo 'First case, with a break';
-        break;
-    case 1:
-        echo 'Second case, which falls through';
-        // no break
-    case 2:
-    case   3:
-    Case 4:
-        echo 'Third case, return instead of break';
-        return;
-    Default:
-        echo 'Default case';
-            break;
+	case 0:
+		echo 'First case, with a break';
+		break;
+	case 1:
+		echo 'Second case, which falls through';
+		// no break
+	case 2:
+	case   3:
+	Case 4:
+		echo 'Third case, return instead of break';
+		return;
+	Default:
+		echo 'Default case';
+			break;
 }
 
 switch ($expr) {
-    case 0:
-        echo 'First case,';
+	case 0:
+		echo 'First case,';
 
-    case 1 :
-        echo 'Second case';
-        // no break
-    case 2:
-    case 3:
-        echo 'Third case';
-    return;
+	case 1 :
+		echo 'Second case';
+		// no break
+	case 2:
+	case 3:
+		echo 'Third case';
+	return;
 
-    default:
-        echo 'Default case';
-    break;
+	default:
+		echo 'Default case';
+	break;
 }
 
 switch ($foo) {
-    case'Foo': {
-        echo 'foo';
-        break;
-        }
+	case'Foo': {
+		echo 'foo';
+		break;
+		}
 }
 
 while ($i < 10) {
-    switch ($foo) {
-        case '1':
-        case '2':
-            ++$i;
-            continue 2;
-        case '3':
-            return $i;
-    }
+	switch ($foo) {
+		case '1':
+		case '2':
+			++$i;
+			continue 2;
+		case '3':
+			return $i;
+	}
 }
 
 switch (true) {
-    case is_resource($value):
-        throw new Exception('foo');
-    case is_object($value):
-        return 'object';
+	case is_resource($value):
+		throw new Exception('foo');
+	case is_object($value):
+		return 'object';
 }
 
 switch (0) {
-    case 0:
-        switch (1) {
-            case 1:
-                echo 'a';
-                break;
-        }
-        break;
+	case 0:
+		switch (1) {
+			case 1:
+				echo 'a';
+				break;
+		}
+		break;
 }
 
 switch ($foo) {
-    case Foo::ONE:
-    case Foo::TWO:
-    case Foo::Class:
-        break;
+	case Foo::ONE:
+	case Foo::TWO:
+	case Foo::Class:
+		break;
 }
 
 switch (true) {
-    case $value instanceof StdClass:
-        return 1;
-    case strpos('_', get_class($value)) !== false:
-        break;
+	case $value instanceof StdClass:
+		return 1;
+	case strpos('_', get_class($value)) !== false:
+		break;
 }
 
 switch (true) {
-    case $value instanceof StdClass:
-        if ($value) {
-            return null;
-        }
+	case $value instanceof StdClass:
+		if ($value) {
+			return null;
+		}
 }
 
 use Vendor\Test\FooBar;
 
 function test()
 {
-    switch ($val) {
-        case 'foo':
-            echo 'foo';
-            break;
-        default:
-            echo 'foo';
-    }
+	switch ($val) {
+		case 'foo':
+			echo 'foo';
+			break;
+		default:
+			echo 'foo';
+	}
 
-    exit;
+	exit;
 }
 
 switch ($foo) {
-    case 1: $bar = 1; break;
-    case 2:
+	case 1: $bar = 1; break;
+	case 2:
     
-        $bar = 2; break;
-    case 21:
-    case 3: return 3;
-    default: $bar = 0;
+		$bar = 2; break;
+	case 21:
+	case 3: return 3;
+	default: $bar = 0;
 }
 
 switch ($foo) {
-    case 'foo': // some comment
-        echo 'foo';
-        break;
-    case 'bar':
-        // some comment
-        echo 'bar';
-        break;
-    case 'baz': // phpcs:ignore Standard.Category.Sniff
-        echo 'baz';
-        break;
-    case 'boo':
-
-        // other comment
-        echo 'boo';
-        break;
-    default: // other comment
-        echo 'default';
-        break;
+	case 'foo': // some comment
+		echo 'foo';
+		break;
+	case 'bar':
+		// some comment
+		echo 'bar';
+		break;
+	case 'baz': // phpcs:ignore Standard.Category.Sniff
+		echo 'baz';
+		break;
+	case 'boo':
+
+		// other comment
+		echo 'boo';
+		break;
+	default: // other comment
+		echo 'default';
+		break;
 }
 
 switch($foo)
 {
-    case ('foo'):
-    default:
-    {
-        $foo = 'foo';
-        break;
-    }
+	case ('foo'):
+	default:
+	{
+		$foo = 'foo';
+		break;
+	}
 }
 
 switch ($foo) {
-    case Foo::INTERFACE:
-        return self::INTERFACE;
-    case Foo::NAMESPACE:
-        return self::MODULE;
-    case Foo::TRAIT:
-    case Foo::ARRAY:
-        return self::VALUE;
+	case Foo::INTERFACE:
+		return self::INTERFACE;
+	case Foo::NAMESPACE:
+		return self::MODULE;
+	case Foo::TRAIT:
+	case Foo::ARRAY:
+		return self::VALUE;
 }
 
 // OK: Every clause terminates
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            return 0;
-        } else {
-            return 1;
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			return 0;
+		} else {
+			return 1;
+		}
+	case 2:
+		return 2;
 }
 
 // ERROR: No else clause
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            return 0;
-        } elseif ($bar < 0) {
-            return 1;
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			return 0;
+		} elseif ($bar < 0) {
+			return 1;
+		}
+	case 2:
+		return 2;
 }
 
 // OK: No fall-through present
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            return 0;
-        } elseif ($bar < 0) {
-            return 1;
-        }
+	case 1:
+		if ($bar > 0) {
+			return 0;
+		} elseif ($bar < 0) {
+			return 1;
+		}
 }
 
 // ERROR: No else clause (nested)
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            return 0;
-        } else {
-            if ($foo > $bar) {
-                continue;
-            }
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			return 0;
+		} else {
+			if ($foo > $bar) {
+				continue;
+			}
+		}
+	case 2:
+		return 2;
 }
 
 // OK: Every clause terminates
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            return 0;
-        } else {
-            if ($foo > $bar) {
-                continue;
-            } else {
-                break;
-            }
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			return 0;
+		} else {
+			if ($foo > $bar) {
+				continue;
+			} else {
+				break;
+			}
+		}
+	case 2:
+		return 2;
 }
 
 // ERROR: Non-termination IF clause
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            $offset = 0;
-        } else {
-            break;
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			$offset = 0;
+		} else {
+			break;
+		}
+	case 2:
+		return 2;
 }
 
 // ERROR: Non-termination IF clause (nested)
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            continue;
-        } else {
-            if ($foo > $bar) {
-                $offset = 0;
-            } else {
-                break;
-            }
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			continue;
+		} else {
+			if ($foo > $bar) {
+				$offset = 0;
+			} else {
+				break;
+			}
+		}
+	case 2:
+		return 2;
 }
 
 switch ($sContext)
 {
-    case 'SOMETHING':
-    case 'CONSTANT':
-        do_something();
-        break;
-    case 'GLOBAL':
-    case 'GLOBAL1':
-        do_something();
-        // Fall through
-    default:
-    {
-        do_something();
-    }
+	case 'SOMETHING':
+	case 'CONSTANT':
+		do_something();
+		break;
+	case 'GLOBAL':
+	case 'GLOBAL1':
+		do_something();
+		// Fall through
+	default:
+	{
+		do_something();
+	}
 }
 
 $foo = $foo ?
-    function () {
-        switch ($a) {
-            case 'a':
-                break;
-        }
-    } :
-    null;
+	function () {
+		switch ($a) {
+			case 'a':
+				break;
+		}
+	} :
+	null;
 
 switch ($foo) {
 case Foo::INTERFACE:
-    echo '1';
-    return self::INTERFACE;
+	echo '1';
+	return self::INTERFACE;
 case Foo::TRAIT:
 case Foo::ARRAY:
-    echo '1';
-    return self::VALUE;
+	echo '1';
+	return self::VALUE;
 }
 
 // OK: Every clause terminates
 switch ($foo) {
-    case 1:
-        switch ($bar) {
-            case 1:
-                return 1;
-            default:
-                return 3;
-        }
-    case 2:
-        return 2;
+	case 1:
+		switch ($bar) {
+			case 1:
+				return 1;
+			default:
+				return 3;
+		}
+	case 2:
+		return 2;
 }
 
 // KO: Not every clause terminates
 switch ($foo) {
-    case 1:
-        switch ($bar) {
-            case 1:
-                return;
-        }
-    case 2:
-        return 2;
+	case 1:
+		switch ($bar) {
+			case 1:
+				return;
+		}
+	case 2:
+		return 2;
 }
 
 // KO: Not every clause terminates
 switch ($foo) {
-    case 1:
-        switch ($bar) {
-            case 1:
-                return;
-            default:
-                $a = 1;
-        }
-    case 2:
-        return 2;
+	case 1:
+		switch ($bar) {
+			case 1:
+				return;
+			default:
+				$a = 1;
+		}
+	case 2:
+		return 2;
 }
 
 // OK: Every clause terminates
 switch ($foo) {
-    case 1:
-        switch ($bar) {
-            case 1:
-                return 1;
-            default:
-                throw new \Exception();
-        }
-    case 2:
-        return 2;
+	case 1:
+		switch ($bar) {
+			case 1:
+				return 1;
+			default:
+				throw new \Exception();
+		}
+	case 2:
+		return 2;
 }
 
 switch ($foo) {
-    case 1:
-        // phpcs:ignore
-    case 2:
-        return 1;
-    case 3:
-        return 2;
+	case 1:
+		// phpcs:ignore
+	case 2:
+		return 1;
+	case 3:
+		return 2;
 }
 
 // Issue 3352.
 switch ( $test ) {
-    case 2: // comment followed by empty line
+	case 2: // comment followed by empty line
 
-        break;
+		break;
 
-    case 3: /* phpcs:ignore Stnd.Cat.SniffName -- Verify correct handling of ignore comments. */
+	case 3: /* phpcs:ignore Stnd.Cat.SniffName -- Verify correct handling of ignore comments. */
 
 
 
-        break;
+		break;
 
-    case 4: /** inline docblock */
+	case 4: /** inline docblock */
 
 
 
-        break;
+		break;
 
-    case 5: /* checking how it handles */ /* two trailing comments */
+	case 5: /* checking how it handles */ /* two trailing comments */
 
-        break;
+		break;
 
-    case 6:
-       // Comment as first content of the body.
+	case 6:
+	   // Comment as first content of the body.
 
-        break;
+		break;
 
-    case 7:
-        /* phpcs:ignore Stnd.Cat.SniffName -- Verify correct handling of ignore comments at start of body. */
+	case 7:
+		/* phpcs:ignore Stnd.Cat.SniffName -- Verify correct handling of ignore comments at start of body. */
 
-        break;
+		break;
 
-    case 8:
-        /** inline docblock */
+	case 8:
+		/** inline docblock */
 
-        break;
+		break;
 }
 
 // Handle comments correctly.
 switch ($foo) {
-    case 1:
-        if ($bar > 0) {
-            doSomething();
-        }
-        // Comment
-        else {
-            return 1;
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) {
+			doSomething();
+		}
+		// Comment
+		else {
+			return 1;
+		}
+	case 2:
+		return 2;
 }
 
 switch ($foo) {
-    case 1:
-        if ($bar > 0) /*comment*/ {
-            return doSomething();
-        }
-        else {
-            return 1;
-        }
-    case 2:
-        return 2;
+	case 1:
+		if ($bar > 0) /*comment*/ {
+			return doSomething();
+		}
+		else {
+			return 1;
+		}
+	case 2:
+		return 2;
 }
 
 // Issue #3297.
 // Okay - finally will always be executed, so all branches are covered by the `return` in finally.
 switch ( $a ) {
-    case 1:
-        try {
-            doSomething();
-        } catch (Exception $e) {
-            doSomething();
-        } catch (AnotherException $e) {
-            doSomething();
-        } finally {
-            return true;
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			doSomething();
+		} catch (Exception $e) {
+			doSomething();
+		} catch (AnotherException $e) {
+			doSomething();
+		} finally {
+			return true;
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Okay - all - non-finally - branches have a terminating statement.
 switch ( $a ) {
-    case 1:
-        try {
-            return false;
-        } catch (Exception $e) /*comment*/ {
-            return true;
-        }
-        // Comment
-        catch (AnotherException $e) {
-            return true;
-        } finally {
-            doSomething();
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return false;
+		} catch (Exception $e) /*comment*/ {
+			return true;
+		}
+		// Comment
+		catch (AnotherException $e) {
+			return true;
+		} finally {
+			doSomething();
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Okay - finally will always be executed, so all branches are covered by the `return` in finally.
 // Non-standard structure order.
 switch ( $a ) {
-    case 1:
-        try {
-            doSomething();
-        } catch (Exception $e) {
-            doSomething();
-        } finally {
-            return true;
-        } catch (AnotherException $e) {
-            doSomething();
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			doSomething();
+		} catch (Exception $e) {
+			doSomething();
+		} finally {
+			return true;
+		} catch (AnotherException $e) {
+			doSomething();
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Okay - all - non-finally - branches have a terminating statement.
 // Non-standard structure order.
 switch ( $a ) {
-    case 1:
-        try {
-            return false;
-        } finally {
-            doSomething();
-        } catch (MyException $e) {
-            return true;
-        } catch (AnotherException $e) {
-            return true;
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return false;
+		} finally {
+			doSomething();
+		} catch (MyException $e) {
+			return true;
+		} catch (AnotherException $e) {
+			return true;
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // All okay, no finally. Any exception still uncaught will terminate the case anyhow, so we're good.
 switch ( $a ) {
-    case 1:
-        try {
-            return false;
-        } catch (MyException $e) {
-            return true;
-        } catch (AnotherException $e) {
-            return true;
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return false;
+		} catch (MyException $e) {
+			return true;
+		} catch (AnotherException $e) {
+			return true;
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // All okay, no catch
 switch ( $a ) {
-    case 1:
-        try {
-            return true;
-        } finally {
-            doSomething();
-        }
-    case 2:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return true;
+		} finally {
+			doSomething();
+		}
+	case 2:
+		$other = $code;
+		break;
 }
 
 // All okay, try-catch nested in if.
 switch ( $a ) {
-    case 1:
-        if ($a) {
-            try {
-                return true; // Comment.
-            } catch (MyException $e) {
-                throw new Exception($e->getMessage());
-            }
-        } else {
-            return true;
-        }
-    case 2:
-        $other = $code;
-        break;
+	case 1:
+		if ($a) {
+			try {
+				return true; // Comment.
+			} catch (MyException $e) {
+				throw new Exception($e->getMessage());
+			}
+		} else {
+			return true;
+		}
+	case 2:
+		$other = $code;
+		break;
 }
 
 // Missing fall-through comment.
 switch ( $a ) {
-    case 1:
-        try {
-            doSomething();
-        } finally {
-            doSomething();
-        }
-    case 2:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			doSomething();
+		} finally {
+			doSomething();
+		}
+	case 2:
+		$other = $code;
+		break;
 }
 
 // Missing fall-through comment. One of the catches does not have a terminating statement.
 switch ( $a ) {
-    case 1:
-        try {
-            return false;
-        } catch (Exception $e) {
-            doSomething();
-        } catch (AnotherException $e) {
-            return true;
-        } finally {
-            doSomething();
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return false;
+		} catch (Exception $e) {
+			doSomething();
+		} catch (AnotherException $e) {
+			return true;
+		} finally {
+			doSomething();
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Missing fall-through comment. Try does not have a terminating statement.
 switch ( $a ) {
-    case 1:
-        try {
-            doSomething();
-        } finally {
-            doSomething();
-        } catch (Exception $e) {
-            return true;
-        } catch (AnotherException $e) {
-            return true;
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			doSomething();
+		} finally {
+			doSomething();
+		} catch (Exception $e) {
+			return true;
+		} catch (AnotherException $e) {
+			return true;
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Missing fall-through comment. One of the catches does not have a terminating statement.
 switch ( $a ) {
-    case 1:
-        try {
-            return false;
-        } catch (Exception $e) {
-            doSomething();
-        } catch (AnotherException $e) {
-            return true;
-        }
-    default:
-        $other = $code;
-        break;
+	case 1:
+		try {
+			return false;
+		} catch (Exception $e) {
+			doSomething();
+		} catch (AnotherException $e) {
+			return true;
+		}
+	default:
+		$other = $code;
+		break;
 }
 
 // Issue 3550 - comment after terminating statement.
 switch (rand()) {
-    case 1:
-        if (rand() === 1) {
-            break;
-        } else {
-            break; // comment
-        }
-    default:
-        break;
+	case 1:
+		if (rand() === 1) {
+			break;
+		} else {
+			break; // comment
+		}
+	default:
+		break;
 }

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php

Indentation +31 added lines, -31 removed lines

@@ -15,37 +15,37 @@
 {
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList()
-    {
-        return [];
-
-    }//end getErrorList()
-
-
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [
-            4  => 1,
-            12 => 1,
-        ];
-
-    }//end getWarningList()
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList()
+	{
+		return [];
+
+	}//end getErrorList()
+
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [
+			4  => 1,
+			12 => 1,
+		];
+
+	}//end getWarningList()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-class ClassName extends ParentClass implements \ArrayAccess,  \Countable
+class ClassName extends ParentClass implements \ArrayAccess, \Countable
 {
     // constants, properties, methods
 }
 
-class ClassName extends ParentClass,AnotherParentClass implements \ArrayAccess,\Countable {
+class ClassName extends ParentClass, AnotherParentClass implements \ArrayAccess, \Countable {
     // constants, properties, methods
 }
 
@@ -60,7 +60,7 @@ 
 }
 
 class ClassName extends ParentClass implements
-    \Foo\Bar\Countable ,
+    \Foo\Bar\Countable,
     \Serializable
 {
     // constants, properties, methods
@@ -127,7 +127,7 @@ 
 
 class ClassName implements
 
-    \ArrayAccess,\Countable,
+    \ArrayAccess, \Countable,
 \Serializable
 {
     // constants, properties, methods

Braces +3 added lines, -1 removed lines

@@ -69,7 +69,9 @@
 class Test
 {
     public function test() {
-        if (1) 1;
+        if (1) {
+        	1;
+        }
         1 ? (1 ? 1 : 1) : 1;
     }
 }

Indentation +58 added lines, -58 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 class ClassName extends ParentClass implements \ArrayAccess,  \Countable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class ClassName extends ParentClass,AnotherParentClass implements \ArrayAccess,\Countable {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class ClassName
 extends ParentClass
 implements \ArrayAccess, \Countable
 {
-    // constants, properties, methods
+	// constants, properties, methods
     
 }
 
 class ClassName extends  ParentClass  implements
    \ArrayAccess,
-        \Foo\Bar\Countable,
-    \Serializable {
-    // constants, properties, methods
+		\Foo\Bar\Countable,
+	\Serializable {
+	// constants, properties, methods
 
 }
 
 class ClassName extends ParentClass  implements \ArrayAccess,
-    \Countable,
-    \Serializable
+	\Countable,
+	\Serializable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class ClassName extends ParentClass  implements
-    \ArrayAccess, \Countable, \Foo\Serializable
+	\ArrayAccess, \Countable, \Foo\Serializable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 // Different indent
 if ($foo) {
-    class ClassName extends ParentClass implements
-        \ArrayAccess,
-    \Countable,
-            \Serializable
-    {
-        // constants, properties, methods
-    }
+	class ClassName extends ParentClass implements
+		\ArrayAccess,
+	\Countable,
+			\Serializable
+	{
+		// constants, properties, methods
+	}
 }
 
 class Foo extends \Foo\Bar\Object
@@ -53,25 +53,25 @@ 
 }
 
 class ClassName extends ParentClass implements
-    \Foo\Bar\Countable,
-    \Serializable
+	\Foo\Bar\Countable,
+	\Serializable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class ClassName extends ParentClass implements
-    \Foo\Bar\Countable ,
-    \Serializable
+	\Foo\Bar\Countable ,
+	\Serializable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class Test
 {
-    public function test() {
-        if (1) 1;
-        1 ? (1 ? 1 : 1) : 1;
-    }
+	public function test() {
+		if (1) 1;
+		1 ? (1 ? 1 : 1) : 1;
+	}
 }
 
 class MyClass
@@ -85,18 +85,18 @@ 
 
 class MyClass
 {
-    // Foo.
+	// Foo.
 }
 
 class MyClass
 {
-    // Foo.
+	// Foo.
 
 }
 
 abstract class Test implements
-    TestInterface1,
-    TestInterface2
+	TestInterface1,
+	TestInterface2
 {
 }
 
@@ -105,17 +105,17 @@ 
 }
 
 interface MyInterface extends
-    LongInterfaceName1,
-    LongInterfaceName2,
-    LongInterfaceName3,
-    LoginInterfaceName4
+	LongInterfaceName1,
+	LongInterfaceName2,
+	LongInterfaceName3,
+	LoginInterfaceName4
 {
 }
 
 interface MyInterface extends
  LongInterfaceName1,
-    LongInterfaceName2,
-     LongInterfaceName3,
+	LongInterfaceName2,
+	 LongInterfaceName3,
 LongInterfaceName4
 {
 }
@@ -127,10 +127,10 @@ 
 
 class ClassName implements
 
-    \ArrayAccess,\Countable,
+	\ArrayAccess,\Countable,
 \Serializable
 {
-    // constants, properties, methods
+	// constants, properties, methods
 }
 
 class C1
@@ -140,22 +140,22 @@ 
 
 class Base
 {
-    protected $anonymous;
+	protected $anonymous;
 
-    public function __construct()
-    {
-        $this->anonymous = new class extends ArrayObject
-        {
-            public function __construct()
-            {
-                parent::__construct(['a' => 1, 'b' => 2]);
-            }
-        };
-    }
+	public function __construct()
+	{
+		$this->anonymous = new class extends ArrayObject
+		{
+			public function __construct()
+			{
+				parent::__construct(['a' => 1, 'b' => 2]);
+			}
+		};
+	}
 }
 
 class A extends B
-    implements C
+	implements C
 {
 }
 
@@ -170,7 +170,7 @@ 
 }
 
 interface I2 extends
-    Bar
+	Bar
 {
 }
 
@@ -186,7 +186,7 @@ 
 }
 
 class C2 extends
-    Bar
+	Bar
 {
 }
 
@@ -196,7 +196,7 @@ 
 }
 
 class C4 extends Foo implements
-    Bar
+	Bar
 {
 }
 
@@ -218,17 +218,17 @@ 
 }
 
 interface I5 extends /* comment */
-    \Foo\Bar
+	\Foo\Bar
 {
 }
 
 interface I6 extends // comment
-    \Foo\Bar
+	\Foo\Bar
 {
 }
 
 class C7 extends // comment
-    \Foo\Bar implements \Baz\Bar
+	\Foo\Bar implements \Baz\Bar
 {
 }
 

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.1.inc

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 }
 
 $var = new MyClass(
-    function () use ($foo, $bar) {
+    function() use ($foo, $bar) {
         return true;
     }
 );
@@ -30,7 +30,7 @@ 
     use Hello, World;
 }
 
-$x = $foo ? function ($foo) use /* comment */ ($bar): int {
+$x = $foo ? function($foo) use /* comment */ ($bar) : int {
     return 1;
 } : $bar;
 

Indentation +7 added lines, -7 removed lines

@@ -15,28 +15,28 @@
 }
 
 $var = new MyClass(
-    function () use ($foo, $bar) {
-        return true;
-    }
+	function () use ($foo, $bar) {
+		return true;
+	}
 );
 
 class Container extends Component implements IContainer
 {
-    use TContainer;
+	use TContainer;
 }
 
 trait HelloWorld
 {
-    use Hello, World;
+	use Hello, World;
 }
 
 enum SomeEnum
 {
-    use Hello, World;
+	use Hello, World;
 }
 
 $x = $foo ? function ($foo) use /* comment */ ($bar): int {
-    return 1;
+	return 1;
 } : $bar;
 
 // Testcase must be on last line in the file.

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.3.inc

Indentation +8 added lines, -8 removed lines

@@ -2,15 +2,15 @@
 namespace bug;
 
 use
-    someNS\A;
+	someNS\A;
 use someNS\B;
 class Bug
 {
-    public function __construct()
-    {
-        $b = 1;
-        $a = function () use ($b) {
-            echo $b;
-        };
-    }
+	public function __construct()
+	{
+		$b = 1;
+		$a = function () use ($b) {
+			echo $b;
+		};
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     public function __construct()
     {
         $b = 1;
-        $a = function () use ($b) {
+        $a = function() use ($b) {
             echo $b;
         };
     }

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='')
+    public function getErrorList($testFile = '')
     {
         switch ($testFile) {
         case 'UseDeclarationUnitTest.2.inc':

Indentation +73 added lines, -73 removed lines

@@ -15,83 +15,83 @@
 {
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @param string $testFile The name of the file being tested.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList($testFile='')
-    {
-        switch ($testFile) {
-        case 'UseDeclarationUnitTest.2.inc':
-            return [
-                4  => 1,
-                5  => 1,
-                6  => 1,
-                7  => 1,
-                9  => 1,
-                10 => 1,
-                11 => 1,
-                16 => 1,
-            ];
-        case 'UseDeclarationUnitTest.3.inc':
-            return [
-                4 => 1,
-                6 => 1,
-            ];
-        case 'UseDeclarationUnitTest.5.inc':
-            return [
-                5  => 1,
-                6  => 1,
-                8  => 1,
-                14 => 1,
-                17 => 1,
-                18 => 1,
-                19 => 1,
-                21 => 1,
-                28 => 1,
-                30 => 1,
-                35 => 1,
-            ];
-        case 'UseDeclarationUnitTest.10.inc':
-        case 'UseDeclarationUnitTest.11.inc':
-        case 'UseDeclarationUnitTest.12.inc':
-        case 'UseDeclarationUnitTest.13.inc':
-        case 'UseDeclarationUnitTest.14.inc':
-        case 'UseDeclarationUnitTest.16.inc':
-        case 'UseDeclarationUnitTest.17.inc':
-            return [2 => 1];
-        case 'UseDeclarationUnitTest.15.inc':
-            return [
-                3 => 1,
-                4 => 1,
-                5 => 1,
-            ];
-        default:
-            return [];
-        }//end switch
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList($testFile='')
+	{
+		switch ($testFile) {
+		case 'UseDeclarationUnitTest.2.inc':
+			return [
+				4  => 1,
+				5  => 1,
+				6  => 1,
+				7  => 1,
+				9  => 1,
+				10 => 1,
+				11 => 1,
+				16 => 1,
+			];
+		case 'UseDeclarationUnitTest.3.inc':
+			return [
+				4 => 1,
+				6 => 1,
+			];
+		case 'UseDeclarationUnitTest.5.inc':
+			return [
+				5  => 1,
+				6  => 1,
+				8  => 1,
+				14 => 1,
+				17 => 1,
+				18 => 1,
+				19 => 1,
+				21 => 1,
+				28 => 1,
+				30 => 1,
+				35 => 1,
+			];
+		case 'UseDeclarationUnitTest.10.inc':
+		case 'UseDeclarationUnitTest.11.inc':
+		case 'UseDeclarationUnitTest.12.inc':
+		case 'UseDeclarationUnitTest.13.inc':
+		case 'UseDeclarationUnitTest.14.inc':
+		case 'UseDeclarationUnitTest.16.inc':
+		case 'UseDeclarationUnitTest.17.inc':
+			return [2 => 1];
+		case 'UseDeclarationUnitTest.15.inc':
+			return [
+				3 => 1,
+				4 => 1,
+				5 => 1,
+			];
+		default:
+			return [];
+		}//end switch
 
-    }//end getErrorList()
+	}//end getErrorList()
 
 
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [];
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [];
 
-    }//end getWarningList()
+	}//end getWarningList()
 
 
 }//end class

Switch Indentation +46 added lines, -46 removed lines

@@ -28,52 +28,52 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'UseDeclarationUnitTest.2.inc':
-            return [
-                4  => 1,
-                5  => 1,
-                6  => 1,
-                7  => 1,
-                9  => 1,
-                10 => 1,
-                11 => 1,
-                16 => 1,
-            ];
-        case 'UseDeclarationUnitTest.3.inc':
-            return [
-                4 => 1,
-                6 => 1,
-            ];
-        case 'UseDeclarationUnitTest.5.inc':
-            return [
-                5  => 1,
-                6  => 1,
-                8  => 1,
-                14 => 1,
-                17 => 1,
-                18 => 1,
-                19 => 1,
-                21 => 1,
-                28 => 1,
-                30 => 1,
-                35 => 1,
-            ];
-        case 'UseDeclarationUnitTest.10.inc':
-        case 'UseDeclarationUnitTest.11.inc':
-        case 'UseDeclarationUnitTest.12.inc':
-        case 'UseDeclarationUnitTest.13.inc':
-        case 'UseDeclarationUnitTest.14.inc':
-        case 'UseDeclarationUnitTest.16.inc':
-        case 'UseDeclarationUnitTest.17.inc':
-            return [2 => 1];
-        case 'UseDeclarationUnitTest.15.inc':
-            return [
-                3 => 1,
-                4 => 1,
-                5 => 1,
-            ];
-        default:
-            return [];
+        	case 'UseDeclarationUnitTest.2.inc':
+            	return [
+                	4  => 1,
+                	5  => 1,
+                	6  => 1,
+                	7  => 1,
+                	9  => 1,
+                	10 => 1,
+                	11 => 1,
+                	16 => 1,
+            	];
+        	case 'UseDeclarationUnitTest.3.inc':
+            	return [
+                	4 => 1,
+                	6 => 1,
+            	];
+        	case 'UseDeclarationUnitTest.5.inc':
+            	return [
+                	5  => 1,
+                	6  => 1,
+                	8  => 1,
+                	14 => 1,
+                	17 => 1,
+                	18 => 1,
+                	19 => 1,
+                	21 => 1,
+                	28 => 1,
+                	30 => 1,
+                	35 => 1,
+            	];
+        	case 'UseDeclarationUnitTest.10.inc':
+        	case 'UseDeclarationUnitTest.11.inc':
+        	case 'UseDeclarationUnitTest.12.inc':
+        	case 'UseDeclarationUnitTest.13.inc':
+        	case 'UseDeclarationUnitTest.14.inc':
+        	case 'UseDeclarationUnitTest.16.inc':
+        	case 'UseDeclarationUnitTest.17.inc':
+            	return [2 => 1];
+        	case 'UseDeclarationUnitTest.15.inc':
+            	return [
+                	3 => 1,
+                	4 => 1,
+                	5 => 1,
+            	];
+        	default:
+            	return [];
         }//end switch
 
     }//end getErrorList()

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php

Switch Indentation +12 added lines, -12 removed lines

@@ -64,18 +64,18 @@
         $prefix = $stackPtr;
         while (($prefix = $phpcsFile->findPrevious(Tokens::$methodPrefixes, ($prefix - 1), $prev)) !== false) {
             switch ($tokens[$prefix]['code']) {
-            case T_STATIC:
-                $static = $prefix;
-                break;
-            case T_ABSTRACT:
-                $abstract = $prefix;
-                break;
-            case T_FINAL:
-                $final = $prefix;
-                break;
-            default:
-                $visibility = $prefix;
-                break;
+            	case T_STATIC:
+                	$static = $prefix;
+                	break;
+            	case T_ABSTRACT:
+                	$abstract = $prefix;
+                	break;
+            	case T_FINAL:
+                	$final = $prefix;
+                	break;
+            	default:
+                	$visibility = $prefix;
+                	break;
             }
         }
 

Indentation +140 added lines, -140 removed lines

@@ -17,146 +17,146 @@
 {
 
 
-    /**
-     * Constructs a Squiz_Sniffs_Scope_MethodScopeSniff.
-     */
-    public function __construct()
-    {
-        parent::__construct(Tokens::$ooScopeTokens, [T_FUNCTION]);
-
-    }//end __construct()
-
-
-    /**
-     * Processes the function tokens within the class.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position where the token was found.
-     * @param int                         $currScope The current scope opener token.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Determine if this is a function which needs to be examined.
-        $conditions = $tokens[$stackPtr]['conditions'];
-        end($conditions);
-        $deepestScope = key($conditions);
-        if ($deepestScope !== $currScope) {
-            return;
-        }
-
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
-            // Ignore closures.
-            return;
-        }
-
-        if ($methodName[0] === '_' && isset($methodName[1]) === true && $methodName[1] !== '_') {
-            $error = 'Method name "%s" should not be prefixed with an underscore to indicate visibility';
-            $data  = [$methodName];
-            $phpcsFile->addWarning($error, $stackPtr, 'Underscore', $data);
-        }
-
-        $visibility = 0;
-        $static     = 0;
-        $abstract   = 0;
-        $final      = 0;
-
-        $find = (Tokens::$methodPrefixes + Tokens::$emptyTokens);
-        $prev = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
-
-        $prefix = $stackPtr;
-        while (($prefix = $phpcsFile->findPrevious(Tokens::$methodPrefixes, ($prefix - 1), $prev)) !== false) {
-            switch ($tokens[$prefix]['code']) {
-            case T_STATIC:
-                $static = $prefix;
-                break;
-            case T_ABSTRACT:
-                $abstract = $prefix;
-                break;
-            case T_FINAL:
-                $final = $prefix;
-                break;
-            default:
-                $visibility = $prefix;
-                break;
-            }
-        }
-
-        $fixes = [];
-
-        if ($visibility !== 0 && $final > $visibility) {
-            $error = 'The final declaration must precede the visibility declaration';
-            $fix   = $phpcsFile->addFixableError($error, $final, 'FinalAfterVisibility');
-            if ($fix === true) {
-                $fixes[$final]       = '';
-                $fixes[($final + 1)] = '';
-                if (isset($fixes[$visibility]) === true) {
-                    $fixes[$visibility] = 'final '.$fixes[$visibility];
-                } else {
-                    $fixes[$visibility] = 'final '.$tokens[$visibility]['content'];
-                }
-            }
-        }
-
-        if ($visibility !== 0 && $abstract > $visibility) {
-            $error = 'The abstract declaration must precede the visibility declaration';
-            $fix   = $phpcsFile->addFixableError($error, $abstract, 'AbstractAfterVisibility');
-            if ($fix === true) {
-                $fixes[$abstract]       = '';
-                $fixes[($abstract + 1)] = '';
-                if (isset($fixes[$visibility]) === true) {
-                    $fixes[$visibility] = 'abstract '.$fixes[$visibility];
-                } else {
-                    $fixes[$visibility] = 'abstract '.$tokens[$visibility]['content'];
-                }
-            }
-        }
-
-        if ($static !== 0 && $static < $visibility) {
-            $error = 'The static declaration must come after the visibility declaration';
-            $fix   = $phpcsFile->addFixableError($error, $static, 'StaticBeforeVisibility');
-            if ($fix === true) {
-                $fixes[$static]       = '';
-                $fixes[($static + 1)] = '';
-                if (isset($fixes[$visibility]) === true) {
-                    $fixes[$visibility] .= ' static';
-                } else {
-                    $fixes[$visibility] = $tokens[$visibility]['content'].' static';
-                }
-            }
-        }
-
-        // Batch all the fixes together to reduce the possibility of conflicts.
-        if (empty($fixes) === false) {
-            $phpcsFile->fixer->beginChangeset();
-            foreach ($fixes as $stackPtr => $content) {
-                $phpcsFile->fixer->replaceToken($stackPtr, $content);
-            }
-
-            $phpcsFile->fixer->endChangeset();
-        }
-
-    }//end processTokenWithinScope()
-
-
-    /**
-     * Processes a token that is found within the scope that this test is
-     * listening to.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position in the stack where this
-     *                                               token was found.
-     *
-     * @return void
-     */
-    protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
-    {
-
-    }//end processTokenOutsideScope()
+	/**
+	 * Constructs a Squiz_Sniffs_Scope_MethodScopeSniff.
+	 */
+	public function __construct()
+	{
+		parent::__construct(Tokens::$ooScopeTokens, [T_FUNCTION]);
+
+	}//end __construct()
+
+
+	/**
+	 * Processes the function tokens within the class.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param int                         $stackPtr  The position where the token was found.
+	 * @param int                         $currScope The current scope opener token.
+	 *
+	 * @return void
+	 */
+	protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Determine if this is a function which needs to be examined.
+		$conditions = $tokens[$stackPtr]['conditions'];
+		end($conditions);
+		$deepestScope = key($conditions);
+		if ($deepestScope !== $currScope) {
+			return;
+		}
+
+		$methodName = $phpcsFile->getDeclarationName($stackPtr);
+		if ($methodName === null) {
+			// Ignore closures.
+			return;
+		}
+
+		if ($methodName[0] === '_' && isset($methodName[1]) === true && $methodName[1] !== '_') {
+			$error = 'Method name "%s" should not be prefixed with an underscore to indicate visibility';
+			$data  = [$methodName];
+			$phpcsFile->addWarning($error, $stackPtr, 'Underscore', $data);
+		}
+
+		$visibility = 0;
+		$static     = 0;
+		$abstract   = 0;
+		$final      = 0;
+
+		$find = (Tokens::$methodPrefixes + Tokens::$emptyTokens);
+		$prev = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
+
+		$prefix = $stackPtr;
+		while (($prefix = $phpcsFile->findPrevious(Tokens::$methodPrefixes, ($prefix - 1), $prev)) !== false) {
+			switch ($tokens[$prefix]['code']) {
+			case T_STATIC:
+				$static = $prefix;
+				break;
+			case T_ABSTRACT:
+				$abstract = $prefix;
+				break;
+			case T_FINAL:
+				$final = $prefix;
+				break;
+			default:
+				$visibility = $prefix;
+				break;
+			}
+		}
+
+		$fixes = [];
+
+		if ($visibility !== 0 && $final > $visibility) {
+			$error = 'The final declaration must precede the visibility declaration';
+			$fix   = $phpcsFile->addFixableError($error, $final, 'FinalAfterVisibility');
+			if ($fix === true) {
+				$fixes[$final]       = '';
+				$fixes[($final + 1)] = '';
+				if (isset($fixes[$visibility]) === true) {
+					$fixes[$visibility] = 'final '.$fixes[$visibility];
+				} else {
+					$fixes[$visibility] = 'final '.$tokens[$visibility]['content'];
+				}
+			}
+		}
+
+		if ($visibility !== 0 && $abstract > $visibility) {
+			$error = 'The abstract declaration must precede the visibility declaration';
+			$fix   = $phpcsFile->addFixableError($error, $abstract, 'AbstractAfterVisibility');
+			if ($fix === true) {
+				$fixes[$abstract]       = '';
+				$fixes[($abstract + 1)] = '';
+				if (isset($fixes[$visibility]) === true) {
+					$fixes[$visibility] = 'abstract '.$fixes[$visibility];
+				} else {
+					$fixes[$visibility] = 'abstract '.$tokens[$visibility]['content'];
+				}
+			}
+		}
+
+		if ($static !== 0 && $static < $visibility) {
+			$error = 'The static declaration must come after the visibility declaration';
+			$fix   = $phpcsFile->addFixableError($error, $static, 'StaticBeforeVisibility');
+			if ($fix === true) {
+				$fixes[$static]       = '';
+				$fixes[($static + 1)] = '';
+				if (isset($fixes[$visibility]) === true) {
+					$fixes[$visibility] .= ' static';
+				} else {
+					$fixes[$visibility] = $tokens[$visibility]['content'].' static';
+				}
+			}
+		}
+
+		// Batch all the fixes together to reduce the possibility of conflicts.
+		if (empty($fixes) === false) {
+			$phpcsFile->fixer->beginChangeset();
+			foreach ($fixes as $stackPtr => $content) {
+				$phpcsFile->fixer->replaceToken($stackPtr, $content);
+			}
+
+			$phpcsFile->fixer->endChangeset();
+		}
+
+	}//end processTokenWithinScope()
+
+
+	/**
+	 * Processes a token that is found within the scope that this test is
+	 * listening to.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param int                         $stackPtr  The position in the stack where this
+	 *                                               token was found.
+	 *
+	 * @return void
+	 */
+	protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
+	{
+
+	}//end processTokenOutsideScope()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php

Indentation +43 added lines, -43 removed lines

@@ -16,57 +16,57 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_ELSE,
-            T_ELSEIF,
-        ];
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_ELSE,
+			T_ELSEIF,
+		];
 
-    }//end register()
+	}//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] === T_ELSEIF) {
-            $phpcsFile->recordMetric($stackPtr, 'Use of ELSE IF or ELSEIF', 'elseif');
-            return;
-        }
+		if ($tokens[$stackPtr]['code'] === T_ELSEIF) {
+			$phpcsFile->recordMetric($stackPtr, 'Use of ELSE IF or ELSEIF', 'elseif');
+			return;
+		}
 
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] === T_IF) {
-            $phpcsFile->recordMetric($stackPtr, 'Use of ELSE IF or ELSEIF', 'else if');
-            $error = 'Usage of ELSE IF is discouraged; use ELSEIF instead';
-            $fix   = $phpcsFile->addFixableWarning($error, $stackPtr, 'NotAllowed');
+		$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		if ($tokens[$next]['code'] === T_IF) {
+			$phpcsFile->recordMetric($stackPtr, 'Use of ELSE IF or ELSEIF', 'else if');
+			$error = 'Usage of ELSE IF is discouraged; use ELSEIF instead';
+			$fix   = $phpcsFile->addFixableWarning($error, $stackPtr, 'NotAllowed');
 
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->replaceToken($stackPtr, 'elseif');
-                for ($i = ($stackPtr + 1); $i <= $next; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				$phpcsFile->fixer->replaceToken($stackPtr, 'elseif');
+				for ($i = ($stackPtr + 1); $i <= $next; $i++) {
+					$phpcsFile->fixer->replaceToken($i, '');
+				}
 
-                $phpcsFile->fixer->endChangeset();
-            }
-        }
+				$phpcsFile->fixer->endChangeset();
+			}
+		}
 
-    }//end process()
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php

Spacing +1 added lines, -1 removed lines

@@ -312,7 +312,7 @@
                             $expected,
                             $found,
                         ];
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceWrongIndent', $data);
+                        $fix = $phpcsFile->addFixableError($error, $className, 'InterfaceWrongIndent', $data);
                         if ($fix === true) {
                             $padding = str_repeat(' ', $expected);
                             if ($found === 0) {

Indentation +507 added lines, -507 removed lines

@@ -16,513 +16,513 @@
 class ClassDeclarationSniff extends PEARClassDeclarationSniff
 {
 
-    /**
-     * The number of spaces code should be indented.
-     *
-     * @var integer
-     */
-    public $indent = 4;
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // We want all the errors from the PEAR standard, plus some of our own.
-        parent::process($phpcsFile, $stackPtr);
-
-        // Just in case.
-        $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            return;
-        }
-
-        $this->processOpen($phpcsFile, $stackPtr);
-        $this->processClose($phpcsFile, $stackPtr);
-
-    }//end process()
-
-
-    /**
-     * Processes the opening section of a class declaration.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function processOpen(File $phpcsFile, $stackPtr)
-    {
-        $tokens       = $phpcsFile->getTokens();
-        $stackPtrType = strtolower($tokens[$stackPtr]['content']);
-
-        // Check alignment of the keyword and braces.
-        if ($tokens[($stackPtr - 1)]['code'] === T_WHITESPACE) {
-            $prevContent = $tokens[($stackPtr - 1)]['content'];
-            if ($prevContent !== $phpcsFile->eolChar) {
-                $blankSpace = substr($prevContent, strpos($prevContent, $phpcsFile->eolChar));
-                $spaces     = strlen($blankSpace);
-
-                if (in_array($tokens[($stackPtr - 2)]['code'], [T_ABSTRACT, T_FINAL], true) === true
-                    && $spaces !== 1
-                ) {
-                    $prevContent = strtolower($tokens[($stackPtr - 2)]['content']);
-                    $error       = 'Expected 1 space between %s and %s keywords; %s found';
-                    $data        = [
-                        $prevContent,
-                        $stackPtrType,
-                        $spaces,
-                    ];
-
-                    $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeKeyword', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
-                    }
-                }
-            } else if ($tokens[($stackPtr - 2)]['code'] === T_ABSTRACT
-                || $tokens[($stackPtr - 2)]['code'] === T_FINAL
-            ) {
-                $prevContent = strtolower($tokens[($stackPtr - 2)]['content']);
-                $error       = 'Expected 1 space between %s and %s keywords; newline found';
-                $data        = [
-                    $prevContent,
-                    $stackPtrType,
-                ];
-
-                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'NewlineBeforeKeyword', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
-                }
-            }//end if
-        }//end if
-
-        // We'll need the indent of the class/interface declaration for later.
-        $classIndent = 0;
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if ($tokens[$i]['line'] === $tokens[$stackPtr]['line']) {
-                continue;
-            }
-
-            // We changed lines.
-            if ($tokens[($i + 1)]['code'] === T_WHITESPACE) {
-                $classIndent = $tokens[($i + 1)]['length'];
-            }
-
-            break;
-        }
-
-        $className    = null;
-        $checkSpacing = true;
-
-        if ($tokens[$stackPtr]['code'] !== T_ANON_CLASS) {
-            $className = $phpcsFile->findNext(T_STRING, $stackPtr);
-        } else {
-            // Ignore the spacing check if this is a simple anon class.
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if ($next === $tokens[$stackPtr]['scope_opener']
-                && $tokens[$next]['line'] > $tokens[$stackPtr]['line']
-            ) {
-                $checkSpacing = false;
-            }
-        }
-
-        if ($checkSpacing === true) {
-            // Spacing of the keyword.
-            if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-                $gap = 0;
-            } else if ($tokens[($stackPtr + 2)]['line'] !== $tokens[$stackPtr]['line']) {
-                $gap = 'newline';
-            } else {
-                $gap = $tokens[($stackPtr + 1)]['length'];
-            }
-
-            if ($gap !== 1) {
-                $error = 'Expected 1 space after %s keyword; %s found';
-                $data  = [
-                    $stackPtrType,
-                    $gap,
-                ];
-
-                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterKeyword', $data);
-                if ($fix === true) {
-                    if ($gap === 0) {
-                        $phpcsFile->fixer->addContent($stackPtr, ' ');
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
-                    }
-                }
-            }
-        }//end if
-
-        // Check after the class/interface name.
-        if ($className !== null
-            && $tokens[($className + 2)]['line'] === $tokens[$className]['line']
-        ) {
-            $gap = $tokens[($className + 1)]['content'];
-            if (strlen($gap) !== 1) {
-                $found = strlen($gap);
-                $error = 'Expected 1 space after %s name; %s found';
-                $data  = [
-                    $stackPtrType,
-                    $found,
-                ];
-
-                $fix = $phpcsFile->addFixableError($error, $className, 'SpaceAfterName', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($className + 1), ' ');
-                }
-            }
-        }
-
-        $openingBrace = $tokens[$stackPtr]['scope_opener'];
-
-        // Check positions of the extends and implements keywords.
-        $compareToken = $stackPtr;
-        $compareType  = 'name';
-        if ($tokens[$stackPtr]['code'] === T_ANON_CLASS) {
-            if (isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
-                $compareToken = $tokens[$stackPtr]['parenthesis_closer'];
-                $compareType  = 'closing parenthesis';
-            } else {
-                $compareType = 'keyword';
-            }
-        }
-
-        foreach (['extends', 'implements'] as $keywordType) {
-            $keyword = $phpcsFile->findNext(constant('T_'.strtoupper($keywordType)), ($compareToken + 1), $openingBrace);
-            if ($keyword !== false) {
-                if ($tokens[$keyword]['line'] !== $tokens[$compareToken]['line']) {
-                    $error = 'The '.$keywordType.' keyword must be on the same line as the %s '.$compareType;
-                    $data  = [$stackPtrType];
-                    $fix   = $phpcsFile->addFixableError($error, $keyword, ucfirst($keywordType).'Line', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->beginChangeset();
-                        $comments = [];
-
-                        for ($i = ($compareToken + 1); $i < $keyword; ++$i) {
-                            if ($tokens[$i]['code'] === T_COMMENT) {
-                                $comments[] = trim($tokens[$i]['content']);
-                            }
-
-                            if ($tokens[$i]['code'] === T_WHITESPACE
-                                || $tokens[$i]['code'] === T_COMMENT
-                            ) {
-                                $phpcsFile->fixer->replaceToken($i, ' ');
-                            }
-                        }
-
-                        $phpcsFile->fixer->addContent($compareToken, ' ');
-                        if (empty($comments) === false) {
-                            $i = $keyword;
-                            while ($tokens[($i + 1)]['line'] === $tokens[$keyword]['line']) {
-                                ++$i;
-                            }
-
-                            $phpcsFile->fixer->addContentBefore($i, ' '.implode(' ', $comments));
-                        }
-
-                        $phpcsFile->fixer->endChangeset();
-                    }//end if
-                } else {
-                    // Check the whitespace before. Whitespace after is checked
-                    // later by looking at the whitespace before the first class name
-                    // in the list.
-                    $gap = $tokens[($keyword - 1)]['length'];
-                    if ($gap !== 1) {
-                        $error = 'Expected 1 space before '.$keywordType.' keyword; %s found';
-                        $data  = [$gap];
-                        $fix   = $phpcsFile->addFixableError($error, $keyword, 'SpaceBefore'.ucfirst($keywordType), $data);
-                        if ($fix === true) {
-                            $phpcsFile->fixer->replaceToken(($keyword - 1), ' ');
-                        }
-                    }
-                }//end if
-            }//end if
-        }//end foreach
-
-        // Check each of the extends/implements class names. If the extends/implements
-        // keyword is the last content on the line, it means we need to check for
-        // the multi-line format, so we do not include the class names
-        // from the extends/implements list in the following check.
-        // Note that classes can only extend one other class, so they can't use a
-        // multi-line extends format, whereas an interface can extend multiple
-        // other interfaces, and so uses a multi-line extends format.
-        if ($tokens[$stackPtr]['code'] === T_INTERFACE) {
-            $keywordTokenType = T_EXTENDS;
-        } else {
-            $keywordTokenType = T_IMPLEMENTS;
-        }
-
-        $implements          = $phpcsFile->findNext($keywordTokenType, ($stackPtr + 1), $openingBrace);
-        $multiLineImplements = false;
-        if ($implements !== false) {
-            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($openingBrace - 1), $implements, true);
-            if ($tokens[$prev]['line'] !== $tokens[$implements]['line']) {
-                $multiLineImplements = true;
-            }
-        }
-
-        $find = [
-            T_STRING,
-            $keywordTokenType,
-        ];
-
-        if ($className !== null) {
-            $start = $className;
-        } else if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
-            $start = $tokens[$stackPtr]['parenthesis_closer'];
-        } else {
-            $start = $stackPtr;
-        }
-
-        $classNames = [];
-        $nextClass  = $phpcsFile->findNext($find, ($start + 2), ($openingBrace - 1));
-        while ($nextClass !== false) {
-            $classNames[] = $nextClass;
-            $nextClass    = $phpcsFile->findNext($find, ($nextClass + 1), ($openingBrace - 1));
-        }
-
-        $classCount         = count($classNames);
-        $checkingImplements = false;
-        $implementsToken    = null;
-        foreach ($classNames as $n => $className) {
-            if ($tokens[$className]['code'] === $keywordTokenType) {
-                $checkingImplements = true;
-                $implementsToken    = $className;
-
-                continue;
-            }
-
-            if ($checkingImplements === true
-                && $multiLineImplements === true
-                && ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
-                || $tokens[($className - 2)]['code'] !== T_STRING)
-            ) {
-                $prev = $phpcsFile->findPrevious(
-                    [
-                        T_NS_SEPARATOR,
-                        T_WHITESPACE,
-                    ],
-                    ($className - 1),
-                    $implements,
-                    true
-                );
-
-                if ($prev === $implementsToken && $tokens[$className]['line'] !== ($tokens[$prev]['line'] + 1)) {
-                    if ($keywordTokenType === T_EXTENDS) {
-                        $error = 'The first item in a multi-line extends list must be on the line following the extends keyword';
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'FirstExtendsInterfaceSameLine');
-                    } else {
-                        $error = 'The first item in a multi-line implements list must be on the line following the implements keyword';
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'FirstInterfaceSameLine');
-                    }
-
-                    if ($fix === true) {
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($prev + 1); $i < $className; $i++) {
-                            if ($tokens[$i]['code'] !== T_WHITESPACE) {
-                                break;
-                            }
-
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->addNewline($prev);
-                        $phpcsFile->fixer->endChangeset();
-                    }
-                } else if ($tokens[$prev]['line'] !== ($tokens[$className]['line'] - 1)) {
-                    if ($keywordTokenType === T_EXTENDS) {
-                        $error = 'Only one interface may be specified per line in a multi-line extends declaration';
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'ExtendsInterfaceSameLine');
-                    } else {
-                        $error = 'Only one interface may be specified per line in a multi-line implements declaration';
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceSameLine');
-                    }
-
-                    if ($fix === true) {
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($prev + 1); $i < $className; $i++) {
-                            if ($tokens[$i]['code'] !== T_WHITESPACE) {
-                                break;
-                            }
-
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->addNewline($prev);
-                        $phpcsFile->fixer->endChangeset();
-                    }
-                } else {
-                    $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($className - 1), $implements);
-                    if ($tokens[$prev]['line'] !== $tokens[$className]['line']) {
-                        $found = 0;
-                    } else {
-                        $found = $tokens[$prev]['length'];
-                    }
-
-                    $expected = ($classIndent + $this->indent);
-                    if ($found !== $expected) {
-                        $error = 'Expected %s spaces before interface name; %s found';
-                        $data  = [
-                            $expected,
-                            $found,
-                        ];
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceWrongIndent', $data);
-                        if ($fix === true) {
-                            $padding = str_repeat(' ', $expected);
-                            if ($found === 0) {
-                                $phpcsFile->fixer->addContent($prev, $padding);
-                            } else {
-                                $phpcsFile->fixer->replaceToken($prev, $padding);
-                            }
-                        }
-                    }
-                }//end if
-            } else if ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
-                || $tokens[($className - 2)]['code'] !== T_STRING
-            ) {
-                // Not part of a longer fully qualified class name.
-                if ($tokens[($className - 1)]['code'] === T_COMMA
-                    || ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR
-                    && $tokens[($className - 2)]['code'] === T_COMMA)
-                ) {
-                    $error = 'Expected 1 space before "%s"; 0 found';
-                    $data  = [$tokens[$className]['content']];
-                    $fix   = $phpcsFile->addFixableError($error, ($nextComma + 1), 'NoSpaceBeforeName', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->addContentBefore(($nextComma + 1), ' ');
-                    }
-                } else {
-                    if ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR) {
-                        $prev = ($className - 2);
-                    } else {
-                        $prev = ($className - 1);
-                    }
-
-                    $last    = $phpcsFile->findPrevious(T_WHITESPACE, $prev, null, true);
-                    $content = $phpcsFile->getTokensAsString(($last + 1), ($prev - $last));
-                    if ($content !== ' ') {
-                        $found = strlen($content);
-
-                        $error = 'Expected 1 space before "%s"; %s found';
-                        $data  = [
-                            $tokens[$className]['content'],
-                            $found,
-                        ];
-
-                        $fix = $phpcsFile->addFixableError($error, $className, 'SpaceBeforeName', $data);
-                        if ($fix === true) {
-                            if ($tokens[$prev]['code'] === T_WHITESPACE) {
-                                $phpcsFile->fixer->beginChangeset();
-                                $phpcsFile->fixer->replaceToken($prev, ' ');
-                                while ($tokens[--$prev]['code'] === T_WHITESPACE) {
-                                    $phpcsFile->fixer->replaceToken($prev, ' ');
-                                }
-
-                                $phpcsFile->fixer->endChangeset();
-                            } else {
-                                $phpcsFile->fixer->addContent($prev, ' ');
-                            }
-                        }
-                    }//end if
-                }//end if
-            }//end if
-
-            if ($checkingImplements === true
-                && $tokens[($className + 1)]['code'] !== T_NS_SEPARATOR
-                && $tokens[($className + 1)]['code'] !== T_COMMA
-            ) {
-                if ($n !== ($classCount - 1)) {
-                    // This is not the last class name, and the comma
-                    // is not where we expect it to be.
-                    if ($tokens[($className + 2)]['code'] !== $keywordTokenType) {
-                        $error = 'Expected 0 spaces between "%s" and comma; %s found';
-                        $data  = [
-                            $tokens[$className]['content'],
-                            $tokens[($className + 1)]['length'],
-                        ];
-
-                        $fix = $phpcsFile->addFixableError($error, $className, 'SpaceBeforeComma', $data);
-                        if ($fix === true) {
-                            $phpcsFile->fixer->replaceToken(($className + 1), '');
-                        }
-                    }
-                }
-
-                $nextComma = $phpcsFile->findNext(T_COMMA, $className);
-            } else {
-                $nextComma = ($className + 1);
-            }//end if
-        }//end foreach
-
-    }//end processOpen()
-
-
-    /**
-     * Processes the closing section of a class declaration.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function processClose(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check that the closing brace comes right after the code body.
-        $closeBrace  = $tokens[$stackPtr]['scope_closer'];
-        $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBrace - 1), null, true);
-        if ($prevContent !== $tokens[$stackPtr]['scope_opener']
-            && $tokens[$prevContent]['line'] !== ($tokens[$closeBrace]['line'] - 1)
-        ) {
-            $error = 'The closing brace for the %s must go on the next line after the body';
-            $data  = [$tokens[$stackPtr]['content']];
-            $fix   = $phpcsFile->addFixableError($error, $closeBrace, 'CloseBraceAfterBody', $data);
-
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = ($prevContent + 1); $i < $closeBrace; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                if (strpos($tokens[$prevContent]['content'], $phpcsFile->eolChar) === false) {
-                    $phpcsFile->fixer->replaceToken($closeBrace, $phpcsFile->eolChar.$tokens[$closeBrace]['content']);
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-        if ($tokens[$stackPtr]['code'] !== T_ANON_CLASS) {
-            // Check the closing brace is on it's own line, but allow
-            // for comments like "//end class".
-            $ignoreTokens   = Tokens::$phpcsCommentTokens;
-            $ignoreTokens[] = T_WHITESPACE;
-            $ignoreTokens[] = T_COMMENT;
-            $ignoreTokens[] = T_SEMICOLON;
-            $ignoreTokens[] = T_COMMA;
-            $nextContent    = $phpcsFile->findNext($ignoreTokens, ($closeBrace + 1), null, true);
-            if ($tokens[$nextContent]['content'] !== $phpcsFile->eolChar
-                && $tokens[$nextContent]['line'] === $tokens[$closeBrace]['line']
-            ) {
-                $type  = strtolower($tokens[$stackPtr]['content']);
-                $error = 'Closing %s brace must be on a line by itself';
-                $data  = [$type];
-                $phpcsFile->addError($error, $closeBrace, 'CloseBraceSameLine', $data);
-            }
-        }
-
-    }//end processClose()
+	/**
+	 * The number of spaces code should be indented.
+	 *
+	 * @var integer
+	 */
+	public $indent = 4;
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		// We want all the errors from the PEAR standard, plus some of our own.
+		parent::process($phpcsFile, $stackPtr);
+
+		// Just in case.
+		$tokens = $phpcsFile->getTokens();
+		if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+			return;
+		}
+
+		$this->processOpen($phpcsFile, $stackPtr);
+		$this->processClose($phpcsFile, $stackPtr);
+
+	}//end process()
+
+
+	/**
+	 * Processes the opening section of a class declaration.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function processOpen(File $phpcsFile, $stackPtr)
+	{
+		$tokens       = $phpcsFile->getTokens();
+		$stackPtrType = strtolower($tokens[$stackPtr]['content']);
+
+		// Check alignment of the keyword and braces.
+		if ($tokens[($stackPtr - 1)]['code'] === T_WHITESPACE) {
+			$prevContent = $tokens[($stackPtr - 1)]['content'];
+			if ($prevContent !== $phpcsFile->eolChar) {
+				$blankSpace = substr($prevContent, strpos($prevContent, $phpcsFile->eolChar));
+				$spaces     = strlen($blankSpace);
+
+				if (in_array($tokens[($stackPtr - 2)]['code'], [T_ABSTRACT, T_FINAL], true) === true
+					&& $spaces !== 1
+				) {
+					$prevContent = strtolower($tokens[($stackPtr - 2)]['content']);
+					$error       = 'Expected 1 space between %s and %s keywords; %s found';
+					$data        = [
+						$prevContent,
+						$stackPtrType,
+						$spaces,
+					];
+
+					$fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeKeyword', $data);
+					if ($fix === true) {
+						$phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+					}
+				}
+			} else if ($tokens[($stackPtr - 2)]['code'] === T_ABSTRACT
+				|| $tokens[($stackPtr - 2)]['code'] === T_FINAL
+			) {
+				$prevContent = strtolower($tokens[($stackPtr - 2)]['content']);
+				$error       = 'Expected 1 space between %s and %s keywords; newline found';
+				$data        = [
+					$prevContent,
+					$stackPtrType,
+				];
+
+				$fix = $phpcsFile->addFixableError($error, $stackPtr, 'NewlineBeforeKeyword', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+				}
+			}//end if
+		}//end if
+
+		// We'll need the indent of the class/interface declaration for later.
+		$classIndent = 0;
+		for ($i = ($stackPtr - 1); $i > 0; $i--) {
+			if ($tokens[$i]['line'] === $tokens[$stackPtr]['line']) {
+				continue;
+			}
+
+			// We changed lines.
+			if ($tokens[($i + 1)]['code'] === T_WHITESPACE) {
+				$classIndent = $tokens[($i + 1)]['length'];
+			}
+
+			break;
+		}
+
+		$className    = null;
+		$checkSpacing = true;
+
+		if ($tokens[$stackPtr]['code'] !== T_ANON_CLASS) {
+			$className = $phpcsFile->findNext(T_STRING, $stackPtr);
+		} else {
+			// Ignore the spacing check if this is a simple anon class.
+			$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+			if ($next === $tokens[$stackPtr]['scope_opener']
+				&& $tokens[$next]['line'] > $tokens[$stackPtr]['line']
+			) {
+				$checkSpacing = false;
+			}
+		}
+
+		if ($checkSpacing === true) {
+			// Spacing of the keyword.
+			if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
+				$gap = 0;
+			} else if ($tokens[($stackPtr + 2)]['line'] !== $tokens[$stackPtr]['line']) {
+				$gap = 'newline';
+			} else {
+				$gap = $tokens[($stackPtr + 1)]['length'];
+			}
+
+			if ($gap !== 1) {
+				$error = 'Expected 1 space after %s keyword; %s found';
+				$data  = [
+					$stackPtrType,
+					$gap,
+				];
+
+				$fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterKeyword', $data);
+				if ($fix === true) {
+					if ($gap === 0) {
+						$phpcsFile->fixer->addContent($stackPtr, ' ');
+					} else {
+						$phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+					}
+				}
+			}
+		}//end if
+
+		// Check after the class/interface name.
+		if ($className !== null
+			&& $tokens[($className + 2)]['line'] === $tokens[$className]['line']
+		) {
+			$gap = $tokens[($className + 1)]['content'];
+			if (strlen($gap) !== 1) {
+				$found = strlen($gap);
+				$error = 'Expected 1 space after %s name; %s found';
+				$data  = [
+					$stackPtrType,
+					$found,
+				];
+
+				$fix = $phpcsFile->addFixableError($error, $className, 'SpaceAfterName', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($className + 1), ' ');
+				}
+			}
+		}
+
+		$openingBrace = $tokens[$stackPtr]['scope_opener'];
+
+		// Check positions of the extends and implements keywords.
+		$compareToken = $stackPtr;
+		$compareType  = 'name';
+		if ($tokens[$stackPtr]['code'] === T_ANON_CLASS) {
+			if (isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
+				$compareToken = $tokens[$stackPtr]['parenthesis_closer'];
+				$compareType  = 'closing parenthesis';
+			} else {
+				$compareType = 'keyword';
+			}
+		}
+
+		foreach (['extends', 'implements'] as $keywordType) {
+			$keyword = $phpcsFile->findNext(constant('T_'.strtoupper($keywordType)), ($compareToken + 1), $openingBrace);
+			if ($keyword !== false) {
+				if ($tokens[$keyword]['line'] !== $tokens[$compareToken]['line']) {
+					$error = 'The '.$keywordType.' keyword must be on the same line as the %s '.$compareType;
+					$data  = [$stackPtrType];
+					$fix   = $phpcsFile->addFixableError($error, $keyword, ucfirst($keywordType).'Line', $data);
+					if ($fix === true) {
+						$phpcsFile->fixer->beginChangeset();
+						$comments = [];
+
+						for ($i = ($compareToken + 1); $i < $keyword; ++$i) {
+							if ($tokens[$i]['code'] === T_COMMENT) {
+								$comments[] = trim($tokens[$i]['content']);
+							}
+
+							if ($tokens[$i]['code'] === T_WHITESPACE
+								|| $tokens[$i]['code'] === T_COMMENT
+							) {
+								$phpcsFile->fixer->replaceToken($i, ' ');
+							}
+						}
+
+						$phpcsFile->fixer->addContent($compareToken, ' ');
+						if (empty($comments) === false) {
+							$i = $keyword;
+							while ($tokens[($i + 1)]['line'] === $tokens[$keyword]['line']) {
+								++$i;
+							}
+
+							$phpcsFile->fixer->addContentBefore($i, ' '.implode(' ', $comments));
+						}
+
+						$phpcsFile->fixer->endChangeset();
+					}//end if
+				} else {
+					// Check the whitespace before. Whitespace after is checked
+					// later by looking at the whitespace before the first class name
+					// in the list.
+					$gap = $tokens[($keyword - 1)]['length'];
+					if ($gap !== 1) {
+						$error = 'Expected 1 space before '.$keywordType.' keyword; %s found';
+						$data  = [$gap];
+						$fix   = $phpcsFile->addFixableError($error, $keyword, 'SpaceBefore'.ucfirst($keywordType), $data);
+						if ($fix === true) {
+							$phpcsFile->fixer->replaceToken(($keyword - 1), ' ');
+						}
+					}
+				}//end if
+			}//end if
+		}//end foreach
+
+		// Check each of the extends/implements class names. If the extends/implements
+		// keyword is the last content on the line, it means we need to check for
+		// the multi-line format, so we do not include the class names
+		// from the extends/implements list in the following check.
+		// Note that classes can only extend one other class, so they can't use a
+		// multi-line extends format, whereas an interface can extend multiple
+		// other interfaces, and so uses a multi-line extends format.
+		if ($tokens[$stackPtr]['code'] === T_INTERFACE) {
+			$keywordTokenType = T_EXTENDS;
+		} else {
+			$keywordTokenType = T_IMPLEMENTS;
+		}
+
+		$implements          = $phpcsFile->findNext($keywordTokenType, ($stackPtr + 1), $openingBrace);
+		$multiLineImplements = false;
+		if ($implements !== false) {
+			$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($openingBrace - 1), $implements, true);
+			if ($tokens[$prev]['line'] !== $tokens[$implements]['line']) {
+				$multiLineImplements = true;
+			}
+		}
+
+		$find = [
+			T_STRING,
+			$keywordTokenType,
+		];
+
+		if ($className !== null) {
+			$start = $className;
+		} else if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
+			$start = $tokens[$stackPtr]['parenthesis_closer'];
+		} else {
+			$start = $stackPtr;
+		}
+
+		$classNames = [];
+		$nextClass  = $phpcsFile->findNext($find, ($start + 2), ($openingBrace - 1));
+		while ($nextClass !== false) {
+			$classNames[] = $nextClass;
+			$nextClass    = $phpcsFile->findNext($find, ($nextClass + 1), ($openingBrace - 1));
+		}
+
+		$classCount         = count($classNames);
+		$checkingImplements = false;
+		$implementsToken    = null;
+		foreach ($classNames as $n => $className) {
+			if ($tokens[$className]['code'] === $keywordTokenType) {
+				$checkingImplements = true;
+				$implementsToken    = $className;
+
+				continue;
+			}
+
+			if ($checkingImplements === true
+				&& $multiLineImplements === true
+				&& ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
+				|| $tokens[($className - 2)]['code'] !== T_STRING)
+			) {
+				$prev = $phpcsFile->findPrevious(
+					[
+						T_NS_SEPARATOR,
+						T_WHITESPACE,
+					],
+					($className - 1),
+					$implements,
+					true
+				);
+
+				if ($prev === $implementsToken && $tokens[$className]['line'] !== ($tokens[$prev]['line'] + 1)) {
+					if ($keywordTokenType === T_EXTENDS) {
+						$error = 'The first item in a multi-line extends list must be on the line following the extends keyword';
+						$fix   = $phpcsFile->addFixableError($error, $className, 'FirstExtendsInterfaceSameLine');
+					} else {
+						$error = 'The first item in a multi-line implements list must be on the line following the implements keyword';
+						$fix   = $phpcsFile->addFixableError($error, $className, 'FirstInterfaceSameLine');
+					}
+
+					if ($fix === true) {
+						$phpcsFile->fixer->beginChangeset();
+						for ($i = ($prev + 1); $i < $className; $i++) {
+							if ($tokens[$i]['code'] !== T_WHITESPACE) {
+								break;
+							}
+
+							$phpcsFile->fixer->replaceToken($i, '');
+						}
+
+						$phpcsFile->fixer->addNewline($prev);
+						$phpcsFile->fixer->endChangeset();
+					}
+				} else if ($tokens[$prev]['line'] !== ($tokens[$className]['line'] - 1)) {
+					if ($keywordTokenType === T_EXTENDS) {
+						$error = 'Only one interface may be specified per line in a multi-line extends declaration';
+						$fix   = $phpcsFile->addFixableError($error, $className, 'ExtendsInterfaceSameLine');
+					} else {
+						$error = 'Only one interface may be specified per line in a multi-line implements declaration';
+						$fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceSameLine');
+					}
+
+					if ($fix === true) {
+						$phpcsFile->fixer->beginChangeset();
+						for ($i = ($prev + 1); $i < $className; $i++) {
+							if ($tokens[$i]['code'] !== T_WHITESPACE) {
+								break;
+							}
+
+							$phpcsFile->fixer->replaceToken($i, '');
+						}
+
+						$phpcsFile->fixer->addNewline($prev);
+						$phpcsFile->fixer->endChangeset();
+					}
+				} else {
+					$prev = $phpcsFile->findPrevious(T_WHITESPACE, ($className - 1), $implements);
+					if ($tokens[$prev]['line'] !== $tokens[$className]['line']) {
+						$found = 0;
+					} else {
+						$found = $tokens[$prev]['length'];
+					}
+
+					$expected = ($classIndent + $this->indent);
+					if ($found !== $expected) {
+						$error = 'Expected %s spaces before interface name; %s found';
+						$data  = [
+							$expected,
+							$found,
+						];
+						$fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceWrongIndent', $data);
+						if ($fix === true) {
+							$padding = str_repeat(' ', $expected);
+							if ($found === 0) {
+								$phpcsFile->fixer->addContent($prev, $padding);
+							} else {
+								$phpcsFile->fixer->replaceToken($prev, $padding);
+							}
+						}
+					}
+				}//end if
+			} else if ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
+				|| $tokens[($className - 2)]['code'] !== T_STRING
+			) {
+				// Not part of a longer fully qualified class name.
+				if ($tokens[($className - 1)]['code'] === T_COMMA
+					|| ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR
+					&& $tokens[($className - 2)]['code'] === T_COMMA)
+				) {
+					$error = 'Expected 1 space before "%s"; 0 found';
+					$data  = [$tokens[$className]['content']];
+					$fix   = $phpcsFile->addFixableError($error, ($nextComma + 1), 'NoSpaceBeforeName', $data);
+					if ($fix === true) {
+						$phpcsFile->fixer->addContentBefore(($nextComma + 1), ' ');
+					}
+				} else {
+					if ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR) {
+						$prev = ($className - 2);
+					} else {
+						$prev = ($className - 1);
+					}
+
+					$last    = $phpcsFile->findPrevious(T_WHITESPACE, $prev, null, true);
+					$content = $phpcsFile->getTokensAsString(($last + 1), ($prev - $last));
+					if ($content !== ' ') {
+						$found = strlen($content);
+
+						$error = 'Expected 1 space before "%s"; %s found';
+						$data  = [
+							$tokens[$className]['content'],
+							$found,
+						];
+
+						$fix = $phpcsFile->addFixableError($error, $className, 'SpaceBeforeName', $data);
+						if ($fix === true) {
+							if ($tokens[$prev]['code'] === T_WHITESPACE) {
+								$phpcsFile->fixer->beginChangeset();
+								$phpcsFile->fixer->replaceToken($prev, ' ');
+								while ($tokens[--$prev]['code'] === T_WHITESPACE) {
+									$phpcsFile->fixer->replaceToken($prev, ' ');
+								}
+
+								$phpcsFile->fixer->endChangeset();
+							} else {
+								$phpcsFile->fixer->addContent($prev, ' ');
+							}
+						}
+					}//end if
+				}//end if
+			}//end if
+
+			if ($checkingImplements === true
+				&& $tokens[($className + 1)]['code'] !== T_NS_SEPARATOR
+				&& $tokens[($className + 1)]['code'] !== T_COMMA
+			) {
+				if ($n !== ($classCount - 1)) {
+					// This is not the last class name, and the comma
+					// is not where we expect it to be.
+					if ($tokens[($className + 2)]['code'] !== $keywordTokenType) {
+						$error = 'Expected 0 spaces between "%s" and comma; %s found';
+						$data  = [
+							$tokens[$className]['content'],
+							$tokens[($className + 1)]['length'],
+						];
+
+						$fix = $phpcsFile->addFixableError($error, $className, 'SpaceBeforeComma', $data);
+						if ($fix === true) {
+							$phpcsFile->fixer->replaceToken(($className + 1), '');
+						}
+					}
+				}
+
+				$nextComma = $phpcsFile->findNext(T_COMMA, $className);
+			} else {
+				$nextComma = ($className + 1);
+			}//end if
+		}//end foreach
+
+	}//end processOpen()
+
+
+	/**
+	 * Processes the closing section of a class declaration.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function processClose(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check that the closing brace comes right after the code body.
+		$closeBrace  = $tokens[$stackPtr]['scope_closer'];
+		$prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBrace - 1), null, true);
+		if ($prevContent !== $tokens[$stackPtr]['scope_opener']
+			&& $tokens[$prevContent]['line'] !== ($tokens[$closeBrace]['line'] - 1)
+		) {
+			$error = 'The closing brace for the %s must go on the next line after the body';
+			$data  = [$tokens[$stackPtr]['content']];
+			$fix   = $phpcsFile->addFixableError($error, $closeBrace, 'CloseBraceAfterBody', $data);
+
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				for ($i = ($prevContent + 1); $i < $closeBrace; $i++) {
+					$phpcsFile->fixer->replaceToken($i, '');
+				}
+
+				if (strpos($tokens[$prevContent]['content'], $phpcsFile->eolChar) === false) {
+					$phpcsFile->fixer->replaceToken($closeBrace, $phpcsFile->eolChar.$tokens[$closeBrace]['content']);
+				}
+
+				$phpcsFile->fixer->endChangeset();
+			}
+		}//end if
+
+		if ($tokens[$stackPtr]['code'] !== T_ANON_CLASS) {
+			// Check the closing brace is on it's own line, but allow
+			// for comments like "//end class".
+			$ignoreTokens   = Tokens::$phpcsCommentTokens;
+			$ignoreTokens[] = T_WHITESPACE;
+			$ignoreTokens[] = T_COMMENT;
+			$ignoreTokens[] = T_SEMICOLON;
+			$ignoreTokens[] = T_COMMA;
+			$nextContent    = $phpcsFile->findNext($ignoreTokens, ($closeBrace + 1), null, true);
+			if ($tokens[$nextContent]['content'] !== $phpcsFile->eolChar
+				&& $tokens[$nextContent]['line'] === $tokens[$closeBrace]['line']
+			) {
+				$type  = strtolower($tokens[$stackPtr]['content']);
+				$error = 'Closing %s brace must be on a line by itself';
+				$data  = [$type];
+				$phpcsFile->addError($error, $closeBrace, 'CloseBraceSameLine', $data);
+			}
+		}
+
+	}//end processClose()
 
 
 }//end class