Symplify / PHP7_CodeSniffer

src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 48 => 1,
                 70 => 1,
                 71 => 1,
-               );
+                );
 
     }//end getErrorList()
 

src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php

Indentation +16 added lines, -16 removed lines

@@ -47,21 +47,21 @@ 
         switch ($testFile) {
         case 'InlineCommentUnitTest.inc':
             $errors = array(
-                       17  => 1,
-                       27  => 1,
-                       28  => 1,
-                       32  => 2,
-                       36  => 1,
-                       44  => 2,
-                       58  => 1,
-                       61  => 1,
-                       64  => 1,
-                       67  => 1,
-                       95  => 1,
-                       96  => 1,
-                       97  => 3,
-                       118 => 1,
-                      );
+                        17  => 1,
+                        27  => 1,
+                        28  => 1,
+                        32  => 2,
+                        36  => 1,
+                        44  => 2,
+                        58  => 1,
+                        61  => 1,
+                        64  => 1,
+                        67  => 1,
+                        95  => 1,
+                        96  => 1,
+                        97  => 3,
+                        118 => 1,
+                        );
 
             return $errors;
         case 'InlineCommentUnitTest.js':
@@ -76,7 +76,7 @@ 
                     103 => 1,
                     104 => 3,
                     118 => 1,
-                   );
+                    );
         default:
             return array();
         }//end switch

Switch Indentation +33 added lines, -33 removed lines

@@ -45,40 +45,40 @@
     public function getErrorList($testFile='InlineCommentUnitTest.inc')
     {
         switch ($testFile) {
-        case 'InlineCommentUnitTest.inc':
-            $errors = array(
-                       17  => 1,
-                       27  => 1,
-                       28  => 1,
-                       32  => 2,
-                       36  => 1,
-                       44  => 2,
-                       58  => 1,
-                       61  => 1,
-                       64  => 1,
-                       67  => 1,
-                       95  => 1,
-                       96  => 1,
-                       97  => 3,
-                       118 => 1,
-                      );
+            case 'InlineCommentUnitTest.inc':
+                $errors = array(
+                           17  => 1,
+                           27  => 1,
+                           28  => 1,
+                           32  => 2,
+                           36  => 1,
+                           44  => 2,
+                           58  => 1,
+                           61  => 1,
+                           64  => 1,
+                           67  => 1,
+                           95  => 1,
+                           96  => 1,
+                           97  => 3,
+                           118 => 1,
+                          );
 
-            return $errors;
-        case 'InlineCommentUnitTest.js':
-            return array(
-                    31  => 1,
-                    36  => 2,
-                    48  => 1,
-                    51  => 1,
-                    54  => 1,
-                    57  => 1,
-                    102 => 1,
-                    103 => 1,
-                    104 => 3,
-                    118 => 1,
-                   );
-        default:
-            return array();
+                return $errors;
+            case 'InlineCommentUnitTest.js':
+                return array(
+                        31  => 1,
+                        36  => 2,
+                        48  => 1,
+                        51  => 1,
+                        54  => 1,
+                        57  => 1,
+                        102 => 1,
+                        103 => 1,
+                        104 => 3,
+                        118 => 1,
+                       );
+            default:
+                return array();
         }//end switch
 
     }//end getErrorList()

Spacing +1 added lines, -1 removed lines

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

src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc

Switch Indentation +158 added lines, -158 removed lines

