Symplify / PHP7_CodeSniffer

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

Indentation +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
                     156 => 1,
                     168 => 1,
                     184 => 1,
-                   );
+                    );
         }
 
         if ($testFile === 'ScopeIndentUnitTest.3.inc') {
@@ -95,7 +95,7 @@ 
                     6  => 1,
                     7  => 1,
                     10 => 1,
-                   );
+                    );
         }
 
         return array(
@@ -159,7 +159,7 @@ 
                 1117 => 1,
                 1119 => 1,
                 1122 => 1,
-               );
+                );
 
     }//end getErrorList()
 

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ScopeIndentUnitTest.inc')
+    public function getErrorList($testFile = 'ScopeIndentUnitTest.inc')
     {
         if ($testFile === 'ScopeIndentUnitTest.1.js') {
             return array(

CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php

Switch Indentation +26 added lines, -26 removed lines

@@ -43,32 +43,32 @@
     public function getErrorList($testFile='DisallowSpaceIndentUnitTest.inc')
     {
         switch ($testFile) {
-        case 'DisallowSpaceIndentUnitTest.inc':
-            return array(
-                    5  => 1,
-                    9  => 1,
-                    15 => 1,
-                    18 => 1,
-                    19 => 1,
-                    24 => 1,
-                    30 => 1,
-                    35 => 1,
-                    50 => 1,
-                    55 => 1,
-                    58 => 1,
-                    59 => 1,
-                    60 => 1,
-                   );
-            break;
-        case 'DisallowSpaceIndentUnitTest.js':
-            return array(3 => 1);
-            break;
-        case 'DisallowSpaceIndentUnitTest.css':
-            return array(2 => 1);
-            break;
-        default:
-            return array();
-            break;
+            case 'DisallowSpaceIndentUnitTest.inc':
+                return array(
+                        5  => 1,
+                        9  => 1,
+                        15 => 1,
+                        18 => 1,
+                        19 => 1,
+                        24 => 1,
+                        30 => 1,
+                        35 => 1,
+                        50 => 1,
+                        55 => 1,
+                        58 => 1,
+                        59 => 1,
+                        60 => 1,
+                       );
+                break;
+            case 'DisallowSpaceIndentUnitTest.js':
+                return array(3 => 1);
+                break;
+            case 'DisallowSpaceIndentUnitTest.css':
+                return array(2 => 1);
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getErrorList()

Spacing +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         case 'CharacterBeforePHPOpeningTagUnitTest.1.inc':
             return array(
                     2 => 1,
-                   );
+                    );
             break;
         default:
             return array();

CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.inc

Indentation +12 added lines, -12 removed lines

@@ -11,29 +11,29 @@
     this is some text
 EOF;
 
-	$correctVar = false;
+    $correctVar = false;
     $correctVar = true;
 
 // Indent with spaces is not allowed
- $hello = array();
-   $world = '';
+    $hello = array();
+    $world = '';
 // here the indention is mixed with tabs and spaces
 // [tab][space][space][space][tab]return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
-	   	return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
+            return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
 // [space][space][space][tab]return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
-   	return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
+        return "<$name$xmlns$type_str $atts xsi:nil=\"true\"/>";
 // Doc comments are indent with tabs and one space
 //[tab]/**
 //[tab][space]*
-	/**
-	 * CVS revision for HTTP headers.
+    /**
+     * CVS revision for HTTP headers.
      *
-	  * @var string
-	 * @access private
-	 */
-	/**
+     * @var string
+     * @access private
+     */
+    /**
      *
-	*/
+     */
 
 $str = 'hello
         there';

CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php

Indentation +3 added lines, -3 removed lines

@@ -79,20 +79,20 @@
                     46 => 1,
                     47 => 1,
                     48 => 1,
-                   );
+                    );
             break;
         case 'DisallowTabIndentUnitTest.js':
             return array(
                     3 => 1,
                     5 => 1,
                     6 => 1,
-                   );
+                    );
             break;
         case 'DisallowTabIndentUnitTest.css':
             return array(
                     1 => 1,
                     2 => 1,
-                   );
+                    );
             break;
         default:
             return array();

Switch Indentation +39 added lines, -39 removed lines

