Symplify / PHP7_CodeSniffer

CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php

Indentation +9 added lines, -9 removed lines

@@ -109,9 +109,9 @@ 
         // Check that the closing brace is on it's own line.
         $lastContent = $phpcsFile->findPrevious(
             array(
-             T_WHITESPACE,
-             T_INLINE_HTML,
-             T_OPEN_TAG,
+                T_WHITESPACE,
+                T_INLINE_HTML,
+                T_OPEN_TAG,
             ),
             ($scopeEnd - 1),
             $scopeStart,
@@ -160,9 +160,9 @@ 
             if ($braceIndent !== $expectedIndent) {
                 $error = 'Case breaking statement indented incorrectly; expected %s spaces, found %s';
                 $data  = array(
-                          $expectedIndent,
-                          $braceIndent,
-                         );
+                            $expectedIndent,
+                            $braceIndent,
+                            );
                 $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
             }
         } else {
@@ -170,9 +170,9 @@ 
             if ($braceIndent !== $expectedIndent) {
                 $error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
                 $data  = array(
-                          $expectedIndent,
-                          $braceIndent,
-                         );
+                            $expectedIndent,
+                            $braceIndent,
+                            );
                 $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
             }
         }//end if

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
                           $expectedIndent,
                           $braceIndent,
                          );
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
+                $fix = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
             }
         } else {
             $expectedIndent = ($startColumn - 1);
@@ -173,7 +173,7 @@ 
                           $expectedIndent,
                           $braceIndent,
                          );
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
+                $fix = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
             }
         }//end if
 

CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php

Indentation +12 added lines, -12 removed lines

@@ -34,9 +34,9 @@ 
      * @var array
      */
     public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
+                                    'PHP',
+                                    'JS',
+                                    );
 
     /**
      * The number of spaces code should be indented.
@@ -225,9 +225,9 @@ 
             if ($spaceAfterOpen !== $this->requiredSpacesAfterOpen) {
                 $error = 'Expected %s spaces after opening bracket; %s found';
                 $data  = array(
-                          $this->requiredSpacesAfterOpen,
-                          $spaceAfterOpen,
-                         );
+                            $this->requiredSpacesAfterOpen,
+                            $spaceAfterOpen,
+                            );
                 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpenBracket', $data);
                 if ($fix === true) {
                     $padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
@@ -257,9 +257,9 @@ 
         if ($spaceBeforeClose !== $this->requiredSpacesBeforeClose) {
             $error = 'Expected %s spaces before closing bracket; %s found';
             $data  = array(
-                      $this->requiredSpacesBeforeClose,
-                      $spaceBeforeClose,
-                     );
+                        $this->requiredSpacesBeforeClose,
+                        $spaceBeforeClose,
+                        );
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeCloseBracket', $data);
             if ($fix === true) {
                 $padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
@@ -447,9 +447,9 @@ 
                     ) {
                         $error = 'Multi-line function call not indented correctly; expected %s spaces but found %s';
                         $data  = array(
-                                  $expectedIndent,
-                                  $foundIndent,
-                                 );
+                                    $expectedIndent,
+                                    $foundIndent,
+                                    );
 
                         $fix = $phpcsFile->addFixableError($error, $i, 'Indent', $data);
                         if ($fix === true) {

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
                           $this->requiredSpacesAfterOpen,
                           $spaceAfterOpen,
                          );
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpenBracket', $data);
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpenBracket', $data);
                 if ($fix === true) {
                     $padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
                     if ($spaceAfterOpen === 0) {
@@ -260,7 +260,7 @@ 
                       $this->requiredSpacesBeforeClose,
                       $spaceBeforeClose,
                      );
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeCloseBracket', $data);
+            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeCloseBracket', $data);
             if ($fix === true) {
                 $padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
                 if ($spaceBeforeClose === 0) {

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return boolean
      */
     protected function shouldSkipTest()
     {

CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php

Indentation +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
         return array(
                 T_FUNCTION,
                 T_CLOSURE,
-               );
+                );
 
     }//end register()
 
