Symplify / PHP7_CodeSniffer

src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

Indentation +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
     return array(
             'whiz',
             'bang',
-           );
+            );
 
     case 2:
     return helper_func(

Switch Indentation +66 added lines, -66 removed lines

@@ -26,14 +26,14 @@ 
         $case = '1';
         return '1';
 
-case '2':
+    case '2':
     case '3':
         $case = '5';
     break;
 
-case '4':
-    $case = '4';
-break;
+    case '4':
+        $case = '4';
+    break;
 
     default:
         $case = null;
@@ -49,19 +49,19 @@ 
 
 // PEAR style.
 switch ($something) {
-case '1':
-    $case = '1';
-    break;
-case '2':
-case '3':
-    $case = '5';
-    break;
-case '4':
-    $case = '4';
-    break;
-default:
-    $case = null;
-    break;
+    case '1':
+        $case = '1';
+        break;
+    case '2':
+    case '3':
+        $case = '5';
+        break;
+    case '4':
+        $case = '4';
+        break;
+    default:
+        $case = null;
+        break;
 }
 
 // Valid, but missing BREAKS.
@@ -85,7 +85,7 @@ 
     Case '1' :
         $case = '1';
 
-case  '2':
+    case  '2':
     case  '3' :
         $case = '5';
 
@@ -140,21 +140,21 @@ 
 }
 
 switch ($var) {
-    case 'one':
-    case 'two':
-    break;
+        case 'one':
+        case 'two':
+        break;
 
-    case 'three':
-        // Nothing to do.
-    break;
+        case 'three':
+            // Nothing to do.
+        break;
 
-    case 'four':
-        echo $hi;
-    break;
+        case 'four':
+            echo $hi;
+        break;
 
-    default:
-        // No default.
-    break;
+        default:
+            // No default.
+        break;
 }
 
 switch ($var) {
@@ -170,8 +170,8 @@ 
 }
 
 switch ($name) {
-    case "1":
-        switch ($name2) {
+        case "1":
+            switch ($name2) {
             case "1":
                 return true;
             break;
@@ -183,24 +183,24 @@ 
             default:
                 // No default.
             break;
-        }
+            }
     break;
 
-    case "2":
+        case "2":
 switch ($name2) {
-    case "1":
-        return true;
-    break;
+            case "1":
+                return true;
+            break;
 
-    case "2":
-    return true;
-    break;
+            case "2":
+            return true;
+            break;
 
-    default:
-        // No default.
-    break;
+            default:
+                // No default.
+            break;
 }
-    break;
+        break;
 }
 
 switch ($name) {
@@ -221,9 +221,9 @@ 
 }
 
 switch ($name2) {
-    default:
-        // No default.
-    break;
+        default:
+            // No default.
+        break;
 }
 
 switch ($foo) {
@@ -258,15 +258,15 @@ 
 }
 
 switch ($something) {
-    case '1':
-        $case = '1';
-    break;
+        case '1':
+            $case = '1';
+        break;
 
-    case '2':
-        throw new Exception('message');
+        case '2':
+            throw new Exception('message');
 
-    default:
-    throw new Exception('message');
+        default:
+        throw new Exception('message');
 }
 
 switch ($something) {
@@ -280,9 +280,9 @@ 
 }
 
 switch ($foo) {
-    case '1':
-        return; // comment
-    break;
+        case '1':
+            return; // comment
+        break;
 
 }
 
@@ -305,13 +305,13 @@ 
 }
 
 switch ($foo) {
-    case 'bar':
-    throw new \Exception(
-        'bar'
-    );
-
-    default:
-    throw new \Exception(
-        'bar'
-    );
+        case 'bar':
+        throw new \Exception(
+            'bar'
+        );
+
+        default:
+        throw new \Exception(
+            'bar'
+        );
 }

src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc

Spacing +9 added lines, -9 removed lines

@@ -5,37 +5,37 @@
 }
 
 // Invalid.