@@ -58,45 +58,45 @@
     public function getErrorList($testFile='DisallowTabIndentUnitTest.inc')
     {
         switch ($testFile) {
-        case 'DisallowTabIndentUnitTest.inc':
-            return array(
-                    5  => 2,
-                    9  => 1,
-                    15 => 1,
-                    20 => 2,
-                    21 => 1,
-                    22 => 2,
-                    23 => 1,
-                    24 => 2,
-                    31 => 1,
-                    32 => 2,
-                    33 => 2,
-                    41 => 1,
-                    42 => 1,
-                    43 => 1,
-                    44 => 1,
-                    45 => 1,
-                    46 => 1,
-                    47 => 1,
-                    48 => 1,
-                   );
-            break;
-        case 'DisallowTabIndentUnitTest.js':
-            return array(
-                    3 => 1,
-                    5 => 1,
-                    6 => 1,
-                   );
-            break;
-        case 'DisallowTabIndentUnitTest.css':
-            return array(
-                    1 => 1,
-                    2 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'DisallowTabIndentUnitTest.inc':
+                return array(
+                        5  => 2,
+                        9  => 1,
+                        15 => 1,
+                        20 => 2,
+                        21 => 1,
+                        22 => 2,
+                        23 => 1,
+                        24 => 2,
+                        31 => 1,
+                        32 => 2,
+                        33 => 2,
+                        41 => 1,
+                        42 => 1,
+                        43 => 1,
+                        44 => 1,
+                        45 => 1,
+                        46 => 1,
+                        47 => 1,
+                        48 => 1,
+                       );
+                break;
+            case 'DisallowTabIndentUnitTest.js':
+                return array(
+                        3 => 1,
+                        5 => 1,
+                        6 => 1,
+                       );
+                break;
+            case 'DisallowTabIndentUnitTest.css':
+                return array(
+                        1 => 1,
+                        2 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getErrorList()

Spacing +1 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      *
      * @param string $testFile The name of the file being tested.
      *
-     * @return array
+     * @return string[]
      */
     public function getCliValues($testFile)
     {

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

Indentation +687 added lines, -687 removed lines

@@ -2,40 +2,40 @@ 
 <meta name="twitter:site" content="<?php echo $metaTagsData['twitter:site']; ?>">
 <?php
 class Test {
-	function __construct()
-	{
-	   $this->hello();
-	}
-
-   function hello()
-	{
-		echo 'hello';
+    function __construct()
+    {
+        $this->hello();
+    }
+
+    function hello()
+    {
+        echo 'hello';
 }//end hello()
 
-	function hello2()
-	{
-	   if (TRUE) {
-			echo 'hello'; // no error here as its more than 4 spaces.
-		} else {
-		echo 'bye';
-		}
-
-		while (TRUE) {
-		   echo 'hello';
-		 }
-
-	   do {
-		 echo 'hello';
-	   } while (TRUE);
-   }
-
-	function hello3()
-	{
-		switch ($hello) {
-			case 'hello':
-			break;
-		}
-	}
+    function hello2()
+    {
+        if (TRUE) {
+            echo 'hello'; // no error here as its more than 4 spaces.
+        } else {
+        echo 'bye';
+        }
+
+        while (TRUE) {
+            echo 'hello';
+            }
+
+        do {
+            echo 'hello';
+        } while (TRUE);
+    }
+
+    function hello3()
+    {
+        switch ($hello) {
+            case 'hello':
+            break;
+        }
+    }
 
 }
 
@@ -45,7 +45,7 @@ 
 <body>
 <?php
 if ($form->validate()) {
-	$safe = $form->getSubmitValues();
+    $safe = $form->getSubmitValues();
 }
 ?>
 </pre>
@@ -53,62 +53,62 @@ 
 
 class Test2
 {
-	function __construct()
-	{
-	//    $this->open(); // error here
-	}
-
-	public function open()
-	{
-		// Some inline stuff that shouldn't error
-		if (TRUE) echo 'hello';
-		foreach ($tokens as $token) echo $token;
-	}
-
-	/**
-	 * This is a comment 1.
-	 * This is a comment 2.
-	 * This is a comment 3.
-	 * This is a comment 4.
-	 */
-	public function close()
-	{
-		// All ok.
-		if (TRUE) {
-			if (TRUE) {
-			} else if (FALSE) {
-				foreach ($tokens as $token) {
-					switch ($token) {
-						case '1':
-						case '2':
-							if (true) {
-								if (false) {
-									if (false) {
-										if (false) {
-											echo 'hello';
-										}
-									}
-								}
-							}
-						break;
-						case '5':
-						break;
-					}
-					do {
-						while (true) {
-							foreach ($tokens as $token) {
-								for ($i = 0; $i < $token; $i++) {
-									echo 'hello';
-								}
-							}
-						}
-					} while (true);
-				}
-			}
-		}
-	}
-
-	/*
+    function __construct()
+    {
+    //    $this->open(); // error here
+    }
+
+    public function open()
+    {
+        // Some inline stuff that shouldn't error
+        if (TRUE) echo 'hello';
+        foreach ($tokens as $token) echo $token;
+    }
+
+    /**
+     * This is a comment 1.
+     * This is a comment 2.
+     * This is a comment 3.
+     * This is a comment 4.
+     */
+    public function close()
+    {
+        // All ok.
+        if (TRUE) {
+            if (TRUE) {
+            } else if (FALSE) {
+                foreach ($tokens as $token) {
+                    switch ($token) {
+                        case '1':
+                        case '2':
+                            if (true) {
+                                if (false) {
+                                    if (false) {
+                                        if (false) {
+                                            echo 'hello';
+                                        }
+                                    }
+                                }
+                            }
+                        break;
+                        case '5':
+                        break;
+                    }
+                    do {
+                        while (true) {
+                            foreach ($tokens as $token) {
+                                for ($i = 0; $i < $token; $i++) {
+                                    echo 'hello';
+                                }
+                            }
+                        }
+                    } while (true);
+                }
+            }
+        }
+    }
+
+    /*
 	  This is another c style comment 1.
 	  This is another c style comment 2.
 	  This is another c style comment 3.
@@ -116,74 +116,74 @@ 
 	  This is another c style comment 5.
 	*/
 
-	/* This is a T_COMMENT
+    /* This is a T_COMMENT
 	*
 	*
 	*
    */
 
-	/** This is a T_DOC_COMMENT
-   */
+    /** This is a T_DOC_COMMENT
+     */
 
-	/*
+    /*
 	  This T_COMMENT has a newline in it.
 
 	*/
 
-	public function read()
-	{
-		echo 'hello';
-
-		// no errors below.
-		$array = array(
-				  'this',
-				  'that' => array(
-							 'hello',
-							 'hello again' => array(
-											   'hello',
-											  ),
-							),
-				 );
-	}
+    public function read()
+    {
+        echo 'hello';
+
+        // no errors below.
+        $array = array(
+                    'this',
+                    'that' => array(
+                                'hello',
+                                'hello again' => array(
+                                                'hello',
+                                                ),
+                            ),
+                    );
+    }
 }
 
 abstract class Test3
 {
-	public function parse()
-	{
-
-		foreach ($t as $ndx => $token) {
-			if (is_array($token)) {
-				echo 'here';
-			} else {
-				$ts[] = array("token" => $token, "value" => '');
-
-				$last = count($ts) - 1;
-
-				switch ($token) {
-					case '(':
-
-						if ($last >= 3 &&
-							$ts[0]['token'] != T_CLASS &&
-							$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-							$ts[$last - 3]['token'] == T_VARIABLE ) {
-
-
-							if (true) {
-							    echo 'hello';
-							}
-						}
-						array_push($braces, $token);
-					break;
-				}
-			}
-		}
-	}
+    public function parse()
+    {
+
+        foreach ($t as $ndx => $token) {
+            if (is_array($token)) {
+                echo 'here';
+            } else {
+                $ts[] = array("token" => $token, "value" => '');
+
+                $last = count($ts) - 1;
+
+                switch ($token) {
+                    case '(':
+
+                        if ($last >= 3 &&
+                            $ts[0]['token'] != T_CLASS &&
+                            $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                            $ts[$last - 3]['token'] == T_VARIABLE ) {
+
+
+                            if (true) {
+                                echo 'hello';
+                            }
+                        }
+                        array_push($braces, $token);
+                    break;
+                }
+            }
+        }
+    }
 }
 
 public function test()
 {
-	$o = <<<EOF
+    $o = <<<EOF
 this is some text
 this is some text
 this is some text
@@ -192,24 +192,24 @@ 
 this is some text
 EOF;
 
-	return $o;
+    return $o;
 }
 
 if ($a === true || $a === true || $a === true || $a === true ||
-	$a === true || $a === true || $a === true || $a === true) {
+    $a === true || $a === true || $a === true || $a === true) {
 
-	echo 'hello';
+    echo 'hello';
 }
 
 if ($true) {
-	/* First comment line
+    /* First comment line
 	*
 	* Comment test here
 	* Comment test here
 	*
 	*/
 
-	/* First comment line
+    /* First comment line
 	*
 	* Comment test here
 	* Comment test here
@@ -219,93 +219,93 @@ 
 
 function test()
 {
-	/* taken from http://de3.php.net/manual/en/reserved.php */
-	# $m[] = 'declare';
-   /* taken from http://de3.php.net/manual/en/reserved.php */
-   # $m[] = 'declare';
+    /* taken from http://de3.php.net/manual/en/reserved.php */
+    # $m[] = 'declare';
+    /* taken from http://de3.php.net/manual/en/reserved.php */
+    # $m[] = 'declare';
 }
 
 foreach ($elements as $element) {
-	if ($something) {
-		// Do IF.
-	} else if ($somethingElse) {
-		// Do ELSE.
-	}
+    if ($something) {
+        // Do IF.
+    } else if ($somethingElse) {
+        // Do ELSE.
+    }
 }
 
 if ($condition) {
-	echo "This is a long
+    echo "This is a long
 string that spans $numLines lines
 without indenting.
 ";
 }
 
 if ($condition) {
-	echo 'This is a long
+    echo 'This is a long
     string that spans nultiple lines
     with indenting.
     ';
 }
 
 if ($condition) {
-	echo 'This is a long
+    echo 'This is a long
           string that spans nultiple lines
           with indenting.';
 }
 
 switch ($foo) {
-	case 1:
-		switch ($bar) {
-			default:
-				echo $string{1};
-		}
-	break;
+    case 1:
+        switch ($bar) {
+            default:
+                echo $string{1};
+        }
+    break;
 }
 
 function temp($foo, $bar) {
-	switch ($foo) {
-		case 1:
-			switch ($bar) {
-				default:
-				return $foo;
-			}
-		break;
-	}
+    switch ($foo) {
+        case 1:
+            switch ($bar) {
+                default:
+                return $foo;
+            }
+        break;
+    }
 }
 
 switch ($foo) {
-	case 1:
-		switch ($bar) {
-		default:
-			if ($something) {
-				echo $string{1};
-			} else if ($else) {
-				switch ($else) {
-				default:
-				}
-			}
-		}
-	break;
+    case 1:
+        switch ($bar) {
+        default:
+            if ($something) {
+                echo $string{1};
+            } else if ($else) {
+                switch ($else) {
+                default:
+                }
+            }
+        }
+    break;
 }
 
 switch ($name) {
-	case "1":
-	case "2":
-	case "3":
-		return true;
+    case "1":
+    case "2":
+    case "3":
+        return true;
 }
 
 switch ($name) {
-	case "1":
-	case "2":
-	case "3":
-	default :
-		return true;
+    case "1":
+    case "2":
+    case "3":
+    default :
+        return true;
 }
 
 function myFunction()
 {
-	?>
+    ?>
 	<dynamic_content>
 
    </dynamic_content>
@@ -314,197 +314,197 @@ 
 }
 
 switch ($name) {
-	case "1":
-		switch ($name2) {
-			case "1":
-			break;
-			case "2":
-			break;
-		}
-	break;
-	case "2":
-	break;
+    case "1":
+        switch ($name2) {
+            case "1":
+            break;
+            case "2":
+            break;
+        }
+    break;
+    case "2":
+    break;
 }
 
 switch (true) {
-	case true: {
-	}
-	echo 'hi';
-	break;
-	case false:
-	case null:{
-	echo 'hi';
-	}
-	break;
+    case true: {
+    }
+    echo 'hi';
+    break;
+    case false:
+    case null:{
+    echo 'hi';
+    }
+    break;
 }
 
 switch (true) {
-	case true: {
-		echo 'hi';
-	}
-	// No break here.
-	case false:
-	case true:
-	case null:{
-	echo 'hi';
-		echo 'hi';
-	}
-	break;
+    case true: {
+        echo 'hi';
+    }
+    // No break here.
+    case false:
+    case true:
+    case null:{
+    echo 'hi';
+        echo 'hi';
+    }
+    break;
 }
 
 switch (true) {
-	case true: {
-		if (true) {
-			echo 'hi';
-		}
-	}
-	break;
+    case true: {
+        if (true) {
+            echo 'hi';
+        }
+    }
+    break;
 }
 
 // Testing anon function.
 class a {
-	function c()
-	{
-		$this->doSomething(
-			function () {
-				echo 123;
-			}
-		);
-	}
+    function c()
+    {
+        $this->doSomething(
+            function () {
+                echo 123;
+            }
+        );
+    }
 }
 
 some_function(
-	function() {
-		$a = 403;
-		if ($a === 404) {
-		$a = 403;
-		}
-	}
+    function() {
+        $a = 403;
+        if ($a === 404) {
+        $a = 403;
+        }
+    }
 );
 
 some_function(
-   function() {
-	  $a = 403;
-	   if ($a === 404) {
-		   $a = 403;
-	   }
-	}
+    function() {
+        $a = 403;
+        if ($a === 404) {
+            $a = 403;
+        }
+    }
 );
 
 $myFunction = function() {
-	$a = 403;
-	if ($a === 404) {
-	   $a = 403;
-	}
+    $a = 403;
+    if ($a === 404) {
+        $a = 403;
+    }
 }
 
 class Whatever
 {
-	protected $_protectedArray = array(
-		'normalString' => 'That email address is already in use!',
-		'offendingString' => <<<'STRING'
+    protected $_protectedArray = array(
+        'normalString' => 'That email address is already in use!',
+        'offendingString' => <<<'STRING'
 Each line of this string is always said to be at column 0, 
     no matter how many spaces are placed
                 at the beginning of each line
 and the ending STRING on the next line is reported as having to be indented.
 STRING
-	);
+    );
 }
 
 class MyClass
 {
-	public static function myFunction()
-	{
-		if (empty($keywords) === FALSE) {
-    	   $keywords = 'foo';
-    	   $existing = 'foo';
-		}
+    public static function myFunction()
+    {
+        if (empty($keywords) === FALSE) {
+            $keywords = 'foo';
+            $existing = 'foo';
+        }
 
-		return $keywords;
+        return $keywords;
 
-	}//end myFunction()
+    }//end myFunction()
 
 }//end class
 
 $var = call_user_func(
-	$new_var = function () use (&$a) {
-		if ($a > 0) {
-			return $a++;
-		} else {
-			return $a--;
-		}
-	}
+    $new_var = function () use (&$a) {
+        if ($a > 0) {
+            return $a++;
+        } else {
+            return $a--;
+        }
+    }
 );
 
 class AnonymousFn
 {
-	public function getAnonFn()
-	{
-		return array(
-			'functions' => Array(
-				'function1' => function ($a, $b, $c) {
-					$a = $b + $c;
-					$b = $c / 2;
-					return Array($a, $b, $c);
-				},
-			),
-		);
-	}
+    public function getAnonFn()
+    {
+        return array(
+            'functions' => Array(
+                'function1' => function ($a, $b, $c) {
+                    $a = $b + $c;
+                    $b = $c / 2;
+                    return Array($a, $b, $c);
+                },
+            ),
+        );
+    }
 }
 ?>
 
 <div>
 	<?php
-	if ($myvar == 'test') {
-		echo 'something';
-	}
-	?>
+    if ($myvar == 'test') {
+        echo 'something';
+    }
+    ?>
 <div>
 <div>
 	<?php
-		if ($myvar == 'test') {
-			echo 'something';
-		}
-	?>
+        if ($myvar == 'test') {
+            echo 'something';
+        }
+    ?>
 <div>
 <div>
 	<?php
 if ($myvar == 'test') {
-	echo 'something';
+    echo 'something';
 }
-	?>
+    ?>
 <div>
 <body>
 	<?php
-	if (isset($_GET["test"])) {
-		if ($_GET["test"] <> "") {
-			$test = true;
-		} else {
-			$test = true;
-		}
-	}
-	?>
+    if (isset($_GET["test"])) {
+        if ($_GET["test"] <> "") {
+            $test = true;
+        } else {
+            $test = true;
+        }
+    }
+    ?>
 </body>
 
 <?php
 if (true) {
-	?>
+    ?>
 	<div>
 		<div>
 			<div>
 			<?php
-				if (true) {
-					echo 'hello';
-				} else {
-					echo 'goodbye';
-				}
-			?>
+                if (true) {
+                    echo 'hello';
+                } else {
+                    echo 'goodbye';
+                }
+            ?>
 			</div>
 		</div>
 	</div>
 	<?php
 } else {
-	echo 'else';
+    echo 'else';
 }
 ?>
 <?php if (isset($param)) { ?>
@@ -512,49 +512,49 @@ 
 <?php }
 
 $list = [
-	'fn' => function ($a) {
-		if ($a === true) {
-			echo 'hi';
-		}
-	}
+    'fn' => function ($a) {
+        if ($a === true) {
+            echo 'hi';
+        }
+    }
 ];
 
 $list = [
-	'fn' => function ($a) {
-				if ($a === true) {
-					echo 'hi';
-				}
-	}
+    'fn' => function ($a) {
+                if ($a === true) {
+                    echo 'hi';
+                }
+    }
 ];
 
 if ($foo) {
-	foreach ($bar as $baz) {
-		if ($baz) {
-			?>
+    foreach ($bar as $baz) {
+        if ($baz) {
+            ?>
 			<div>
 				<div>
 					<div>
 			<?php
-			if ($baz > 1) {
-				echo '1';
-			}
-			?>
+            if ($baz > 1) {
+                echo '1';
+            }
+            ?>
 					</div>
 					<?php
-				if ($baz > 1) {
-					echo '1';
-				}
-					?>
+                if ($baz > 1) {
+                    echo '1';
+                }
+                    ?>
 				</div>
 				<?php
-				if ($baz > 1) {
-					echo '1';
-				}
-				?>
+                if ($baz > 1) {
+                    echo '1';
+                }
+                ?>
 			</div>
 			<?php
-		}
-	}
+        }
+    }
 }
 
 ?>
@@ -562,102 +562,102 @@ 
 
 <?php
 if ($foo) {
-	echo '1';
-		echo '2';
-			echo '3';
+    echo '1';
+        echo '2';
+            echo '3';
 }
 
 $array = array();
 array_map(
-	function($x)
-	{
-		return trim($x);
-	},
-	$array
+    function($x)
+    {
+        return trim($x);
+    },
+    $array
 );
 
 function foo(){return function(){};}
 
 $mockedDatabase->expects($this->at(2))
-	->with($this->callback(
-			function ($subject)
-			{
-			}
-		)
-	);
+    ->with($this->callback(
+            function ($subject)
+            {
+            }
+        )
+    );
 
 /** @var Database $mockedDatabase */
 /** @var Container $mockedContainer */
 
 echo $string->append('foo')
-			->appaend('bar')
-			->appaend('baz')
-			->outputUsing(
-				function ()
-				{
-				}
-			);
+            ->appaend('bar')
+            ->appaend('baz')
+            ->outputUsing(
+                function ()
+                {
+                }
+            );
 
 echo PHP_EOL;
 
 switch ($arg) {
-	case 1:
-		break;
-	case 2:
-		if ($arg2 == 'foo') {
-		}
-	case 3:
-	default:
-		echo 'default';
+    case 1:
+        break;
+    case 2:
+        if ($arg2 == 'foo') {
+        }
+    case 3:
+    default:
+        echo 'default';
 }
 
 if ($tokens[$stackPtr]['content']{0} === '#') {
 } else if ($tokens[$stackPtr]['content']{0} === '/'
-	&& $tokens[$stackPtr]['content']{1} === '/'
+    && $tokens[$stackPtr]['content']{1} === '/'
 ) {
 }
 
 $var = call_user_func(
-	function() {
-		if ($foo) {
-			$new_var = function() {
-				if ($a > 0) {
-					return $a++;
-				} else {
-					return $a--;
-				}
-			}
-		}
-	}
+    function() {
+        if ($foo) {
+            $new_var = function() {
+                if ($a > 0) {
+                    return $a++;
+                } else {
+                    return $a--;
+                }
+            }
+        }
+    }
 );
 
 a(
-	function() {
-		$a = function() {
-			$b = false;
-		};
-	true
-	}
+    function() {
+        $a = function() {
+            $b = false;
+        };
+    true
+    }
 );
 
 $var = [
-	[
-		'1' =>
-			function () {
-				return true;
-			},
-	],
-	[
-		'1' =>
-			function () {
-				return true;
-			},
-		'2' => true,
-	]
+    [
+        '1' =>
+            function () {
+                return true;
+            },
+    ],
+    [
+        '1' =>
+            function () {
+                return true;
+            },
+        '2' => true,
+    ]
 ];
 
 if ($foo) {
- ?>
+    ?>
  </p>
   <?php
 }
@@ -665,137 +665,137 @@ 
 function foo()
 {
     $failingTests[$testName][] = array(
-								  'comment'    => self::_replaceKeywords($failingComment, $result),
-								  'screenshot' => Test::getScreenshotPath(
-									$projectid,
-									$result['class_name'],
-								  ),
-								 );
+                                    'comment'    => self::_replaceKeywords($failingComment, $result),
+                                    'screenshot' => Test::getScreenshotPath(
+                                    $projectid,
+                                    $result['class_name'],
+                                    ),
+                                    );
 
 }
 
 $this->mockedDatabase
-	->with(
-		$this->callback(
-			function () {
-				return;
-			}
-		)
-	);
+    ->with(
+        $this->callback(
+            function () {
+                return;
+            }
+        )
+    );
 
 $this->subject->recordLogin();
 
 function a()
 {
-	if (true) {
-		static::$a[$b] =
-			static::where($c)
-				->where($c)
-				->where(
-					function ($d) {
-						$d->whereNull();
-						$d->orWhere();
-					}
-				)
-				->first();
-
-		if (static::$a[$b] === null) {
-			static::$a[$b] = new static(
-				array(
-					'a' => $a->id,
-					'a' => $a->id,
-				)
-			);
-		}
-	}
-
-	return static::$a[$b];
+    if (true) {
+        static::$a[$b] =
+            static::where($c)
+                ->where($c)
+                ->where(
+                    function ($d) {
+                        $d->whereNull();
+                        $d->orWhere();
+                    }
+                )
+                ->first();
+
+        if (static::$a[$b] === null) {
+            static::$a[$b] = new static(
+                array(
+                    'a' => $a->id,
+                    'a' => $a->id,
+                )
+            );
+        }
+    }
+
+    return static::$a[$b];
 }
 
 $foo->load(
-	array(
-		'bar' => function ($baz) {
-			$baz->call();
-		}
-	)
+    array(
+        'bar' => function ($baz) {
+            $baz->call();
+        }
+    )
 );
 
 hello();
 
 $foo = array_unique(
-	array_map(
-		function ($entry) {
-			return $entry * 2;
-		},
-		array()
-	)
+    array_map(
+        function ($entry) {
+            return $entry * 2;
+        },
+        array()
+    )
 );
 bar($foo);
 
 class PHP_CodeSniffer_Tokenizers_JS
 {
 
-	public $scopeOpeners = array(
-							T_CASE => array(
-									   'end'    => array(
-													T_BREAK    => T_BREAK,
-													T_RETURN   => T_RETURN,
-												   ),
-									   'strict' => true,
-									  ),
-						   );
+    public $scopeOpeners = array(
+                            T_CASE => array(
+                                        'end'    => array(
+                                                    T_BREAK    => T_BREAK,
+                                                    T_RETURN   => T_RETURN,
+                                                    ),
+                                        'strict' => true,
+                                        ),
+                            );
 }
 
 echo $string->
-		append('foo')->
-		appaend('bar')->
-		appaend('baz')->
-		outputUsing(
-			function ()
-			{
-			}
-		);
+        append('foo')->
+        appaend('bar')->
+        appaend('baz')->
+        outputUsing(
+            function ()
+            {
+            }
+        );
 
 $str = 'the items I want to show are: ' .
-	implode(
-		', ',
-		array('a', 'b', 'c')
-	);
+    implode(
+        ', ',
+        array('a', 'b', 'c')
+    );
 
 echo $str;
 
 $str = 'foo'
-		. '1'
-		. '2';
+        . '1'
+        . '2';
 
 echo $str;
 
 bar([
-	'foo' => foo(function () {
-		return 'foo';
-	})
+    'foo' => foo(function () {
+        return 'foo';
+    })
 ]);
 
 $domains = array_unique(
-	array_map(
-		function ($url) {
-			$urlObject = new \Purl\Url($url);
-			return $urlObject->registerableDomain;
-		},
-		$sites
-	)
+    array_map(
+        function ($url) {
+            $urlObject = new \Purl\Url($url);
+            return $urlObject->registerableDomain;
+        },
+        $sites
+    )
 );
 
 return $domains;
 
 if ($a == 5) :
-	echo "a equals 5";
-	echo "...";
+    echo "a equals 5";
+    echo "...";
 elseif ($a == 6) :
-	echo "a equals 6";
-	echo "!!!";
+    echo "a equals 6";
+    echo "!!!";
 else :
-	echo "a is neither 5 nor 6";
+    echo "a is neither 5 nor 6";
 endif;
 
 if ($foo):
@@ -804,74 +804,74 @@ 
 endif;
 
 $this
-	->method(array(
-		'foo' => 'bar',
-	), 'arg', array(
-		'foo' => 'bar',
-	));
+    ->method(array(
+        'foo' => 'bar',
+    ), 'arg', array(
+        'foo' => 'bar',
+    ));
 
 class Foo
 {
-	use Bar {
-		myMethod as renamedMethod;
-	}
+    use Bar {
+        myMethod as renamedMethod;
+    }
 }
 
 class Foo
 {
-	use Bar {
-	myMethod as renamedMethod;
-	}
+    use Bar {
+    myMethod as renamedMethod;
+    }
 }
 
 foo();
 
 array(
- 'key1' => function ($bar) {
-	return $bar;
- },
- 'key2' => function ($foo) {
-	return $foo;
- },
+    'key1' => function ($bar) {
+    return $bar;
+    },
+    'key2' => function ($foo) {
+    return $foo;
+    },
 );
 
 ?>
 <script>
 	var foo = <?php echo bar(
-		'baz'
-	); ?>;
+        'baz'
+    ); ?>;
 </script>
 <?php
 
 try {
-	echo 'foo';
+    echo 'foo';
 } catch (\Exception $e) {
-	echo 'catch';
+    echo 'catch';
 } finally {
-	if (false) {
-		echo 'finally false';
-	}
+    if (false) {
+        echo 'finally false';
+    }
 }
 
 class C0
 {
-	 public function m0()
-	{
-	}
+        public function m0()
+    {
+    }
 
-	public function m1()
-	{
-	}
+    public function m1()
+    {
+    }
 }
 
 namespace Foo {
 
-	use \Foo\Bar;
-	use \Foo\Baz;
+    use \Foo\Bar;
+    use \Foo\Baz;
 
-	function test() {
-		return true;
-	}
+    function test() {
+        return true;
+    }
 
 }
 
@@ -880,183 +880,183 @@ 
 }
 
 $a =
-	(
-		$b = 1
-	);
+    (
+        $b = 1
+    );
 $c = 2;
 
 $a =
-	[
-		$b => 1,
-	];
+    [
+        $b => 1,
+    ];
 $c = 2;
 
 class foo
 {
-	public function get()
-	{
-		$foo = ['b' => 'c',
-				'd' => [
-					['e' => 'f']
-					]];
-		echo '42';
-
-		$foo = array('b' => 'c',
-				'd' => array(
-					array('e' => 'f')
-					));
-		echo '42';
-	}
+    public function get()
+    {
+        $foo = ['b' => 'c',
+                'd' => [
+                    ['e' => 'f']
+                    ]];
+        echo '42';
+
+        $foo = array('b' => 'c',
+                'd' => array(
+                    array('e' => 'f')
+                    ));
+        echo '42';
+    }
 }
 
 switch ($foo) {
-	case 1:
-		return array();
-	case 2:
-		return '';
-	case 3:
-		return $function();
-	case 4:
-		return $functionCall($param[0]);
-	case 5:
-		return array() + array(); // Array Merge
-	case 6:
-		// String connect
-		return $functionReturningString('') . $functionReturningString(array());
-	case 7:
-		return functionCall(
-			$withMultiLineParam[0],
-			array(),
-			$functionReturningString(
-				$withMultiLineParam[1]
-			)
-		);
-	case 8:
-		return $param[0][0];
+    case 1:
+        return array();
+    case 2:
+        return '';
+    case 3:
+        return $function();
+    case 4:
+        return $functionCall($param[0]);
+    case 5:
+        return array() + array(); // Array Merge
+    case 6:
+        // String connect
+        return $functionReturningString('') . $functionReturningString(array());
+    case 7:
+        return functionCall(
+            $withMultiLineParam[0],
+            array(),
+            $functionReturningString(
+                $withMultiLineParam[1]
+            )
+        );
+    case 8:
+        return $param[0][0];
 }
 
 class Test {
 
-	public
-		$foo
-		,$bar
-		,$baz = [ ]
-		;
+    public
+        $foo
+        ,$bar
+        ,$baz = [ ]
+        ;
 
-	public function wtfindent() {
-	}
+    public function wtfindent() {
+    }
 }
 
 switch ($x) {
-	case 1:
-		return [1];
-	default:
-		return [2];
+    case 1:
+        return [1];
+    default:
+        return [2];
 }
 
 switch ($foo) {
-	case self::FOO:
-		return $this->bar($gfoo, function ($id) {
-			return FOO::bar($id);
-		}, $values);
-	case self::BAR:
-		$values = $this->bar($foo, $values);
-		break;
+    case self::FOO:
+        return $this->bar($gfoo, function ($id) {
+            return FOO::bar($id);
+        }, $values);
+    case self::BAR:
+        $values = $this->bar($foo, $values);
+        break;
 }
 
 $var = array(
-	'long description' =>
-		array(0, 'something'),
-	'another long description' =>
-		array(1, "something else")
+    'long description' =>
+        array(0, 'something'),
+    'another long description' =>
+        array(1, "something else")
 );
 
 $services = array(
-	'service 1' =>
-		Mockery::mock('class 1')
-			->shouldReceive('setFilter')->once()
-			->shouldReceive('getNbResults')->atLeast()->once()
-			->shouldReceive('getSlice')->once()->andReturn(array())
-			->getMock(),
-	'service 2' =>
-		Mockery::mock('class 2')
-			->shouldReceive('__invoke')->once()
-			->getMock()
+    'service 1' =>
+        Mockery::mock('class 1')
+            ->shouldReceive('setFilter')->once()
+            ->shouldReceive('getNbResults')->atLeast()->once()
+            ->shouldReceive('getSlice')->once()->andReturn(array())
+            ->getMock(),
+    'service 2' =>
+        Mockery::mock('class 2')
+            ->shouldReceive('__invoke')->once()
+            ->getMock()
 );
 
 class Foo
 {
-	public function setUp()
-	{
-		$this->foo = new class {
-			public $name = 'Some value';
-		};
-	}
+    public function setUp()
+    {
+        $this->foo = new class {
+            public $name = 'Some value';
+        };
+    }
 }
 
 try {
-	foo();
+    foo();
 } catch (\Exception $e) {
-	$foo = function() {
-		return 'foo';
-	}
+    $foo = function() {
+        return 'foo';
+    }
 
-	if (true) {
-	}
+    if (true) {
+    }
 }
 
 if ($foo) {
-	foo();
+    foo();
 } else if (\Exception $e) {
-	$foo = function() {
-		return 'foo';
-	}
+    $foo = function() {
+        return 'foo';
+    }
 
-	if (true) {
-	}
+    if (true) {
+    }
 } else {
-	$foo = function() {
-		return 'foo';
-	}
+    $foo = function() {
+        return 'foo';
+    }
 
-	if (true) {
-	}
+    if (true) {
+    }
 }
 
 switch ($parameter) {
-	case null:
-		return [
-			'foo' => in_array(
-				'foo',
-				[]
-			),
-		];
-
-	default:
-		return [];
+    case null:
+        return [
+            'foo' => in_array(
+                'foo',
+                []
+            ),
+        ];
+
+    default:
+        return [];
 }
 
 class SomeClass
 {
-	public function someFunc()
-	{
-		a(function () {
-			echo "a";
-		})->b(function () {
-			echo "b";
-		});
-
-		if (true) {
-			echo "c";
-		}
-		echo "d";
-	}
+    public function someFunc()
+    {
+        a(function () {
+            echo "a";
+        })->b(function () {
+            echo "b";
+        });
+
+        if (true) {
+            echo "c";
+        }
+        echo "d";
+    }
 }
 
 $params = self::validate_parameters(self::read_competency_framework_parameters(),
-									array(
-										'id' => $id,
-									));
+                                    array(
+                                        'id' => $id,
+                                    ));
 
 $framework = api::read_framework($params['id']);
 self::validate_context($framework->get_context());
@@ -1064,62 +1064,62 @@ 
 
 class Test123
 {
-	protected static
-		$prop1 = [
-			'testA' => 123,
-		],
-		$prop2 = [
-			'testB' => 456,
-		],
-
-	protected static
-		$prop3 = array(
-			'testA' => 123,
-		),
-		$prop4 = array(
-			'testB' => 456,
-		),
-
-	protected static $prop5;
+    protected static
+        $prop1 = [
+            'testA' => 123,
+        ],
+        $prop2 = [
+            'testB' => 456,
+        ],
+
+    protected static
+        $prop3 = array(
+            'testA' => 123,
+        ),
+        $prop4 = array(
+            'testB' => 456,
+        ),
+
+    protected static $prop5;
 }
 
 $foo = foo(
-	function () {
-		$foo->debug(
-			$a,
-			$b
-		);
-
-		if ($a) {
-			$b = $a;
-		}
-	}
+    function () {
+        $foo->debug(
+            $a,
+            $b
+        );
+
+        if ($a) {
+            $b = $a;
+        }
+    }
 );
 
 $foo = foo(
-	function () {
-		$foo->debug(
-			$a,
-			$b
-	);
-
-		if ($a) {
-			$b = $a;
-		}
-	}
+    function () {
+        $foo->debug(
+            $a,
+            $b
+    );
+
+        if ($a) {
+            $b = $a;
+        }
+    }
 );
 
-	function foo()
-	{
-		$foo = array(
-		);
+    function foo()
+    {
+        $foo = array(
+        );
 
-		if ($foo) {
-			echo 'foo';
-		}
+        if ($foo) {
+            echo 'foo';
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 /*
 $a = array(

Switch Indentation +70 added lines, -70 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -166,7 +166,7 @@ 
 						if ($last >= 3 &&
 							$ts[0]['token'] != T_CLASS &&
 							$ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-							$ts[$last - 3]['token'] == T_VARIABLE ) {
+							$ts[$last - 3]['token'] == T_VARIABLE) {
 
 
 							if (true) {
@@ -366,7 +366,7 @@ 
 	function c()
 	{
 		$this->doSomething(
-			function () {
+			function() {
 				echo 123;
 			}
 		);
@@ -427,7 +427,7 @@ 
 }//end class
 
 $var = call_user_func(
-	$new_var = function () use (&$a) {
+	$new_var = function() use (&$a) {
 		if ($a > 0) {
 			return $a++;
 		} else {
@@ -442,7 +442,7 @@ 
 	{
 		return array(
 			'functions' => Array(
-				'function1' => function ($a, $b, $c) {
+				'function1' => function($a, $b, $c) {
 					$a = $b + $c;
 					$b = $c / 2;
 					return Array($a, $b, $c);
@@ -512,7 +512,7 @@ 
 <?php }
 
 $list = [
-	'fn' => function ($a) {
+	'fn' => function($a) {
 		if ($a === true) {
 			echo 'hi';
 		}
@@ -520,7 +520,7 @@ 
 ];
 
 $list = [
-	'fn' => function ($a) {
+	'fn' => function($a) {
 				if ($a === true) {
 					echo 'hi';
 				}
@@ -576,11 +576,11 @@ 
 	$array
 );
 
-function foo(){return function(){};}
+function foo() {return function() {};}
 
 $mockedDatabase->expects($this->at(2))
 	->with($this->callback(
-			function ($subject)
+			function($subject)
 			{
 			}
 		)
@@ -593,7 +593,7 @@ 
 			->appaend('bar')
 			->appaend('baz')
 			->outputUsing(
-				function ()
+				function()
 				{
 				}
 			);
@@ -643,13 +643,13 @@ 
 $var = [
 	[
 		'1' =>
-			function () {
+			function() {
 				return true;
 			},
 	],
 	[
 		'1' =>
-			function () {
+			function() {
 				return true;
 			},
 		'2' => true,
@@ -677,7 +677,7 @@ 
 $this->mockedDatabase
 	->with(
 		$this->callback(
-			function () {
+			function() {
 				return;
 			}
 		)
@@ -692,7 +692,7 @@ 
 			static::where($c)
 				->where($c)
 				->where(
-					function ($d) {
+					function($d) {
 						$d->whereNull();
 						$d->orWhere();
 					}
@@ -714,7 +714,7 @@ 
 
 $foo->load(
 	array(
-		'bar' => function ($baz) {
+		'bar' => function($baz) {
 			$baz->call();
 		}
 	)
@@ -724,7 +724,7 @@ 
 
 $foo = array_unique(
 	array_map(
-		function ($entry) {
+		function($entry) {
 			return $entry * 2;
 		},
 		array()
@@ -751,12 +751,12 @@ 
 		appaend('bar')->
 		appaend('baz')->
 		outputUsing(
-			function ()
+			function()
 			{
 			}
 		);
 
-$str = 'the items I want to show are: ' .
+$str = 'the items I want to show are: '.
 	implode(
 		', ',
 		array('a', 'b', 'c')
@@ -771,14 +771,14 @@ 
 echo $str;
 
 bar([
-	'foo' => foo(function () {
+	'foo' => foo(function() {
 		return 'foo';
 	})
 ]);
 
 $domains = array_unique(
 	array_map(
-		function ($url) {
+		function($url) {
 			$urlObject = new \Purl\Url($url);
 			return $urlObject->registerableDomain;
 		},
@@ -827,10 +827,10 @@ 
 foo();
 
 array(
- 'key1' => function ($bar) {
+ 'key1' => function($bar) {
 	return $bar;
  },
- 'key2' => function ($foo) {
+ 'key2' => function($foo) {
 	return $foo;
  },
 );
@@ -875,7 +875,7 @@ 
 
 }
 
-declare(ticks=1) {
+declare(ticks = 1) {
 echo 'foo';
 }
 
@@ -922,7 +922,7 @@ 
 		return array() + array(); // Array Merge
 	case 6:
 		// String connect
-		return $functionReturningString('') . $functionReturningString(array());
+		return $functionReturningString('').$functionReturningString(array());
 	case 7:
 		return functionCall(
 			$withMultiLineParam[0],
@@ -940,7 +940,7 @@ 
 	public
 		$foo
 		,$bar
-		,$baz = [ ]
+		,$baz = []
 		;
 
 	public function wtfindent() {
@@ -956,7 +956,7 @@ 
 
 switch ($foo) {
 	case self::FOO:
-		return $this->bar($gfoo, function ($id) {
+		return $this->bar($gfoo, function($id) {
 			return FOO::bar($id);
 		}, $values);
 	case self::BAR:
@@ -1040,9 +1040,9 @@ 
 {
 	public function someFunc()
 	{
-		a(function () {
+		a(function() {
 			echo "a";
-		})->b(function () {
+		})->b(function() {
 			echo "b";
 		});
 
@@ -1084,7 +1084,7 @@ 
 }
 
 $foo = foo(
-	function () {
+	function() {
 		$foo->debug(
 			$a,
 			$b
@@ -1097,7 +1097,7 @@ 
 );
 
 $foo = foo(
-	function () {
+	function() {
 		$foo->debug(
 			$a,
 			$b

Braces +14 added lines, -5 removed lines

@@ -61,8 +61,12 @@ 
 	public function open()
 	{
 		// Some inline stuff that shouldn't error
-		if (TRUE) echo 'hello';
-		foreach ($tokens as $token) echo $token;
+		if (TRUE) {
+		    echo 'hello';
+		}
+		foreach ($tokens as $token) {
+		    echo $token;
+		}
 	}
 
 	/**
@@ -794,13 +798,18 @@ 
 elseif ($a == 6) :
 	echo "a equals 6";
 	echo "!!!";
-else :
+else {
+    :
 	echo "a is neither 5 nor 6";
+}
 endif;
 
 if ($foo):
-if ($bar) $foo = 1;
-elseif ($baz) $foo = 2;
+if ($bar) {
+    $foo = 1;
+} elseif ($baz) {
+    $foo = 2;
+}
 endif;
 
 $this

CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 myclass::myfunc(&$myvar);
 myclass::myfunc($myvar);
 
-while(testfunc($var1, &$var2, $var3, &$var4) === false) {
+while (testfunc($var1, &$var2, $var3, &$var4) === false) {
 }
 
 sprintf("0%o", 0777 & $p);
@@ -25,9 +25,9 @@ 
 if (is_array($foo = &$this->bar())) {
 }
 
-Hooks::run( 'SecondaryDataUpdates', [ $title, $old, $recursive, $parserOutput, &$updates ] );
+Hooks::run('SecondaryDataUpdates', [$title, $old, $recursive, $parserOutput, &$updates]);
 
 $foo = Bar(&$fooBar);
 
-myfunc($myvar&$myvar);
-myfunc($myvar[0]&$myvar);
+myfunc($myvar & $myvar);
+myfunc($myvar[0] & $myvar);

CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc

Indentation +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 
 // Space before brace.
 function myFunction()
- {
+    {
 }
 
 class myClass()
@@ -52,7 +52,7 @@ 
     
     // Space before brace.
     function myFunction()
-     {
+        {
     }
 }
 
@@ -88,7 +88,7 @@ 
 // Space before brace.
 function myFunction($variable1, $variable2,
     $variable3, $variable4)
- {
+    {
 }
 
 class myClass()
@@ -125,7 +125,7 @@ 
     // Space before brace.
     function myFunction($variable1, $variable2,
     $variable3, $variable4)
-     {
+        {
     }
 }
 

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 }
 
 // Too many spaces.
-function myFunction()   {
+function myFunction() {
 }
 
 // Too many newlines.
@@ -41,7 +41,7 @@ 
 }
     
     // Too many spaces.
-    function myFunction()   {
+    function myFunction() {
     }
     
     // Too many newlines.
@@ -75,7 +75,7 @@ 
 
 // Too many spaces.
 function myFunction($variable1, $variable2,
-    $variable3, $variable4)   {
+    $variable3, $variable4) {
 }
 
 // Too many newlines.
@@ -112,7 +112,7 @@ 
     
     // Too many spaces.
     function myFunction($variable1, $variable2,
-    $variable3, $variable4)   {
+    $variable3, $variable4) {
     }
     
     // Too many newlines.
@@ -161,25 +161,25 @@ 
 
 // @codingStandardsChangeSetting Generic.Functions.OpeningFunctionBraceBsdAllman checkClosures 1
 
-$closureWithArgs = function ($arg1, $arg2) {
+$closureWithArgs = function($arg1, $arg2) {
     // body
 };
 
-$closureWithArgsAndVars = function ($arg1, $arg2) use ($var1, $var2) {
+$closureWithArgsAndVars = function($arg1, $arg2) use ($var1, $var2) {
     // body
 };
 
-$test = function ($param) use ($result) {
+$test = function($param) use ($result) {
     return null;
 }
 
-$test = function ($param) use ($result) : Something {
+$test = function($param) use ($result) : Something {
     return null;
 };
 
 // @codingStandardsChangeSetting Generic.Functions.OpeningFunctionBraceBsdAllman checkClosures 0
 
-$closureWithArgs = function ($arg1, $arg2) {
+$closureWithArgs = function($arg1, $arg2) {
     // body
 };
 

CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc

Spacing +13 added lines, -13 removed lines

@@ -10,11 +10,11 @@ 
 }
 
 // Too many spaces.
-function myFunction()   {
+function myFunction() {
 }
 
 // Uses tab.
-function myFunction()	{
+function myFunction() {
 }
 
 
@@ -30,11 +30,11 @@ 
     }
     
     // Too many spaces.
-    function myFunction()   {
+    function myFunction() {
     }
     
     // Uses tab.
-    function myFunction()	{
+    function myFunction() {
     }
 }
 
@@ -55,12 +55,12 @@ 
 
 // Too many spaces.
 function myFunction($variable1, $variable2,
-    $variable3, $variable4)   {
+    $variable3, $variable4) {
 }
 
 // Uses tab.
 function myFunction($variable1, $variable2,
-    $variable3, $variable4)	{
+    $variable3, $variable4) {
 }
 
 
@@ -79,12 +79,12 @@ 
     
     // Too many spaces.
     function myFunction($variable1, $variable2,
-        $variable3, $variable4)   {
+        $variable3, $variable4) {
     }
     
     // Uses tab.
     function myFunction($variable1, $variable2,
-        $variable3, $variable4)	{
+        $variable3, $variable4) {
     }
 }
 
@@ -120,27 +120,27 @@ 
 
 // @codingStandardsChangeSetting Generic.Functions.OpeningFunctionBraceKernighanRitchie checkClosures 1
 
-$closureWithArgs = function ($arg1, $arg2){
+$closureWithArgs = function($arg1, $arg2) {
     // body
 };
 
-$closureWithArgsAndVars = function ($arg1, $arg2) use ($var1, $var2){
+$closureWithArgsAndVars = function($arg1, $arg2) use ($var1, $var2){
     // body
 };
 
-$test = function ($param) use ($result)
+$test = function($param) use ($result)
 {
     return null;
 }
 
-$test = function ($param) use ($result) : Something
+$test = function($param) use ($result) : Something
 {
     return null;
 }
 
 // @codingStandardsChangeSetting Generic.Functions.OpeningFunctionBraceKernighanRitchie checkClosures 0
 
-$closureWithArgs = function ($arg1, $arg2){
+$closureWithArgs = function($arg1, $arg2) {
     // body
 };
 

CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc

Indentation +5 added lines, -5 removed lines

@@ -13,13 +13,13 @@
 $result = myFunction($arg1 , $arg2=array());
 
 $result = myFunction($arg1, 
-                     $arg2 = array(), 
-                     $arg3, 
-                     $arg4, 
-                     $arg5);
+                        $arg2 = array(), 
+                        $arg3, 
+                        $arg4, 
+                        $arg5);
 
 throw new Exception("This is some massive string for a message", 
-                         $cause);
+                            $cause);
 
 // Function definitions are ignored
 function myFunction($arg1,$arg2)

Spacing +21 added lines, -21 removed lines

@@ -2,15 +2,15 @@ 
 
 $result = myFunction();
 $result = myFunction($arg1, $arg2);
-$result = myFunction($arg1,$arg2);
-$result = myFunction($arg1 , $arg2);
-$result = myFunction($arg1 ,  $arg2);
-$result = myFunction($arg1, $arg2, $arg3,$arg4, $arg5);
+$result = myFunction($arg1, $arg2);
+$result = myFunction($arg1, $arg2);
+$result = myFunction($arg1, $arg2);
+$result = myFunction($arg1, $arg2, $arg3, $arg4, $arg5);
 $result = myFunction($arg1, $arg2, $arg3, $arg4, $arg5);
 $result = myFunction($arg1, $arg2 = array());
-$result = myFunction($arg1 , $arg2 =array());
-$result = myFunction($arg1 , $arg2= array());
-$result = myFunction($arg1 , $arg2=array());
+$result = myFunction($arg1, $arg2 = array());
+$result = myFunction($arg1, $arg2 = array());
+$result = myFunction($arg1, $arg2 = array());
 
 $result = myFunction($arg1, 
                      $arg2 = array(), 
@@ -22,28 +22,28 @@ 
                          $cause);
 
 // Function definitions are ignored
-function myFunction($arg1,$arg2)
+function myFunction($arg1, $arg2)
 {
 }
 
-function myFunction    ($arg1,$arg2)
+function myFunction($arg1, $arg2)
 {
 }
 
-function myFunction($arg1=1,$arg2=2)
+function myFunction($arg1 = 1, $arg2 = 2)
 {
 }
 
 
-function myFunction($arg1 = 1,$arg2 = 2)
+function myFunction($arg1 = 1, $arg2 = 2)
 {
 }
 
-$key = array_search($this->getArray($one,  $two,$three),$this->arrayMap);
-$this->error($obj->getCode(),$obj->getMessage(),$obj->getFile(),$obj->getLine());
+$key = array_search($this->getArray($one, $two, $three), $this->arrayMap);
+$this->error($obj->getCode(), $obj->getMessage(), $obj->getFile(), $obj->getLine());
 
-make_foo($string /*the string*/ , true /*test*/);
-make_foo($string/*the string*/ ,   /*test*/ true);
+make_foo($string /*the string*/, true /*test*/);
+make_foo($string/*the string*/, /*test*/ true);
 make_foo($string /*the string*/, /*test*/ true);
 
 class MyClass {
@@ -53,7 +53,7 @@ 
 }
 
 // Function definition, not function call, so should be ignored
-function &myFunction($arg1=1,$arg2=2)
+function &myFunction($arg1 = 1, $arg2 = 2)
 {
 }
 
@@ -61,7 +61,7 @@ 
     $foo,
     $bar,
     function($a, $b) {
-        $foo='bar';
+        $foo = 'bar';
         return $foo;
     }
 );
@@ -84,12 +84,12 @@ 
 THEN
 );
 
-if (in_array($arg1, ['foo','bar'])) {}
-if (in_array($arg1, array('foo','bar'))) {}
+if (in_array($arg1, ['foo', 'bar'])) {}
+if (in_array($arg1, array('foo', 'bar'))) {}
 
 $b = foo(
     "1", // this is a comment
-    "2",  // this is a comment
-    "3",// this is a comment
+    "2", // this is a comment
+    "3", // this is a comment
     "4"
 );