@@ -353,9 +353,9 @@ 
                 if ($expectedIndent !== $foundIndent) {
                     $error = 'Multi-line function declaration not indented correctly; expected %s spaces but found %s';
                     $data  = array(
-                              $expectedIndent,
-                              $foundIndent,
-                             );
+                                $expectedIndent,
+                                $foundIndent,
+                                );
 
                     $fix = $phpcsFile->addFixableError($error, $i, 'Indent', $data);
                     if ($fix === true) {

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return boolean
      */
     protected function shouldSkipTest()
     {

CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php

Indentation +73 added lines, -73 removed lines

@@ -35,51 +35,51 @@ 
      * @var array
      */
     protected $tags = array(
-                       '@category'   => array(
-                                         'required'       => true,
-                                         'allow_multiple' => false,
+                        '@category'   => array(
+                                            'required'       => true,
+                                            'allow_multiple' => false,
                                         ),
-                       '@package'    => array(
-                                         'required'       => true,
-                                         'allow_multiple' => false,
+                        '@package'    => array(
+                                            'required'       => true,
+                                            'allow_multiple' => false,
                                         ),
-                       '@subpackage' => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
+                        '@subpackage' => array(
+                                            'required'       => false,
+                                            'allow_multiple' => false,
                                         ),
-                       '@author'     => array(
-                                         'required'       => true,
-                                         'allow_multiple' => true,
+                        '@author'     => array(
+                                            'required'       => true,
+                                            'allow_multiple' => true,
                                         ),
-                       '@copyright'  => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
+                        '@copyright'  => array(
+                                            'required'       => false,
+                                            'allow_multiple' => true,
                                         ),
-                       '@license'    => array(
-                                         'required'       => true,
-                                         'allow_multiple' => false,
+                        '@license'    => array(
+                                            'required'       => true,
+                                            'allow_multiple' => false,
                                         ),
-                       '@version'    => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
+                        '@version'    => array(
+                                            'required'       => false,
+                                            'allow_multiple' => false,
                                         ),
-                       '@link'       => array(
-                                         'required'       => true,
-                                         'allow_multiple' => true,
+                        '@link'       => array(
+                                            'required'       => true,
+                                            'allow_multiple' => true,
                                         ),
-                       '@see'        => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
+                        '@see'        => array(
+                                            'required'       => false,
+                                            'allow_multiple' => true,
                                         ),
-                       '@since'      => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
+                        '@since'      => array(
+                                            'required'       => false,
+                                            'allow_multiple' => false,
                                         ),
-                       '@deprecated' => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
+                        '@deprecated' => array(
+                                            'required'       => false,
+                                            'allow_multiple' => false,
                                         ),
-                      );
+                        );
 
 
     /**
@@ -159,24 +159,24 @@ 
         );
 
         $ignore = array(
-                   T_CLASS,
-                   T_INTERFACE,
-                   T_TRAIT,
-                   T_FUNCTION,
-                   T_CLOSURE,
-                   T_PUBLIC,
-                   T_PRIVATE,
-                   T_PROTECTED,
-                   T_FINAL,
-                   T_STATIC,
-                   T_ABSTRACT,
-                   T_CONST,
-                   T_PROPERTY,
-                   T_INCLUDE,
-                   T_INCLUDE_ONCE,
-                   T_REQUIRE,
-                   T_REQUIRE_ONCE,
-                  );
+                    T_CLASS,
+                    T_INTERFACE,
+                    T_TRAIT,
+                    T_FUNCTION,
+                    T_CLOSURE,
+                    T_PUBLIC,
+                    T_PRIVATE,
+                    T_PROTECTED,
+                    T_FINAL,
+                    T_STATIC,
+                    T_ABSTRACT,
+                    T_CONST,
+                    T_PROPERTY,
+                    T_INCLUDE,
+                    T_INCLUDE_ONCE,
+                    T_REQUIRE,
+                    T_REQUIRE_ONCE,
+                    );
 
         if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
@@ -246,9 +246,9 @@ 
             if ($this->tags[$name]['allow_multiple'] === false && isset($tagTokens[$name]) === true) {
                 $error = 'Only one %s tag is allowed in a %s comment';
                 $data  = array(
-                          $name,
-                          $docBlock,
-                         );
+                            $name,
+                            $docBlock,
+                            );
                 $phpcsFile->addError($error, $tag, 'Duplicate'.ucfirst(substr($name, 1)).'Tag', $data);
             }
 
@@ -259,9 +259,9 @@ 
             if ($string === false || $tokens[$string]['line'] !== $tokens[$tag]['line']) {
                 $error = 'Content missing for %s tag in %s comment';
                 $data  = array(
-                          $name,
-                          $docBlock,
-                         );
+                            $name,
+                            $docBlock,
+                            );
                 $phpcsFile->addError($error, $tag, 'Empty'.ucfirst(substr($name, 1)).'Tag', $data);
                 continue;
             }
@@ -274,9 +274,9 @@ 
                 if ($tagData['required'] === true) {
                     $error = 'Missing %s tag in %s comment';
                     $data  = array(
-                              $tag,
-                              $docBlock,
-                             );
+                                $tag,
+                                $docBlock,
+                                );
                     $phpcsFile->addError($error, $commentEnd, 'Missing'.ucfirst(substr($tag, 1)).'Tag', $data);
                 }
 
@@ -296,9 +296,9 @@ 
             if ($foundTags[$pos] !== $tag) {
                 $error = 'The tag in position %s should be the %s tag';
                 $data  = array(
-                          ($pos + 1),
-                          $tag,
-                         );
+                            ($pos + 1),
+                            $tag,
+                            );
                 $phpcsFile->addError($error, $tokens[$commentStart]['comment_tags'][$pos], ucfirst(substr($tag, 1)).'TagOrder', $data);
             }
 
@@ -344,9 +344,9 @@ 
                 $error     = 'Category name "%s" is not valid; consider "%s" instead';
                 $validName = trim($newName, '_');
                 $data      = array(
-                              $content,
-                              $validName,
-                             );
+                                $content,
+                                $validName,
+                                );
                 $phpcsFile->addError($error, $tag, 'InvalidCategory', $data);
             }
         }//end foreach
@@ -397,9 +397,9 @@ 
                 $error     = 'Package name "%s" is not valid; consider "%s" instead';
                 $validName = trim($newName, '_');
                 $data      = array(
-                              $content,
-                              $validName,
-                             );
+                                $content,
+                                $validName,
+                                );
                 $phpcsFile->addError($error, $tag, 'InvalidPackage', $data);
             }//end if
         }//end foreach
@@ -442,9 +442,9 @@ 
             $error     = 'Subpackage name "%s" is not valid; consider "%s" instead';
             $validName = trim($newName, '_');
             $data      = array(
-                          $content,
-                          $validName,
-                         );
+                            $content,
+                            $validName,
+                            );
             $phpcsFile->addError($error, $tag, 'InvalidSubpackage', $data);
         }//end foreach
 

CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php

Indentation +14 added lines, -14 removed lines

@@ -272,12 +272,12 @@ 
             }//end if
 
             $params[] = array(
-                         'tag'        => $tag,
-                         'type'       => $type,
-                         'var'        => $var,
-                         'comment'    => $comment,
-                         'type_space' => $typeSpace,
-                         'var_space'  => $varSpace,
+                            'tag'        => $tag,
+                            'type'       => $type,
+                            'var'        => $var,
+                            'comment'    => $comment,
+                            'type_space' => $typeSpace,
+                            'var_space'  => $varSpace,
                         );
         }//end foreach
 
@@ -304,9 +304,9 @@ 
             if ($param['type_space'] !== $spaces) {
                 $error = 'Expected %s spaces after parameter type; %s found';
                 $data  = array(
-                          $spaces,
-                          $param['type_space'],
-                         );
+                            $spaces,
+                            $param['type_space'],
+                            );
 
                 $fix = $phpcsFile->addFixableError($error, $param['tag'], 'SpacingAfterParamType', $data);
                 if ($fix === true) {
@@ -325,8 +325,8 @@ 
                 if ($realName !== $param['var']) {
                     $code = 'ParamNameNoMatch';
                     $data = array(
-                             $param['var'],
-                             $realName,
+                                $param['var'],
+                                $realName,
                             );
 
                     $error = 'Doc comment for parameter %s does not match ';
@@ -354,9 +354,9 @@ 
             if ($param['var_space'] !== $spaces) {
                 $error = 'Expected %s spaces after parameter name; %s found';
                 $data  = array(
-                          $spaces,
-                          $param['var_space'],
-                         );
+                            $spaces,
+                            $param['var_space'],
+                            );
 
                 $fix = $phpcsFile->addFixableError($error, $param['tag'], 'SpacingAfterParamName', $data);
                 if ($fix === true) {

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/PEAR/Tests/Classes/ClassDeclarationUnitTest.inc

Indentation +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
 }
 
 class IncorrectBracePlacement
- {
- }
+    {
+    }
 
 abstract class CodeSnifferFail
     extends

CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.inc

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 if (($condition1
     || $condition2)
- ) {
+    ) {
 }
 
 if (

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
 
 if (($condition1
     || $condition2)
-)  {
+) {
 }
 
 if (($condition1
@@ -64,7 +64,7 @@ 
 }
 
 
-if (   $condition1
+if ($condition1
     || $condition2
     || $condition3
 ) {
@@ -98,7 +98,7 @@ 
 
 if ($condition1
     || $condition2 || $condition3
-){
+) {
 }
 
 if ($condition1)

Braces +12 added lines, -5 removed lines

@@ -101,19 +101,22 @@ 
 ){
 }
 
-if ($condition1)
+if ($condition1) {
     echo 'bar';
+}
 
 if ($condition1
     || $condition2
-|| $condition3)
+|| $condition3) {
     echo 'bar';
+}
 
 
 if ($condition1
     || $condition2 || $condition3
-)
+) {
     echo 'bar';
+}
 
 if (!empty($post)
     && (!empty($context['header'])
@@ -142,18 +145,22 @@ 
 endif;
 
 if ($IPP->errorCode() == 401 || // comment
-    $IPP->errorCode() == 3200)  /* long comment
+    $IPP->errorCode() == 3200) {
+    /* long comment
                                    here
                                  */
 {
     return false;
 }
+}
 
 if ($IPP->errorCode() == 401 || // comment
-    $IPP->errorCode() == 3200)  // long comment here
+    $IPP->errorCode() == 3200) {
+    // long comment here
 {
     return false;
 }
+}
 
 if ($IPP->errorCode() == 401
     // Comment explaining the next condition here.

CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.inc

Spacing +10 added lines, -10 removed lines

@@ -19,9 +19,9 @@ 
 
 do { echo $i; } while ($i > 0);
 
-do{
+do {
     echo $i;
-}while($i > 0);
+} while ($i > 0);
 
 
 // while
@@ -29,7 +29,7 @@ 
     echo $i;
 }
 
-while($i < 1){
+while ($i < 1) {
     echo $i;
 }
 
@@ -41,7 +41,7 @@ 
     echo $i;
 }
 
-for($i = 1; $i < 1; $i++){
+for ($i = 1; $i < 1; $i++) {
     echo $i;
 }
 
@@ -53,7 +53,7 @@ 
     echo $item;
 }
 
-foreach($items as $item){
+foreach ($items as $item) {
     echo $item;
 }
 
@@ -65,7 +65,7 @@ 
     $i = 1;
 }
 
-if($i == 0){
+if ($i == 0) {
     $i = 1;
 }
 
@@ -81,7 +81,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else {
     $i = 0;
 }
 
@@ -97,7 +97,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else {
     $i = 0;
 }
 
@@ -119,13 +119,13 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else if($i == 2){
+} else if ($i == 2) {
     $i = 0;
 }
 
 if ($i == 0) {
     $i = 1;
-}elseif($i == 2){
+}elseif ($i == 2) {
     $i = 0;
 }
 

Braces +5 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else{
     $i = 0;
 }
 
@@ -97,7 +97,7 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else{
+} else{
     $i = 0;
 }
 
@@ -119,13 +119,13 @@ 
 
 if ($i == 0) {
     $i = 1;
-}else if($i == 2){
+} else if($i == 2){
     $i = 0;
 }
 
 if ($i == 0) {
     $i = 1;
-}elseif($i == 2){
+} elseif($i == 2){
     $i = 0;
 }
 
@@ -153,7 +153,6 @@ 
 }
 
 if ($i == 0) {
-}
-else {
+} else {
 }
 ?>
\ No newline at end of file

CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php

Indentation +25 added lines, -25 removed lines

@@ -45,31 +45,31 @@
     public function getErrorList($testFile='MultiLineConditionUnitTest.inc')
     {
         $errors = array(
-                   21  => 1,
-                   22  => 1,
-                   35  => 1,
-                   40  => 1,
-                   41  => 1,
-                   42  => 1,
-                   43  => 1,
-                   49  => 1,
-                   54  => 1,
-                   57  => 1,
-                   58  => 1,
-                   59  => 1,
-                   61  => 1,
-                   67  => 1,
-                   87  => 1,
-                   88  => 1,
-                   89  => 1,
-                   90  => 1,
-                   96  => 2,
-                   101 => 1,
-                   109 => 2,
-                   125 => 1,
-                   145 => 1,
-                   153 => 1,
-                  );
+                    21  => 1,
+                    22  => 1,
+                    35  => 1,
+                    40  => 1,
+                    41  => 1,
+                    42  => 1,
+                    43  => 1,
+                    49  => 1,
+                    54  => 1,
+                    57  => 1,
+                    58  => 1,
+                    59  => 1,
+                    61  => 1,
+                    67  => 1,
+                    87  => 1,
+                    88  => 1,
+                    89  => 1,
+                    90  => 1,
+                    96  => 2,
+                    101 => 1,
+                    109 => 2,
+                    125 => 1,
+                    145 => 1,
+                    153 => 1,
+                    );
 
         if ($testFile === 'MultiLineConditionUnitTest.inc') {
             $errors[167] = 1;

Spacing +1 added lines, -1 removed lines

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