Symplify / PHP7_CodeSniffer

CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php

Indentation +13 added lines, -13 removed lines

@@ -85,15 +85,15 @@ 
 
         // Predicate nodes for PHP.
         $find = array(
-                 T_CASE    => true,
-                 T_DEFAULT => true,
-                 T_CATCH   => true,
-                 T_IF      => true,
-                 T_FOR     => true,
-                 T_FOREACH => true,
-                 T_WHILE   => true,
-                 T_DO      => true,
-                 T_ELSEIF  => true,
+                    T_CASE    => true,
+                    T_DEFAULT => true,
+                    T_CATCH   => true,
+                    T_IF      => true,
+                    T_FOR     => true,
+                    T_FOREACH => true,
+                    T_WHILE   => true,
+                    T_DO      => true,
+                    T_ELSEIF  => true,
                 );
 
         $complexity = 1;
@@ -108,16 +108,16 @@ 
         if ($complexity > $this->absoluteComplexity) {
             $error = 'Function\'s cyclomatic complexity (%s) exceeds allowed maximum of %s';
             $data  = array(
-                      $complexity,
-                      $this->absoluteComplexity,
-                     );
+                        $complexity,
+                        $this->absoluteComplexity,
+                        );
             $phpcsFile->addError($error, $stackPtr, 'MaxExceeded', $data);
         } else if ($complexity > $this->complexity) {
             $warning = 'Function\'s cyclomatic complexity (%s) exceeds %s; consider refactoring the function';
             $data    = array(
                         $complexity,
                         $this->complexity,
-                       );
+                        );
             $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data);
         }
 

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php

Indentation +4 added lines, -4 removed lines

@@ -62,24 +62,24 @@
             return array(
                     6 => 1,
                     7 => 1,
-                   );
+                    );
             break;
         case 'DuplicateClassNameUnitTest.2.inc':
             return array(
                     2 => 1,
                     3 => 1,
-                   );
+                    );
             break;
         case 'DuplicateClassNameUnitTest.5.inc':
             return array(
                     3 => 1,
                     7 => 1,
-                   );
+                    );
             break;
         case 'DuplicateClassNameUnitTest.6.inc':
             return array(
                     10 => 1,
-                   );
+                    );
             break;
         default:
             return array();

Switch Indentation +26 added lines, -26 removed lines

@@ -58,32 +58,32 @@
     public function getWarningList($testFile='')
     {
         switch ($testFile) {
-        case 'DuplicateClassNameUnitTest.1.inc':
-            return array(
-                    6 => 1,
-                    7 => 1,
-                   );
-            break;
-        case 'DuplicateClassNameUnitTest.2.inc':
-            return array(
-                    2 => 1,
-                    3 => 1,
-                   );
-            break;
-        case 'DuplicateClassNameUnitTest.5.inc':
-            return array(
-                    3 => 1,
-                    7 => 1,
-                   );
-            break;
-        case 'DuplicateClassNameUnitTest.6.inc':
-            return array(
-                    10 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'DuplicateClassNameUnitTest.1.inc':
+                return array(
+                        6 => 1,
+                        7 => 1,
+                       );
+                break;
+            case 'DuplicateClassNameUnitTest.2.inc':
+                return array(
+                        2 => 1,
+                        3 => 1,
+                       );
+                break;
+            case 'DuplicateClassNameUnitTest.5.inc':
+                return array(
+                        3 => 1,
+                        7 => 1,
+                       );
+                break;
+            case 'DuplicateClassNameUnitTest.6.inc':
+                return array(
+                        10 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getWarningList()

Spacing +1 added lines, -1 removed lines

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

CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.6.inc

Indentation +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 class Test{
     public function testOne(){
-     ?>
+        ?>
      <p>some html here</p>
     <?php 
-   }
+    }
 }
 
 class Test{

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php
-class Test{
-    public function testOne(){
+class Test {
+    public function testOne() {
      ?>
      <p>some html here</p>
     <?php 
    }
 }
 
-class Test{
+class Test {
 
 }

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php

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':

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();

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

CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php

Switch Indentation +22 added lines, -22 removed lines

@@ -43,28 +43,28 @@
     public function getErrorList($testFile='UnnecessaryStringConcatUnitTest.inc')
     {
         switch ($testFile) {
-        case 'UnnecessaryStringConcatUnitTest.inc':
-            return array(
-                    2  => 1,
-                    6  => 1,
-                    9  => 1,
-                    12 => 1,
-                    19 => 1,
-                    20 => 1,
-                   );
-            break;
-        case 'UnnecessaryStringConcatUnitTest.js':
-            return array(
-                    1  => 1,
-                    8  => 1,
-                    11 => 1,
-                    14 => 1,
-                    15 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'UnnecessaryStringConcatUnitTest.inc':
+                return array(
+                        2  => 1,
+                        6  => 1,
+                        9  => 1,
+                        12 => 1,
+                        19 => 1,
+                        20 => 1,
+                       );
+                break;
+            case 'UnnecessaryStringConcatUnitTest.js':
+                return array(
+                        1  => 1,
+                        8  => 1,
+                        11 => 1,
+                        14 => 1,
+                        15 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }
 
     }//end getErrorList()

Spacing +1 added lines, -1 removed lines

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

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();

CodeSniffer/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.inc

Indentation +1 added lines, -1 removed lines

@@ -9,4 +9,4 @@
         1
         2
         3
-       ];
\ No newline at end of file
+        ];
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 $var = array();
 $var = [];
-$var = array(1,2,3);
-$var = [1,2,3];
+$var = array(1, 2, 3);
+$var = [1, 2, 3];
 echo $var[1];
-$foo = [$var[1],$var[2]];
+$foo = [$var[1], $var[2]];
 $foo = [
         1
         2

CodeSniffer/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.inc

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         1
         2
         3
-       );
+        );
 $var = array/*comment*/(1,2,3);
 $var = array;
 

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
 $var = array();
-$var = [1,2,3];
-$var = array(1,2,3);
+$var = [1, 2, 3];
+$var = array(1, 2, 3);
 echo $var[1];
-$foo = array($var[1],$var[2]);
+$foo = array($var[1], $var[2]);
 $foo = array(
         1
         2
         3
        );
-$var = array/*comment*/(1,2,3);
+$var = array/*comment*/(1, 2, 3);
 $var = array;
 
 function foo(array $array) {}

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php

Switch Indentation +10 added lines, -10 removed lines

@@ -43,16 +43,16 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'EndFileNewlineUnitTest.3.inc':
-        case 'EndFileNewlineUnitTest.3.js':
-        case 'EndFileNewlineUnitTest.3.css':
-            return array(
-                    2 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'EndFileNewlineUnitTest.3.inc':
+            case 'EndFileNewlineUnitTest.3.js':
+            case 'EndFileNewlineUnitTest.3.css':
+                return array(
+                        2 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getErrorList()

Indentation +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

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