Symplify / PHP7_CodeSniffer

src/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
 };
 

src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/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"
 );

src/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);

src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php

Indentation +1 added lines, -1 removed lines

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

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 } while ($something);
 
 if(true)
-  $someObject->{$name};
+    $someObject->{$name};
 
 if (true) :
     $foo = true;

Switch Indentation +4 added lines, -4 removed lines

@@ -109,11 +109,11 @@
 switch($response = \Bar::baz('bat', function ($foo) {
     return 'bar';
 })) {
-    case 1:
-        return 'test';
+        case 1:
+            return 'test';
 
-    case 2:
-        return 'other';
+        case 2:
+            return 'other';
 }
 
 $stuff = [1,2,3];

Spacing +13 added lines, -13 removed lines

@@ -20,7 +20,7 @@ 
     $i--;
 } while ($something);
 
-if(true)
+if (true)
   $someObject->{$name};
 
 if (true) :
@@ -60,16 +60,16 @@ 
 function test()
 {
     if ($a)
-        $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
+        $a .= ' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
 }
 
 if ($a)
     foreach ($b as $c) {
         if ($d) {
-            $e=$f;
-            $g=$h;
-        } elseif ($i==0) {
-            $j=$k;
+            $e = $f;
+            $g = $h;
+        } elseif ($i == 0) {
+            $j = $k;
         }
     }
 
@@ -106,7 +106,7 @@ 
     } else {
     }
 