@@ -493,41 +493,41 @@ 
 }
 
 switch ($something) {
-    case '1':
-    // Line 1
-    // Line 2
-    // Line 3
-    // Line 4
-    // Line 5
-    break;
-    case '2':
-    // Line 1
-    // Line 2
-    // Line 3
-    // Line 4
-    // Line 5
-    break;
-    case '3':
-    // Line 1
-    // Line 2
-    // Line 3
-    // Line 4
-    // Line 5
-    break;
-    case '4':
-    // Line 1
-    // Line 2
-    // Line 3
-    // Line 4
-    // Line 5
-    break;
-    case '5':
-    // Line 1
-    // Line 2
-    // Line 3
-    // Line 4
-    // Line 5
-    break;
+        case '1':
+        // Line 1
+        // Line 2
+        // Line 3
+        // Line 4
+        // Line 5
+        break;
+        case '2':
+        // Line 1
+        // Line 2
+        // Line 3
+        // Line 4
+        // Line 5
+        break;
+        case '3':
+        // Line 1
+        // Line 2
+        // Line 3
+        // Line 4
+        // Line 5
+        break;
+        case '4':
+        // Line 1
+        // Line 2
+        // Line 3
+        // Line 4
+        // Line 5
+        break;
+        case '5':
+        // Line 1
+        // Line 2
+        // Line 3
+        // Line 4
+        // Line 5
+        break;
 }
 
 // Wrong comment
@@ -629,69 +629,69 @@ 
 }
 
 switch ($foo) {
-    case 'one' : {
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
+        case 'one' : {
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            break;
+        }
+        case 'one' :
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
+            // some code here.
         break;
-    }
-    case 'one' :
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-        // some code here.
-    break;
 }//end switch
 
 // Yes, code like this does exist.
@@ -701,65 +701,65 @@ 
     return $bar;
 
 switch ($foo) {
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-    case 19:
-    case 20:
-    case 21:
-    case 22:
-    case 23:
-    case 24:
-    case 25:
-    case 26:
-    case 27:
-    case 28:
-    case 29:
-    case 30:
-    case 31:
-    case 32:
-    case 33:
-    case 34:
-    case 35:
-    case 36:
-    case 37:
-    case 38:
-    case 39:
-    case 40:
-    case 41:
-    case 42:
-    case 43:
-    case 44:
-    case 45:
-    case 46:
-    case 47:
-    case 48:
-    case 49:
-    case 50:
-    case 51:
-    case 52:
-    case 53:
-    case 54:
-    case 55:
-    case 56:
-    case 57:
-    case 58:
-    case 59:
-        echo $foo;
-        break;
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+        case 11:
+        case 12:
+        case 13:
+        case 14:
+        case 15:
+        case 16:
+        case 17:
+        case 18:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+        case 24:
+        case 25:
+        case 26:
+        case 27:
+        case 28:
+        case 29:
+        case 30:
+        case 31:
+        case 32:
+        case 33:
+        case 34:
+        case 35:
+        case 36:
+        case 37:
+        case 38:
+        case 39:
+        case 40:
+        case 41:
+        case 42:
+        case 43:
+        case 44:
+        case 45:
+        case 46:
+        case 47:
+        case 48:
+        case 49:
+        case 50:
+        case 51:
+        case 52:
+        case 53:
+        case 54:
+        case 55:
+        case 56:
+        case 57:
+        case 58:
+        case 59:
+            echo $foo;
+            break;
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
     // Line 20
 }
 
-for ($var =1; $var < 20; $var++) {
+for ($var = 1; $var < 20; $var++) {
     // Line 1
     // Line 2
     // Line 3
@@ -168,7 +168,7 @@ 
     // Line 20
 }//end for
 
-for ($var =1; $var < 20; $var++) {
+for ($var = 1; $var < 20; $var++) {
     // Line 1
     // Line 2
     // Line 3
@@ -178,7 +178,7 @@ 
     // Line 7
     // Line 8
     // Line 9
-    for ($val =1; $val < 20; $val++) {
+    for ($val = 1; $val < 20; $val++) {
         // Short for.
     }
     // Line 13
@@ -308,7 +308,7 @@ 
     // Line 20
 } //end foreach
 
-for ($var =1; $var < 20; $var++) {
+for ($var = 1; $var < 20; $var++) {
     // Line 1
     // Line 2
     // Line 3

Braces +2 added lines, -1 removed lines

@@ -697,8 +697,9 @@
 // Yes, code like this does exist.
 if ($foo) {
     return $foo;
-} elseif ($bar)
+} elseif ($bar) {
     return $bar;
+}
 
 switch ($foo) {
     case 1:

src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 48 => 1,
                 70 => 1,
                 71 => 1,
-               );
+                );
 
     }//end getErrorList()
 

src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php

Indentation +2 added lines, -2 removed lines

@@ -47,13 +47,13 @@
             return array(
                     4 => 1,
                     5 => 1,
-                   );
+                    );
         } else if (version_compare(PHP_VERSION, '5.4.0RC1') >= 0) {
             // Shorthand echo is always available from PHP 5.4.0 but needed the
             // short_open_tag ini var to be set for versions before this.
             return array(
                     4 => 1,
-                   );
+                    );
         }
 
         return array();

