eventespresso / event-espresso-core

vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='')
+    public function getErrorList($testFile = '')
     {
         switch ($testFile) {
         case 'EndFileNewlineUnitTest.1.inc':
@@ -57,7 +57,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='')
+    public function getWarningList($testFile = '')
     {
         return [];
 

Indentation +42 added lines, -42 removed lines

@@ -15,52 +15,52 @@
 {
 
 
-    /**
-     * 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 'EndFileNewlineUnitTest.1.inc':
-        case 'EndFileNewlineUnitTest.3.inc':
-        case 'EndFileNewlineUnitTest.6.inc':
-        case 'EndFileNewlineUnitTest.7.inc':
-        case 'EndFileNewlineUnitTest.9.inc':
-        case 'EndFileNewlineUnitTest.10.inc':
-            return [2 => 1];
-        case 'EndFileNewlineUnitTest.11.inc':
-        case 'EndFileNewlineUnitTest.12.inc':
-        case 'EndFileNewlineUnitTest.13.inc':
-            return [1 => 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 'EndFileNewlineUnitTest.1.inc':
+		case 'EndFileNewlineUnitTest.3.inc':
+		case 'EndFileNewlineUnitTest.6.inc':
+		case 'EndFileNewlineUnitTest.7.inc':
+		case 'EndFileNewlineUnitTest.9.inc':
+		case 'EndFileNewlineUnitTest.10.inc':
+			return [2 => 1];
+		case 'EndFileNewlineUnitTest.11.inc':
+		case 'EndFileNewlineUnitTest.12.inc':
+		case 'EndFileNewlineUnitTest.13.inc':
+			return [1 => 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.
-     *
-     * @param string $testFile The name of the file being tested.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList($testFile='')
-    {
-        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.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList($testFile='')
+	{
+		return [];
 
-    }//end getWarningList()
+	}//end getWarningList()
 
 
 }//end class

Switch Indentation +13 added lines, -13 removed lines

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

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