-switch($response = \Bar::baz('bat', function ($foo) {
+switch ($response = \Bar::baz('bat', function($foo) {
     return 'bar';
 })) {
     case 1:
@@ -116,22 +116,22 @@ 
         return 'other';
 }
 
-$stuff = [1,2,3];
-foreach($stuff as $num)
-    if ($num %2 ) {
+$stuff = [1, 2, 3];
+foreach ($stuff as $num)
+    if ($num % 2) {
         echo "even";
     } else {
         echo "odd";
     }
 
 $i = 0;
-foreach($stuff as $num)
+foreach ($stuff as $num)
     do {
         echo $i;
         $i++;
     } while ($i < 5);
 
-foreach($stuff as $num)
+foreach ($stuff as $num)
     if (true) {
         echo "true1\n";
     }
@@ -156,7 +156,7 @@ 
 }
 
 foreach ($sql as $s)
-        if (!$this->execute) echo "<pre>",$s.";\n</pre>";
+        if (!$this->execute) echo "<pre>", $s.";\n</pre>";
         else {
             $ok = $this->connDest->Execute($s);
             if (!$ok)

Braces +64 added lines, -30 removed lines

@@ -1,27 +1,40 @@ 
 <?php
 
-if ($something) echo 'hello';
+if ($something) {
+    echo 'hello';
+}
 
 if ($something) {
     echo 'hello';
-} else echo 'hi';
+} else {
+    echo 'hi';
+}
 
 if ($something) {
     echo 'hello';
-} else if ($else) echo 'hi';
+} else if ($else) {
+    echo 'hi';
+}
 
-foreach ($something as $thing) echo 'hello';
+foreach ($something as $thing) {
+    echo 'hello';
+}
 
-for ($i; $i > 0; $i--) echo 'hello';
+for ($i; $i > 0; $i--) {
+    echo 'hello';
+}
 
-while ($something) echo 'hello';
+while ($something) {
+    echo 'hello';
+}
 
 do {
     $i--;
 } while ($something);
 
-if(true)
+if(true) {
   $someObject->{$name};
+}
 
 if (true) :
     $foo = true;
@@ -42,31 +55,38 @@ 
 while (!$this->readLine($tokens, $tag));
 while (!$this->readLine($tokens, $tag)); //skip to end of file
 
-foreach ($cookies as $cookie)
+foreach ($cookies as $cookie) {
     if ($cookie->match($uri, $matchSessionCookies, $now))
         $ret[] = $cookie;
+}
 
-foreach ($stringParade as $hit)
-    $hitParade[] = $hit + 0; //cast to integer
+foreach ($stringParade as $hit) {
+    $hitParade[] = $hit + 0;
+}
+//cast to integer
 
 if ($foo) :
     echo 'true';
 elseif ($something) :
     echo 'foo';
-else:
+else {
+    :
     echo 'false';
+}
 endif;
 
 function test()
 {
-    if ($a)
-        $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
-}
+    if ($a) {
+            $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
+    }
+    }
 
-if ($a)
+if ($a) {
     foreach ($b as $c) {
         if ($d) {
             $e=$f;
+}
             $g=$h;
         } elseif ($i==0) {
             $j=$k;
@@ -75,7 +95,8 @@ 
 
 ?>
 <div style="text-align: right;">
-    <?php if ($model->scenario == 'simple') $widget->renderPager() ?>
+    <?php if ($model->scenario == 'simple') {
+    $widget->renderPager() ?>
 </div>
 
 <?php
@@ -83,6 +104,7 @@ 
     case Shop_Customer :: ERROR_INVALID_GENDER: ?>
         Ung&uuml;ltiges Geschlecht!
     <?php break;
+}
     case Shop_Customer :: ERROR_EMAIL_IN_USE: ?>
         Die eingetragene E-Mail-Adresse ist bereits registriert.
     <?php break;
@@ -95,8 +117,10 @@ 
             echo 'foo';
         endswitch;
     endif;
-else:
+else {
+    :
     echo 'foo';
+}
 endif;
 
 // ELSE IF split over multiple lines (not inline)
@@ -117,49 +141,59 @@ 
 }
 
 $stuff = [1,2,3];
-foreach($stuff as $num)
+foreach($stuff as $num) {
     if ($num %2 ) {
         echo "even";
+}
     } else {
         echo "odd";
     }
 
 $i = 0;
-foreach($stuff as $num)
+foreach($stuff as $num) {
     do {
         echo $i;
+}
         $i++;
     } while ($i < 5);
 
-foreach($stuff as $num)
+foreach($stuff as $num) {
     if (true) {
         echo "true1\n";
+}
     }
     if (true) {
         echo "true2\n";
     }
 
-if ($foo) echo 'foo';
-elseif ($bar) echo 'bar';
-else echo 'baz';
+if ($foo) {
+    echo 'foo';
+} elseif ($bar) {
+    echo 'bar';
+} else {
+    echo 'baz';
+}
 
 switch ($type) {
     case 1:
         if ($foo) {
             return true;
-        } elseif ($baz)
-            return true;
-        else {
+        } elseif ($baz) {
+                    return true;
+        } else {
             echo 'else';
         }
     break;
 }
 
-foreach ($sql as $s)
+foreach ($sql as $s) {
         if (!$this->execute) echo "<pre>",$s.";\n</pre>";
+}
         else {
             $ok = $this->connDest->Execute($s);
-            if (!$ok)
-                if ($this->neverAbort) $ret = false;
-                else return false;
+            if (!$ok) {
+                            if ($this->neverAbort) $ret = false;
+            } else {
+                    return false;
+                }
         }

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.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 +44 added lines, -44 removed lines

@@ -45,50 +45,50 @@
     public function getErrorList($testFile='InlineControlStructureUnitTest.inc')
     {
         switch ($testFile) {
-        case 'InlineControlStructureUnitTest.inc':
-            return array(
-                    3   => 1,
-                    7   => 1,
-                    11  => 1,
-                    13  => 1,
-                    15  => 1,
-                    17  => 1,
-                    23  => 1,
-                    42  => 1,
-                    43  => 1,
-                    45  => 1,
-                    46  => 1,
-                    49  => 1,
-                    62  => 1,
-                    66  => 1,
-                    78  => 1,
-                    120 => 1,
-                    128 => 1,
-                    134 => 1,
-                    142 => 1,
-                    143 => 1,
-                    144 => 1,
-                    150 => 1,
-                    158 => 1,
-                    159 => 1,
-                    162 => 1,
-                    163 => 1,
-                    164 => 1,
-                   );
-            break;
-        case 'InlineControlStructureUnitTest.js':
-            return array(
-                    3  => 1,
-                    7  => 1,
-                    11 => 1,
-                    13 => 1,
-                    15 => 1,
-                    21 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'InlineControlStructureUnitTest.inc':
+                return array(
+                        3   => 1,
+                        7   => 1,
+                        11  => 1,
+                        13  => 1,
+                        15  => 1,
+                        17  => 1,
+                        23  => 1,
+                        42  => 1,
+                        43  => 1,
+                        45  => 1,
+                        46  => 1,
+                        49  => 1,
+                        62  => 1,
+                        66  => 1,
+                        78  => 1,
+                        120 => 1,
+                        128 => 1,
+                        134 => 1,
+                        142 => 1,
+                        143 => 1,
+                        144 => 1,
+                        150 => 1,
+                        158 => 1,
+                        159 => 1,
+                        162 => 1,
+                        163 => 1,
+                        164 => 1,
+                       );
+                break;
+            case 'InlineControlStructureUnitTest.js':
+                return array(
+                        3  => 1,
+                        7  => 1,
+                        11 => 1,
+                        13 => 1,
+                        15 => 1,
+                        21 => 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='InlineControlStructureUnitTest.inc')
+    public function getErrorList($testFile = 'InlineControlStructureUnitTest.inc')
     {
         switch ($testFile) {
         case 'InlineControlStructureUnitTest.inc':