Symplify / PHP7_CodeSniffer

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php

Indentation +21 added lines, -21 removed lines

@@ -45,27 +45,27 @@
     public function getErrorList($testFile='ControlSignatureUnitTest.inc')
     {
         $errors = array(
-                   7   => 1,
-                   12  => 1,
-                   15  => 1,
-                   18  => 1,
-                   20  => 1,
-                   22  => 2,
-                   28  => 2,
-                   32  => 1,
-                   38  => 2,
-                   42  => 1,
-                   48  => 2,
-                   52  => 1,
-                   62  => 2,
-                   66  => 2,
-                   76  => 4,
-                   80  => 2,
-                   94  => 1,
-                   99  => 1,
-                   108 => 1,
-                   112 => 1,
-                  );
+                    7   => 1,
+                    12  => 1,
+                    15  => 1,
+                    18  => 1,
+                    20  => 1,
+                    22  => 2,
+                    28  => 2,
+                    32  => 1,
+                    38  => 2,
+                    42  => 1,
+                    48  => 2,
+                    52  => 1,
+                    62  => 2,
+                    66  => 2,
+                    76  => 4,
+                    80  => 2,
+                    94  => 1,
+                    99  => 1,
+                    108 => 1,
+                    112 => 1,
+                    );
 
         if ($testFile === 'ControlSignatureUnitTest.inc') {
             $errors[122] = 1;

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ControlSignatureUnitTest.inc')
+    public function getErrorList($testFile = 'ControlSignatureUnitTest.inc')
     {
         $errors = array(
                    7   => 1,

CodeSniffer/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
 }
 

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

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         return array(
                 8  => 1,
                 13 => 1,
-               );
+                );
 
     }//end getErrorList()
 

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.inc

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForEachLoopDeclaration requiredSpacesBeforeClose 0
 
 foreach ([
-          'foo'    => 'bar',
-          'foobaz' => 'bazzy',
-         ] as $key => $value) {
+            'foo'    => 'bar',
+            'foobaz' => 'bazzy',
+            ] as $key => $value) {
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 }
 
 // Invalid.
-foreach ( $something as $blah => $that ) {
+foreach ($something as $blah => $that) {
 }
 
 foreach ($something   as   $blah => $that) {
@@ -18,14 +18,14 @@ 
 }
 
 // The works.
-foreach (  $something   aS   $blah    =>   $that   ) {
+foreach ($something   aS   $blah    =>   $that) {
 }
 
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForEachLoopDeclaration requiredSpacesAfterOpen 1
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForEachLoopDeclaration requiredSpacesBeforeClose 1
 foreach ($something as $blah => $that) {}
-foreach ( $something as $blah => $that ) {}
-foreach (  $something as $blah => $that  ) {}
+foreach ($something as $blah => $that) {}
+foreach ($something as $blah => $that) {}
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForEachLoopDeclaration requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting Squiz.ControlStructures.ForEachLoopDeclaration requiredSpacesBeforeClose 0
 

CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
 echo ($hello);
 echo ($loan_device->returndate == 0) ? 'Not returned' : date('d/m/Y', $loan_device->returndate);
 ?>
-<p><?php echo ($foo) ?  'true' : 'false' ?></p>
+<p><?php echo ($foo) ? 'true' : 'false' ?></p>
 <p><?php echo ($foo) ?></p>
\ No newline at end of file

CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                 18 => 1,
                 34 => 2,
                 36 => 1,
-               );
+                );
 
     }//end getErrorList()
 

CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 $string = "\0";
 
 $x = "bar = '$z',
-baz = '" . $a . "'...$x";
+baz = '".$a."'...$x";
 
 $string = "Hello
 there";

CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.inc

Indentation +8 added lines, -8 removed lines

@@ -6,8 +6,8 @@ 
 $string = 'Hello' .$there;
 
 $y = '1'
-   . '2'
-   . '3';
+    . '2'
+    . '3';
 
 // @codingStandardsChangeSetting Squiz.Strings.ConcatenationSpacing spacing 1
 
@@ -19,18 +19,18 @@ 
 
 // @codingStandardsChangeSetting Squiz.Strings.ConcatenationSpacing ignoreNewlines true
 $y = '1'
-   . '2'
-   . '3';
+    . '2'
+    . '3';
 
 $y = '1' .
-     '2' .
-     '3';
+        '2' .
+        '3';
 
 $y = '1'
 . '2'
 . '3';
 
 $y = '1'
-   .'2'.
+    .'2'.
     '3'
-   .  '4';
\ No newline at end of file
+    .  '4';
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 $string = 'Hello'.$there.'. How are'.$you.$going."today $okay";
-$string = 'Hello' . $there . '. How are' . $you . $going . "today $okay";
+$string = 'Hello'.$there.'. How are'.$you.$going."today $okay";
+$string = 'Hello'.$there;
+$string = 'Hello'.$there;
 $string = 'Hello'.$there;
-$string = 'Hello'. $there;
-$string = 'Hello' .$there;
 
 $y = '1'
    . '2'
@@ -11,19 +11,19 @@ 
 
 // @codingStandardsChangeSetting Squiz.Strings.ConcatenationSpacing spacing 1
 
-$string = 'Hello'.$there.'. How are'.$you.$going.   "today $okay";
-$string = 'Hello' . $there . '. How are' . $you . $going . "today $okay";
+$string = 'Hello'.$there.'. How are'.$you.$going."today $okay";
+$string = 'Hello'.$there.'. How are'.$you.$going."today $okay";
+$string = 'Hello'.$there;
+$string = 'Hello'.$there;
 $string = 'Hello'.$there;
-$string = 'Hello'. $there;
-$string = 'Hello' .$there;
 
 // @codingStandardsChangeSetting Squiz.Strings.ConcatenationSpacing ignoreNewlines true
 $y = '1'
    . '2'
    . '3';
 
-$y = '1' .
-     '2' .
+$y = '1'.
+     '2'.
      '3';
 
 $y = '1'

CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                 21 => 1,
                 28 => 1,
                 29 => 1,
-               );
+                );
 
     }//end getErrorList()