Symplify / PHP7_CodeSniffer

CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
     function test1()
     {
-     }
+        }
 
     function test2() {}
 
@@ -21,7 +21,7 @@ 
 
 class Test2
 {
- }
+    }
 
 
 public function test2()

Switch Indentation +17 added lines, -17 removed lines

@@ -48,18 +48,18 @@ 
 switch ($foo) {
 case 1:
     switch ($bar) {
-    default:
-        if ($something) {
-            echo $string{1};
-        } else if ($else) {
-            switch ($else) {
-            case 1:
-                // Do something.
-                break;
-            default:
-                // Do something.
-            break;
-            }
+        default:
+            if ($something) {
+                echo $string{1};
+            } else if ($else) {
+                switch ($else) {
+                    case 1:
+                        // Do something.
+                        break;
+                    default:
+                        // Do something.
+                    break;
+                }
         }
     }
 break;
@@ -69,11 +69,11 @@ 
 }
 
 switch ($httpResponseCode) {
-    case 100:
-    case 101:
-    case 102:
-    default:
-        return 'Unknown';
+        case 100:
+        case 101:
+        case 102:
+        default:
+            return 'Unknown';
 }
 
 switch ($httpResponseCode) {

Spacing +6 added lines, -6 removed lines

@@ -33,8 +33,8 @@ 
     if (!class_exists($class_name)) {
         echo $error;
     }
-    $this->{$property} =& new $class_name($this->db_index);
-    $this->modules[$module] =& $this->{$property};
+    $this->{$property} = & new $class_name($this->db_index);
+    $this->modules[$module] = & $this->{$property};
 }
 
 foreach ($elements as $element) {
@@ -85,7 +85,7 @@ 
     return 'Unknown';
 }
 
-switch($i) {
+switch ($i) {
 case 1: {}
 }
 
@@ -127,15 +127,15 @@ 
             <?php endforeach ?>
 </ul>
 <?php
-switch ( $a ) {
+switch ($a) {
     case 'foo':
         do {
             $a = 'b';
-        } while ( $a );
+        } while ($a);
     return 5;
 
     case 'bar':
-        foreach ( $a as $b ) {
+        foreach ($a as $b) {
             $e = 'b';
         }
     return 5;

CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                 48 => 1,
                 49 => 1,
                 50 => 1,
-               );
+                );
 
     }//end getErrorList()
 

CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.inc

Indentation +20 added lines, -20 removed lines

@@ -4,30 +4,30 @@ 
 {
     function __construct()
     {
-       $this->hello(); // error here
+        $this->hello(); // error here
     }
 
-   function hello() // error here
+    function hello() // error here
     { // no error here as brackets can be put anywhere in the pear standard
         echo 'hello';
     }
 
     function hello2()
     {
-       if (TRUE) { // error here
+        if (TRUE) { // error here
             echo 'hello'; // no error here as its more than 4 spaces.
         } else {
         echo 'bye'; // error here
         }
 
         while (TRUE) {
-           echo 'hello'; // error here
-         }
+            echo 'hello'; // error here
+            }
 
-       do { // error here
-         echo 'hello'; // error here
-       } while (TRUE);
-   }
+        do { // error here
+            echo 'hello'; // error here
+        } while (TRUE);
+    }
 
     function hello3()
     {
@@ -123,7 +123,7 @@ 
    */
 
     /**
-   */
+     */
 
     /*
       This comment has a newline in it.
@@ -136,14 +136,14 @@ 
 
         // no errors below.
         $array = array(
-                  'this',
-                  'that' => array(
-                             'hello',
-                             'hello again' => array(
-                                               'hello',
-                                              ),
+                    'this',
+                    'that' => array(
+                                'hello',
+                                'hello again' => array(
+                                                'hello',
+                                                ),
                             ),
-                 );
+                    );
     }
 }
 
@@ -221,8 +221,8 @@ 
 {
     /* taken from http://de3.php.net/manual/en/reserved.php */
     # $m[] = 'declare';
-   /* taken from http://de3.php.net/manual/en/reserved.php */
-   # $m[] = 'declare';
+    /* taken from http://de3.php.net/manual/en/reserved.php */
+    # $m[] = 'declare';
 }
 
 foreach ($elements as $element) {
@@ -308,7 +308,7 @@ 
 array_map(
     function($x)
     {
-       return trim($x);
+        return trim($x);
     },
     $array
 );
\ No newline at end of file

Switch Indentation +27 added lines, -27 removed lines

@@ -32,8 +32,8 @@ 
     function hello3()
     {
         switch ($hello) {
-        case 'hello':
-            break;
+            case 'hello':
+                break;
         }
     }
 
@@ -79,20 +79,20 @@ 
             } else if (FALSE) {
                 foreach ($tokens as $token) {
                     switch ($token) {
-                    case '1':
-                    case '2':
-                        if (true) {
-                            if (false) {
+                        case '1':
+                        case '2':
+                            if (true) {
                                 if (false) {
                                     if (false) {
-                                        echo 'hello';
+                                        if (false) {
+                                            echo 'hello';
+                                        }
                                     }
                                 }
                             }
-                        }
-                    break;
-                    case '5':
                         break;
+                        case '5':
+                            break;
                     }
                     do {
                         while (true) {
@@ -161,20 +161,20 @@ 
                 $last = count($ts) - 1;
 
                 switch ($token) {
-                case '(':
+                    case '(':
 
-                    if ($last >= 3 &&
-                        $ts[0]['token'] != T_CLASS &&
-                        $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == T_VARIABLE ) {
+                        if ($last >= 3 &&
+                            $ts[0]['token'] != T_CLASS &&
+                            $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
+                            $ts[$last - 3]['token'] == T_VARIABLE ) {
 
 
-                        if (true) {
-                            echo 'hello';
+                            if (true) {
+                                echo 'hello';
+                            }
                         }
-                    }
-                    array_push($braces, $token);
-                    break;
+                        array_push($braces, $token);
+                        break;
                 }
             }
         }
@@ -256,19 +256,19 @@ 
 switch ($foo) {
 case 1:
     switch ($bar) {
-    default:
-        echo $string{1};
+        default:
+            echo $string{1};
     }
     break;
 }
 
 function temp($foo, $bar) {
     switch ($foo) {
-    case 1:
-        switch ($bar) {
-        default:
-            return $foo;
-        }
+        case 1:
+            switch ($bar) {
+                default:
+                    return $foo;
+            }
         break;
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
                     if ($last >= 3 &&
                         $ts[0]['token'] != T_CLASS &&
                         $ts[$last - 2]['token'] == T_OBJECT_OPERATOR &&
-                        $ts[$last - 3]['token'] == T_VARIABLE ) {
+                        $ts[$last - 3]['token'] == T_VARIABLE) {
 
 
                         if (true) {

Braces +6 added lines, -2 removed lines

@@ -61,8 +61,12 @@
     public function open()
     {
         // Some inline stuff that shouldn't error
-        if (TRUE) echo 'hello';
-        foreach ($tokens as $token) echo $token;
+        if (TRUE) {
+            echo 'hello';
+        }
+        foreach ($tokens as $token) {
+            echo $token;
+        }
     }
 
     /**

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc

Indentation +8 added lines, -8 removed lines

@@ -79,10 +79,10 @@ 
 );
 
 array_map(
-     function($x)
-     {
-         return trim($x);
-     },
+        function($x)
+        {
+            return trim($x);
+        },
     $array
 );
 
@@ -173,7 +173,7 @@ 
         'is',
         'an',
         'array'
-     ],
+        ],
     array(
         'this',
         'is',
@@ -185,13 +185,13 @@ 
         'is',
         'an',
         'array'
-     ),
+        ),
     function($x)
     {
         echo 'wee';
 
         return trim($x);
-   }
+    }
 );
 
 function foo()
@@ -272,7 +272,7 @@ 
     $test = '
    ' . function_0(
     $argument_0,
-           $argument_1
+            $argument_1
     );
 }
 

Spacing +16 added lines, -16 removed lines

@@ -4,18 +4,18 @@ 
 test($arg, $arg2);
 isset ();
 test( );
-test() ;
-test( $arg);
-empty( $arg );
-eval ( $arg );
+test();
+test($arg);
+empty($arg);
+eval ($arg);
 
 if (is_array($arg) === true) {
 
 }
 
 $something = get($arg1, $arg2);
-$something = get($arg1, $arg2) ;
-$something = get($arg1, $arg2)   ;
+$something = get($arg1, $arg2);
+$something = get($arg1, $arg2);
 
 // No errors as this test only checks for function calls.
 class TestClass extends MyClass
@@ -24,11 +24,11 @@ 
     const const1 = 'hello';
     const CONST2 = 'hello';
 
-    public function test () { }
+    public function test() { }
 }
 
 make_foo($string/*the string*/, true/*test*/);
-make_foo($string/*the string*/, true/*test*/ );
+make_foo($string/*the string*/, true/*test*/);
 make_foo($string /*the string*/, true /*test*/);
 make_foo(/*the string*/$string, /*test*/true);
 make_foo( /*the string*/$string, /*test*/true);
@@ -211,8 +211,8 @@ 
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesAfterOpen 1
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesBeforeClose 1
 test($arg, $arg2);
-test( $arg, $arg2 );
-test(  $arg, $arg2  );
+test($arg, $arg2);
+test($arg, $arg2);
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesBeforeClose 0
 
@@ -231,10 +231,10 @@ 
 
 array_walk(
     $types,
-    function ($title, $type) {
+    function($title, $type) {
         $plural = 'all' !== $type ? 's' : '';
         ?>
-        <li><a href="<?php esc_url('#tabs-documents-' . $type . $plural); ?>"><?php echo esc_html($title); ?></a></li>
+        <li><a href="<?php esc_url('#tabs-documents-'.$type.$plural); ?>"><?php echo esc_html($title); ?></a></li>
         <?php
     }
 );
@@ -278,27 +278,27 @@ 
 
 myFunction(
     'foo', (object) array(
-        'bar' => function ($x) {
+        'bar' => function($x) {
             return true;
         },
         'baz' => false
     )
 );
 $qux = array_filter(
-    $quux, function ($x) {
+    $quux, function($x) {
         return $x;
     }
 );
 
 array_filter(
     [1, 2],
-    function ($i) : bool {
+    function($i) : bool {
         return $i === 0;
     }
 );
 
 foo(array(
-    'callback' => function () {
+    'callback' => function() {
         $foo = 'foo';
         return;
     },

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
                 171 => 1,
                 173 => 1,
                 201 => 1,
-               );
+                );
 
     }//end getErrorList()
 

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc

Indentation +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 public function someFunctionWithAVeryLongName($firstParameter='something',
-   $secondParameter='booooo', $third=null, $fourthParameter=false,
-     $fifthParameter=123.12, $sixthParam=true
+    $secondParameter='booooo', $third=null, $fourthParameter=false,
+        $fifthParameter=123.12, $sixthParam=true
 ){
 }
 
@@ -65,9 +65,9 @@ 
     $url,
     $requireScheme=TRUE,
     array $allowedSchemes=array(
-                           'http',
-                           'https',
-                          ),
+                            'http',
+                            'https',
+                            ),
     array $notAllowedSchemes=array('ftp', 'sftp')
 ) {
 }

Spacing +28 added lines, -29 removed lines

@@ -1,14 +1,14 @@ 
 <?php
-public function someFunctionWithAVeryLongName($firstParameter='something',
-   $secondParameter='booooo', $third=null, $fourthParameter=false,
-     $fifthParameter=123.12, $sixthParam=true
-){
+public function someFunctionWithAVeryLongName($firstParameter = 'something',
+   $secondParameter = 'booooo', $third = null, $fourthParameter = false,
+     $fifthParameter = 123.12, $sixthParam = true
+) {
 }
 
-function someFunctionWithAVeryLongName2($firstParameter='something',
-$secondParameter='booooo', $third=null, $fourthParameter=false,
-$fifthParameter=123.12, $sixthParam=true
-)  {
+function someFunctionWithAVeryLongName2($firstParameter = 'something',
+$secondParameter = 'booooo', $third = null, $fourthParameter = false,
+$fifthParameter = 123.12, $sixthParam = true
+) {
 }
 
 function blah() {
@@ -21,14 +21,14 @@ 
 class MyClass
 {
 
-    public function someFunctionWithAVeryLongName($firstParameter='something',
-        $secondParameter='booooo', $third=null, $fourthParameter=false,
-        $fifthParameter=123.12, $sixthParam=true
+    public function someFunctionWithAVeryLongName($firstParameter = 'something',
+        $secondParameter = 'booooo', $third = null, $fourthParameter = false,
+        $fifthParameter = 123.12, $sixthParam = true
     ) /** w00t */ {
     }
 
     public function someFunctionWithAVeryLongName2(
-        $firstParameter='something', $secondParameter='booooo', $third=null
+        $firstParameter = 'something', $secondParameter = 'booooo', $third = null
     ) {
     }
 
@@ -46,8 +46,8 @@ 
 }
 
 function getInstalledStandards(
-    $includeGeneric=false,
-    $standardsDir=''
+    $includeGeneric = false,
+    $standardsDir = ''
 )
 {
 }
@@ -63,27 +63,27 @@ 
 
 function validateUrl(
     $url,
-    $requireScheme=TRUE,
-    array $allowedSchemes=array(
+    $requireScheme = TRUE,
+    array $allowedSchemes = array(
                            'http',
                            'https',
                           ),
-    array $notAllowedSchemes=array('ftp', 'sftp')
+    array $notAllowedSchemes = array('ftp', 'sftp')
 ) {
 }
 
 function validateUrlShort(
     $url,
-    $requireScheme=TRUE,
-    array $allowedSchemes=[
+    $requireScheme = TRUE,
+    array $allowedSchemes = [
         'http',
         'https',
     ],
-    array $notAllowedSchemes=['ftp', 'sftp']
+    array $notAllowedSchemes = ['ftp', 'sftp']
 ) {
 }
 
-$noArgs_longVars = function () use (
+$noArgs_longVars = function() use (
     $longVar1,
     $longerVar2,
     $muchLongerVar3
@@ -91,7 +91,7 @@ 
     // body
 };
 
-$longArgs_longVars = function (
+$longArgs_longVars = function(
     $longArgument,
     $longerArgument,
     $muchLongerArgument
@@ -103,7 +103,7 @@ 
     // body
 };
 
-$longArgs_longVars = function (
+$longArgs_longVars = function(
     $longArgument,
     $longerArgument,
     $muchLongerArgument
@@ -115,7 +115,7 @@ 
     // body
 };
 
-$longArgs_longVars = function (
+$longArgs_longVars = function(
     $longArgument,
     $muchLongerArgument)use(
     $muchLongerVar3) {
@@ -124,7 +124,7 @@ 
 
 function test()
 {
-    $longArgs_longVars = function (
+    $longArgs_longVars = function(
         $longArgument,
         $longerArgument,
         $muchLongerArgument
@@ -158,10 +158,10 @@ 
     f();
 }
 
-$var = function() {return true;};
+$var = function() {return true; };
 $var = function() {return true;
 };
-function blah(){return true;
+function blah() {return true;
 }
 
 $closureWithArgsAndVars = function($arg1, $arg2) use ($var1, $var2){
@@ -169,8 +169,7 @@ 
 };
 
 function
-blah
-()
+blah()
 {
     // body
 }

CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.inc

Spacing +13 added lines, -13 removed lines

@@ -11,32 +11,32 @@ 
 }
 
 // Valid
-function myFunction($arg1, $arg2='hello')
+function myFunction($arg1, $arg2 = 'hello')
 {
 }
 
 // Valid with lots of args
-function myFunction($arg1, $arg2, $arg3, $arg4='hello', $arg5=array(), $arg6='hello')
+function myFunction($arg1, $arg2, $arg3, $arg4 = 'hello', $arg5 = array(), $arg6 = 'hello')
 {
 }
 
 // Valid type hints
-function myFunction(array $arg1, array $arg2=array())
+function myFunction(array $arg1, array $arg2 = array())
 {
 }
 
 // Invalid
-function myFunction($arg2='hello', $arg1)
+function myFunction($arg2 = 'hello', $arg1)
 {
 }
 
 // Invalid with lots of args
-function myFunction($arg1, $arg2, $arg3, $arg4='hello', $arg5, $arg6='hello')
+function myFunction($arg1, $arg2, $arg3, $arg4 = 'hello', $arg5, $arg6 = 'hello')
 {
 }
 
 // Invalid type hints
-function myFunction(array $arg2=array(), array $arg1)
+function myFunction(array $arg2 = array(), array $arg1)
 {
 }
 
@@ -53,34 +53,34 @@ 
     }
 
     // Valid
-    function myFunction($arg1, $arg2='hello')
+    function myFunction($arg1, $arg2 = 'hello')
     {
     }
 
     // Valid with lots of args
-    function myFunction($arg1, $arg2, $arg3, $arg4='hello', $arg5=array(), $arg6='hello')
+    function myFunction($arg1, $arg2, $arg3, $arg4 = 'hello', $arg5 = array(), $arg6 = 'hello')
     {
     }
 
     // Valid type hints
-    function myFunction(array $arg1, array $arg2=array())
+    function myFunction(array $arg1, array $arg2 = array())
     {
     }
 
     // Invalid
-    function myFunction($arg2='hello', $arg1)
+    function myFunction($arg2 = 'hello', $arg1)
     {
     }
 
     // Invalid with lots of args
-    function myFunction($arg1, $arg2, $arg3, $arg4='hello', $arg5, $arg6='hello')
+    function myFunction($arg1, $arg2, $arg3, $arg4 = 'hello', $arg5, $arg6 = 'hello')
     {
     }
 
     // Invalid type hints
-    function myFunction(array $arg2=array(), array $arg1)
+    function myFunction(array $arg2 = array(), array $arg1)
     {
     }
 }
 
-function myFunc($req, $opt=null, ...$params) {}
+function myFunc($req, $opt = null, ...$params) {}

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php

Indentation +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
                     54 => 1,
                     70 => 1,
                     71 => 1,
-                   );
+                    );
         }
 
         return array(
@@ -102,7 +102,7 @@ 
                 275 => 1,
                 300 => 1,
                 305 => 1,
-               );
+                );
 
     }//end getErrorList()
 

Spacing +1 added lines, -1 removed lines

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

CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                 71 => 1,
                 76 => 1,
                 81 => 1,
-               );
+                );
 
     }//end getErrorList()