-for ( $i = 0; $i < 10; $i++ ) {
+for ($i = 0; $i < 10; $i++) {
 }
 
-for ($i = 0;  $i < 10;  $i++) {
+for ($i = 0; $i < 10; $i++) {
 }
 
-for ($i = 0 ; $i < 10 ; $i++) {
+for ($i = 0; $i < 10; $i++) {
 }
 
-for ($i = 0;$i < 10;$i++) {
+for ($i = 0; $i < 10; $i++) {
 }
 
 // The works.
-for ( $i = 0 ;  $i < 10 ;  $i++ ) {
+for ($i = 0; $i < 10; $i++) {
 }
 
 for ($i = 0; $i < 10;) {
 }
 
-for ($i = 0; $i < 10; ) {
+for ($i = 0; $i < 10;) {
 }
 
 for ($i = 0; ; $i++) {
 }
-for ($i = 0;; $i++) {
+for ($i = 0; ; $i++) {
 }
 
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
 for ($i = 0; $i < 10; $i++) {}
-for ( $i = 0; $i < 10; $i++ ) {}
-for (  $i = 0; $i < 10; $i++  ) {}
+for ($i = 0; $i < 10; $i++) {}
+for ($i = 0; $i < 10; $i++) {}
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0

src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc

Switch Indentation +2 added lines, -2 removed lines

@@ -157,8 +157,8 @@
 
 switch($foo) {
 
-    case 'bar':
-    break;
+        case 'bar':
+        break;
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -17,15 +17,15 @@ 
 
 do { echo $i; } while ($i > 0);
 
-do{
+do {
     echo $i;
-}while($i > 0);
+} while ($i > 0);
 
 while ($i < 1) {
     echo $i;
 }
 
-while($i < 1){
+while ($i < 1) {
     echo $i;
 }
 
@@ -35,7 +35,7 @@ 
     echo $i;
 }
 
-for($i = 1; $i < 1; $i++){
+for ($i = 1; $i < 1; $i++) {
     echo $i;
 }
 
@@ -45,7 +45,7 @@ 
     $i = 1;
 }
 
-if($i == 0){
+if ($i == 0) {
     $i = 1;
 }
 
@@ -59,7 +59,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else {
     $i = 0;
 }
 
@@ -73,7 +73,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else   if($i == 2){
+} else   if ($i == 2) {
     $i = 0;
 }
 
@@ -127,7 +127,7 @@ 
     echo $item;
 }
 
-foreach($items as $item){
+foreach ($items as $item) {
     echo $item;
 }
 
@@ -155,7 +155,7 @@ 
     // catch body
 }
 
-switch($foo) {
+switch ($foo) {
 
     case 'bar':
     break;
@@ -167,7 +167,7 @@ 
 
 ?>
 
-<?php while($row = $data->getRow()): ?>
+<?php while ($row = $data->getRow()): ?>
     <p><?= $val ?></p>
 <?php endwhile; ?>
 
@@ -183,8 +183,8 @@ 
 }
 
 ?>
-<?php foreach($formset['Fieldset'] as $fieldset): ?>
-    <?php foreach($fieldset['Field'] as $field): ?> 
+<?php foreach ($formset['Fieldset'] as $fieldset): ?>
+    <?php foreach ($fieldset['Field'] as $field): ?> 
     <?php endforeach; ?>
 <?php endforeach; ?>
 

Braces +14 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else{
     $i = 0;
 }
 
@@ -73,7 +73,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else   if($i == 2){
+} else   if($i == 2){
     $i = 0;
 }
 
@@ -96,11 +96,13 @@ 
     $i = 1;
 }
 
-if ($i == 0) /* this is ok */ {
+if ($i == 0) {
+    /* this is ok */ {
 }
 
 try {
     $code = 'this';
+}
 } catch (Exception $e) {
     // Caught!
 }
@@ -119,8 +121,7 @@ 
 
 if ($a) {
 
-}
-elseif ($b) {
+} elseif ($b) {
 }
 
 foreach ($items as $item) {
@@ -131,27 +132,29 @@ 
     echo $item;
 }
 
-if ($a && $b) // && $c)
+if ($a && $b) {
+    // && $c)
 {
 }
 
 if ($a == 5) :
     echo "a equals 5";
+}
     echo "...";
 elseif ($a == 6) :
     echo "a equals 6";
     echo "!!!";
-else :
+else {
+    :
     echo "a is neither 5 nor 6";
+}
 endif;
 
 try {
     // try body
-}
-catch (FirstExceptionType $e) {
+} catch (FirstExceptionType $e) {
     // catch body
-}
-catch (OtherExceptionType $e) {
+} catch (OtherExceptionType $e) {
     // catch body
 }
 

src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php

Indentation +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='SwitchDeclarationUnitTest.inc')
+    public function getErrorList($testFile = 'SwitchDeclarationUnitTest.inc')
     {
         return array(
                 27  => 1,
@@ -100,7 +100,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='SwitchDeclarationUnitTest.inc')
+    public function getWarningList($testFile = 'SwitchDeclarationUnitTest.inc')
     {
         if ($testFile === 'SwitchDeclarationUnitTest.js') {
             return array(273 => 1);

src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.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/NamingConventions/ValidFunctionNameUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php

Indentation +29 added lines, -29 removed lines

@@ -43,35 +43,35 @@
     public function getErrorList()
     {
         $errors = array(
-                   3   => 1,
-                   5   => 1,
-                   10  => 1,
-                   12  => 1,
-                   15  => 1,
-                   17  => 1,
-                   20  => 1,
-                   22  => 1,
-                   25  => 1,
-                   27  => 1,
-                   31  => 1,
-                   33  => 1,
-                   36  => 1,
-                   37  => 1,
-                   39  => 1,
-                   42  => 1,
-                   44  => 1,
-                   53  => 1,
-                   58  => 1,
-                   62  => 1,
-                   63  => 1,
-                   64  => 1,
-                   67  => 1,
-                   81  => 1,
-                   106 => 1,
-                   107 => 1,
-                   108 => 1,
-                   117 => 1,
-                  );
+                    3   => 1,
+                    5   => 1,
+                    10  => 1,
+                    12  => 1,
+                    15  => 1,
+                    17  => 1,
+                    20  => 1,
+                    22  => 1,
+                    25  => 1,
+                    27  => 1,
+                    31  => 1,
+                    33  => 1,
+                    36  => 1,
+                    37  => 1,
+                    39  => 1,
+                    42  => 1,
+                    44  => 1,
+                    53  => 1,
+                    58  => 1,
+                    62  => 1,
+                    63  => 1,
+                    64  => 1,
+                    67  => 1,
+                    81  => 1,
+                    106 => 1,
+                    107 => 1,
+                    108 => 1,
+                    117 => 1,
+                    );
 
         return $errors;