Completed
Pull Request — develop (#1492)
by Zack
28:58 queued 09:00
created
php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,23 +25,23 @@  discard block
 block discarded – undo
25 25
      *
26 26
      * @return array<int, int>
27 27
      */
28
-    public function getErrorList($testFile='')
28
+    public function getErrorList( $testFile = '' )
29 29
     {
30
-        switch ($testFile) {
30
+        switch ( $testFile ) {
31 31
         case 'ClosingTagUnitTest.1.inc':
32
-            return [11 => 1];
32
+            return [ 11 => 1 ];
33 33
 
34 34
         case 'ClosingTagUnitTest.3.inc':
35 35
         case 'ClosingTagUnitTest.4.inc':
36 36
         case 'ClosingTagUnitTest.5.inc':
37 37
         case 'ClosingTagUnitTest.7.inc':
38
-            return [1 => 1];
38
+            return [ 1 => 1 ];
39 39
 
40 40
         case 'ClosingTagUnitTest.6.inc':
41
-            return [3 => 1];
41
+            return [ 3 => 1 ];
42 42
 
43 43
         default:
44
-            return [];
44
+            return [ ];
45 45
         }
46 46
 
47 47
     }//end getErrorList()
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
      */
58 58
     public function getWarningList()
59 59
     {
60
-        return [];
60
+        return [ ];
61 61
 
62 62
     }//end getWarningList()
63 63
 
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.5.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php function foo() { include($this->add('arg')); } ?>
1
+<?php function foo() { include( $this->add( 'arg' ) ); } ?>
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.2.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <div class="clear"></div>
2
-    <?php include('inc.php'); ?>
2
+    <?php include( 'inc.php' ); ?>
3 3
 </div>
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.4.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php include($this->add('arg')) /* comment */ ?>
1
+<?php include( $this->add( 'arg' ) ) /* comment */ ?>
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.3.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php include($this->add('arg'))?>
1
+<?php include( $this->add( 'arg' ) )?>
Please login to merge, or discard this patch.
src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.inc 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -44,18 +44,18 @@  discard block
 block discarded – undo
44 44
 echo "Hello $_varName";
45 45
 echo "Hello $varName2";
46 46
 
47
-echo 'Hello '.$varName;
48
-echo 'Hello '.$var_name;
49
-echo 'Hello '.$varname;
50
-echo 'Hello '.$_varName;
51
-echo 'Hello '.$varName2;
52
-
53
-echo $_SERVER['var_name'];
54
-echo $_REQUEST['var_name'];
55
-echo $_GET['var_name'];
56
-echo $_POST['var_name'];
57
-echo $GLOBALS['var_name'];
58
-echo $GLOBALS['var_name2'];
47
+echo 'Hello ' . $varName;
48
+echo 'Hello ' . $var_name;
49
+echo 'Hello ' . $varname;
50
+echo 'Hello ' . $_varName;
51
+echo 'Hello ' . $varName2;
52
+
53
+echo $_SERVER[ 'var_name' ];
54
+echo $_REQUEST[ 'var_name' ];
55
+echo $_GET[ 'var_name' ];
56
+echo $_POST[ 'var_name' ];
57
+echo $GLOBALS[ 'var_name' ];
58
+echo $GLOBALS[ 'var_name2' ];
59 59
 
60 60
 echo MyClass::$varName;
61 61
 echo MyClass::$var_name;
@@ -75,17 +75,17 @@  discard block
 block discarded – undo
75 75
 echo $object_name->_varName;
76 76
 echo $object_name->varName2;
77 77
 
78
-echo $this->myFunction($one, $two);
79
-echo $object->myFunction($one_two, $var2);
78
+echo $this->myFunction( $one, $two );
79
+echo $object->myFunction( $one_two, $var2 );
80 80
 
81 81
 $error = "format is \$GLOBALS['$varName']";
82 82
 $error = "format is \$GLOBALS['$varName2']";
83 83
 
84
-echo $_SESSION['var_name'];
85
-echo $_FILES['var_name'];
86
-echo $_ENV['var_name'];
87
-echo $_COOKIE['var_name'];
88
-echo $_COOKIE['var_name2'];
84
+echo $_SESSION[ 'var_name' ];
85
+echo $_FILES[ 'var_name' ];
86
+echo $_ENV[ 'var_name' ];
87
+echo $_COOKIE[ 'var_name' ];
88
+echo $_COOKIE[ 'var_name2' ];
89 89
 
90 90
 $XML        = 'hello';
91 91
 $myXML      = 'hello';
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
 $xmlParser  = 'hello';
94 94
 $xmlParser2 = 'hello';
95 95
 
96
-echo "{$_SERVER['HOSTNAME']} $var_name";
96
+echo "{$_SERVER[ 'HOSTNAME' ]} $var_name";
97 97
 
98 98
 $someObject->{$name};
99
-$someObject->my_function($var_name);
99
+$someObject->my_function( $var_name );
100 100
 
101
-var_dump($http_response_header);
102
-var_dump($HTTP_RAW_POST_DATA);
103
-var_dump($php_errormsg);
101
+var_dump( $http_response_header );
102
+var_dump( $HTTP_RAW_POST_DATA );
103
+var_dump( $php_errormsg );
104 104
 
105 105
 interface Base
106 106
 {
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 }
111 111
 
112 112
 $anonClass = new class() {
113
-    public function foo($foo, $_foo, $foo_bar) {
113
+    public function foo( $foo, $_foo, $foo_bar ) {
114 114
         $bar = 1;
115 115
         $_bar = 2;
116 116
         $bar_foo = 3;
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-function myFunction($variable) {
2
+function myFunction( $variable ) {
3 3
     // $variable is unused.
4 4
     echo 'hi';
5 5
 }
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
      */
24 24
     protected function shouldSkipTest()
25 25
     {
26
-        $analyzerPath = Config::getExecutablePath('zend_ca');
27
-        if ($analyzerPath === null) {
26
+        $analyzerPath = Config::getExecutablePath( 'zend_ca' );
27
+        if ( $analyzerPath === null ) {
28 28
             return true;
29 29
         }
30 30
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function getErrorList()
45 45
     {
46
-        return [];
46
+        return [ ];
47 47
 
48 48
     }//end getErrorList()
49 49
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      */
59 59
     public function getWarningList()
60 60
     {
61
-        return [2 => 1];
61
+        return [ 2 => 1 ];
62 62
 
63 63
     }//end getWarningList()
64 64
 
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
      */
25 25
     public function register()
26 26
     {
27
-        return [T_OPEN_TAG];
27
+        return [ T_OPEN_TAG ];
28 28
 
29 29
     }//end register()
30 30
 
@@ -38,40 +38,40 @@  discard block
 block discarded – undo
38 38
      *
39 39
      * @return void
40 40
      */
41
-    public function process(File $phpcsFile, $stackPtr)
41
+    public function process( File $phpcsFile, $stackPtr )
42 42
     {
43 43
         // Find the last non-empty token.
44 44
         $tokens = $phpcsFile->getTokens();
45
-        for ($last = ($phpcsFile->numTokens - 1); $last > 0; $last--) {
46
-            if (trim($tokens[$last]['content']) !== '') {
45
+        for ( $last = ( $phpcsFile->numTokens - 1 ); $last > 0; $last-- ) {
46
+            if ( trim( $tokens[ $last ][ 'content' ] ) !== '' ) {
47 47
                 break;
48 48
             }
49 49
         }
50 50
 
51
-        if ($tokens[$last]['code'] === T_CLOSE_TAG) {
51
+        if ( $tokens[ $last ][ 'code' ] === T_CLOSE_TAG ) {
52 52
             $error = 'A closing tag is not permitted at the end of a PHP file';
53
-            $fix   = $phpcsFile->addFixableError($error, $last, 'NotAllowed');
54
-            if ($fix === true) {
53
+            $fix   = $phpcsFile->addFixableError( $error, $last, 'NotAllowed' );
54
+            if ( $fix === true ) {
55 55
                 $phpcsFile->fixer->beginChangeset();
56
-                $phpcsFile->fixer->replaceToken($last, $phpcsFile->eolChar);
57
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($last - 1), null, true);
58
-                if ($tokens[$prev]['code'] !== T_SEMICOLON
59
-                    && $tokens[$prev]['code'] !== T_CLOSE_CURLY_BRACKET
60
-                    && $tokens[$prev]['code'] !== T_OPEN_TAG
56
+                $phpcsFile->fixer->replaceToken( $last, $phpcsFile->eolChar );
57
+                $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $last - 1 ), null, true );
58
+                if ( $tokens[ $prev ][ 'code' ] !== T_SEMICOLON
59
+                    && $tokens[ $prev ][ 'code' ] !== T_CLOSE_CURLY_BRACKET
60
+                    && $tokens[ $prev ][ 'code' ] !== T_OPEN_TAG
61 61
                 ) {
62
-                    $phpcsFile->fixer->addContent($prev, ';');
62
+                    $phpcsFile->fixer->addContent( $prev, ';' );
63 63
                 }
64 64
 
65 65
                 $phpcsFile->fixer->endChangeset();
66 66
             }
67 67
 
68
-            $phpcsFile->recordMetric($stackPtr, 'PHP closing tag at EOF', 'yes');
68
+            $phpcsFile->recordMetric( $stackPtr, 'PHP closing tag at EOF', 'yes' );
69 69
         } else {
70
-            $phpcsFile->recordMetric($stackPtr, 'PHP closing tag at EOF', 'no');
70
+            $phpcsFile->recordMetric( $stackPtr, 'PHP closing tag at EOF', 'no' );
71 71
         }//end if
72 72
 
73 73
         // Ignore the rest of the file.
74
-        return ($phpcsFile->numTokens + 1);
74
+        return ( $phpcsFile->numTokens + 1 );
75 75
 
76 76
     }//end process()
77 77
 
Please login to merge, or discard this patch.