Switch Indentation +17 added lines, -17 removed lines

@@ -45,23 +45,23 @@
     public function getErrorList($testFile='PostStatementCommentUnitTest.inc')
     {
         switch ($testFile) {
-        case 'PostStatementCommentUnitTest.inc':
-            return array(
-                    6  => 1,
-                    10 => 1,
-                    18 => 1,
-                   );
-            break;
-        case 'PostStatementCommentUnitTest.js':
-            return array(
-                    1 => 1,
-                    4 => 1,
-                    9 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'PostStatementCommentUnitTest.inc':
+                return array(
+                        6  => 1,
+                        10 => 1,
+                        18 => 1,
+                       );
+                break;
+            case 'PostStatementCommentUnitTest.js':
+                return array(
+                        1 => 1,
+                        4 => 1,
+                        9 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getErrorList()

Spacing +1 added lines, -1 removed lines

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

src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc

Indentation +19 added lines, -19 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 public function someFunctionWithAVeryLongName($firstParameter='something',
-   $secondParameter='booooo',
-   $third=null, $fourthParameter=false,
-     $fifthParameter=123.12,
+    $secondParameter='booooo',
+    $third=null, $fourthParameter=false,
+        $fifthParameter=123.12,
     $sixthParam=true
 ){
 }
@@ -39,22 +39,22 @@ 
     ) {
     }
 
-     public function someFunctionWithAVeryLongName3(
-         $firstParameter, $secondParameter, $third=null
-     ) {
-     }
-
-     public function someFunctionWithAVeryLongName4(
-         $firstParameter, $secondParameter
-     ) {
-     }
-
-     public function someFunctionWithAVeryLongName5(
-         $firstParameter,
-         $secondParameter=array(1,2,3),
-         $third=null
-     ) {
-     }
+        public function someFunctionWithAVeryLongName3(
+            $firstParameter, $secondParameter, $third=null
+        ) {
+        }
+
+        public function someFunctionWithAVeryLongName4(
+            $firstParameter, $secondParameter
+        ) {
+        }
+
+        public function someFunctionWithAVeryLongName5(
+            $firstParameter,
+            $secondParameter=array(1,2,3),
+            $third=null
+        ) {
+        }
 
 }
 

Spacing +30 added lines, -30 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-public function someFunctionWithAVeryLongName($firstParameter='something',
-   $secondParameter='booooo',
-   $third=null, $fourthParameter=false,
-     $fifthParameter=123.12,
-    $sixthParam=true
-){
+public function someFunctionWithAVeryLongName($firstParameter = 'something',
+   $secondParameter = 'booooo',
+   $third = null, $fourthParameter = false,
+     $fifthParameter = 123.12,
+    $sixthParam = true
+) {
 }
 
 function someFunctionWithAVeryLongName2(
-$firstParameter='something',
-$secondParameter='booooo',
-)  {
+$firstParameter = 'something',
+$secondParameter = 'booooo',
+) {
 }
 
 function blah() {
@@ -24,23 +24,23 @@ 
 {
 
     public function someFunctionWithAVeryLongName(
-        $firstParameter='something',
-        $secondParameter='booooo',
-        $third=null,
-        $fourthParameter=false,
-        $fifthParameter=123.12,
-        $sixthParam=true
+        $firstParameter = 'something',
+        $secondParameter = 'booooo',
+        $third = null,
+        $fourthParameter = false,
+        $fifthParameter = 123.12,
+        $sixthParam = true
     ) /** w00t */ {
     }
 
-    public function someFunctionWithAVeryLongName2($firstParameter='something',
-        $secondParameter='booooo',
-        $third=null
+    public function someFunctionWithAVeryLongName2($firstParameter = 'something',
+        $secondParameter = 'booooo',
+        $third = null
     ) {
     }
 
      public function someFunctionWithAVeryLongName3(
-         $firstParameter, $secondParameter, $third=null
+         $firstParameter, $secondParameter, $third = null
      ) {
      }
 
@@ -51,14 +51,14 @@ 
 
      public function someFunctionWithAVeryLongName5(
          $firstParameter,
-         $secondParameter=array(1,2,3),
-         $third=null
+         $secondParameter = array(1, 2, 3),
+         $third = null
      ) {
      }
 
 }
 
-$noArgs_longVars = function () use (
+$noArgs_longVars = function() use (
     $longVar1,
     $longerVar2,
     $muchLongerVar3
@@ -66,7 +66,7 @@ 
     // body
 };
 
-$longArgs_longVars = function (
+$longArgs_longVars = function(
     $longArgument,
     $longerArgument,
     $muchLongerArgument
@@ -78,14 +78,14 @@ 
     // body
 };
 
-$longArgs_longVars = function ($longArgument,
+$longArgs_longVars = function($longArgument,
     $muchLongerArgument) use ($muchLongerVar3
 ) {
     // body
 };
 
-$noArgs_longVars = function () use (
-    $longVar1,  $longerVar2,
+$noArgs_longVars = function() use (
+    $longVar1, $longerVar2,
     $muchLongerVar3
 ) {
     // body
@@ -93,19 +93,19 @@ 
 
 usort(
     $data,
-    function ($a, $b) {
+    function($a, $b) {
         // body
     }
 );
 
 function myFunction(
-    $firstParameter,$secondParameter=[1,2,3],$third=null
+    $firstParameter, $secondParameter = [1, 2, 3], $third = null
 ) {
 }
 
 if (array_filter(
     $commands,
-    function ($cmd) use ($commandName) {
+    function($cmd) use ($commandName) {
         return ($cmd['name'] == $commandName);
     }
 )) {
@@ -127,7 +127,7 @@ 
     // body
 }
 
-$foo = function ($bar = [
+$foo = function($bar = [
     1,
     2,
 ]) use ($longVar1, $longerVar2) {

src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.inc

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 }//end class
 
 // Closures don't need end comments.
-echo preg_replace_callback('~-([a-z])~', function ($match) { return strtoupper($match[1]); }, 'hello-world');
+echo preg_replace_callback('~-([a-z])~', function($match) { return strtoupper($match[1]); }, 'hello-world');
 
 class TestClass
 {

src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc

Indentation +4 added lines, -4 removed lines

@@ -58,10 +58,10 @@
 function myFunc( ) {}
 
 function multiLineFunction(
-	array $flatList,
-	$markup,
-	array $otherList,
-	$lastOffset=0
+    array $flatList,
+    $markup,
+    array $otherList,
+    $lastOffset=0
 ) {
 }
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 0

Spacing +25 added lines, -25 removed lines

@@ -2,38 +2,38 @@ 
 function myFunc() {}
 function myFunc( ) {}
 function myFunc($blah) {}
-function myFunc( $blah ) {}
+function myFunc($blah) {}
+function myFunc($blah, $blah2, $blah3) {}
+function myFunc($blah, $blah2, $blah3) {}
 function myFunc($blah, $blah2, $blah3) {}
-function myFunc($blah , $blah2, $blah3 ) {}
-function myFunc($blah,$blah2,$blah3) {}
-function myFunc($blah,   $blah2,  $blah3) {}
-function myFunc($blah='hello') {}
+function myFunc($blah, $blah2, $blah3) {}
+function myFunc($blah = 'hello') {}
 function myFunc($blah = 'hello') {}
-function myFunc(PHP_CodeSniffer $object, array $array=array(), $blah3='yo') {}
-function myFunc(  $blah='hello'   , $blah2=   'hi',  $blah3   = 'yo' ) {}
-function myFunc(PHP_CodeSniffer   $object, array  $array=array(), $blah3='yo') {}
-function myFunc( PHP_CodeSniffer $object,  array $array=array(), $blah3='yo') {}
-function myFunc( array  &$one,  array  &$two) {}
+function myFunc(PHP_CodeSniffer $object, array $array = array(), $blah3 = 'yo') {}
+function myFunc($blah = 'hello', $blah2 = 'hi', $blah3 = 'yo') {}
+function myFunc(PHP_CodeSniffer   $object, array  $array = array(), $blah3 = 'yo') {}
+function myFunc(PHP_CodeSniffer $object, array $array = array(), $blah3 = 'yo') {}
+function myFunc(array  &$one, array  &$two) {}
+function myFunc(&$blah) {}
 function myFunc(&$blah) {}
-function myFunc( &$blah ) {}
 
 function multiLineFunction(
     array $flatList,
     $markup,
     array $otherList,
-    $lastOffset=0
+    $lastOffset = 0
 ) {
 }
 
 function multiLineFunction(
     $markup,
     array $otherList,
-    $lastOffset=0
+    $lastOffset = 0
 ) {
 }
 
-$noArgs_longVars = function ($longVar1,  $longerVar2= false) use (
-    $longVar1 ,  $longerVar2= false,
+$noArgs_longVars = function($longVar1, $longerVar2 = false) use (
+    $longVar1, $longerVar2 = false,
     $muchLongerVar3
 )  {
     // body
@@ -41,19 +41,19 @@ 
 
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing equalsSpacing 1
 function myFunc($blah = 'hello') {}
-function myFunc($blah  =  'hello') {}
-function myFunc($blah =  'hello') {}
+function myFunc($blah  = 'hello') {}
+function myFunc($blah = 'hello') {}
 function myFunc($blah  = 'hello') {}
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing equalsSpacing 0
 
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 1
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesBeforeClose 1
 function myFunc($blah) {}
-function myFunc( $blah ) {}
-function myFunc(  $blah  ) {}
-function myFunc( array $blah ) {}
-function myFunc(array $blah ) {}
-function myFunc(  array $blah ) {}
+function myFunc($blah) {}
+function myFunc($blah) {}
+function myFunc(array $blah) {}
+function myFunc(array $blah) {}
+function myFunc(array $blah) {}
 function myFunc() {}
 function myFunc( ) {}
 
@@ -61,16 +61,16 @@ 
 	array $flatList,
 	$markup,
 	array $otherList,
-	$lastOffset=0
+	$lastOffset = 0
 ) {
 }
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesBeforeClose 0
 
-function myFunc($req, $opt=null, ...$params) {}
+function myFunc($req, $opt = null, ...$params) {}
 function myFunc($param, &...$moreParams) {}
 
 function MissingParamTypeInDocBlock(array$a = null, callable$c, \ArrayObject$o, $foo = []) {}
 
 function myFunc(...$args) {}
-function myFunc( ...$args) {}
+function myFunc(...$args) {}

src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.inc

Spacing +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 function myFunc($blah, $x, $blah) {}
 function myFunc($a, $b, $c) {}
 function myFunc($a, $a, $a) {}
-function myFunc($a='1', $b='1', $a='2') {}
+function myFunc($a = '1', $b = '1', $a = '2') {}
 ?>