@@ -47,13 +47,13 @@ |
||
47 | 47 | return array( |
48 | 48 | 4 => 1, |
49 | 49 | 5 => 1, |
50 | - ); |
|
50 | + ); |
|
51 | 51 | } else if (version_compare(PHP_VERSION, '5.4.0RC1') >= 0) { |
52 | 52 | // Shorthand echo is always available from PHP 5.4.0 but needed the |
53 | 53 | // short_open_tag ini var to be set for versions before this. |
54 | 54 | return array( |
55 | 55 | 4 => 1, |
56 | - ); |
|
56 | + ); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | return array(); |
@@ -45,23 +45,23 @@ |
||
45 | 45 | public function getErrorList($testFile='PostStatementCommentUnitTest.inc') |
46 | 46 | { |
47 | 47 | switch ($testFile) { |
48 | - case 'PostStatementCommentUnitTest.inc': |
|
49 | - return array( |
|
50 | - 6 => 1, |
|
51 | - 10 => 1, |
|
52 | - 18 => 1, |
|
53 | - ); |
|
54 | - break; |
|
55 | - case 'PostStatementCommentUnitTest.js': |
|
56 | - return array( |
|
57 | - 1 => 1, |
|
58 | - 4 => 1, |
|
59 | - 9 => 1, |
|
60 | - ); |
|
61 | - break; |
|
62 | - default: |
|
63 | - return array(); |
|
64 | - break; |
|
48 | + case 'PostStatementCommentUnitTest.inc': |
|
49 | + return array( |
|
50 | + 6 => 1, |
|
51 | + 10 => 1, |
|
52 | + 18 => 1, |
|
53 | + ); |
|
54 | + break; |
|
55 | + case 'PostStatementCommentUnitTest.js': |
|
56 | + return array( |
|
57 | + 1 => 1, |
|
58 | + 4 => 1, |
|
59 | + 9 => 1, |
|
60 | + ); |
|
61 | + break; |
|
62 | + default: |
|
63 | + return array(); |
|
64 | + break; |
|
65 | 65 | }//end switch |
66 | 66 | |
67 | 67 | }//end getErrorList() |
@@ -42,7 +42,7 @@ |
||
42 | 42 | * |
43 | 43 | * @return array<int, int> |
44 | 44 | */ |
45 | - public function getErrorList($testFile='PostStatementCommentUnitTest.inc') |
|
45 | + public function getErrorList($testFile = 'PostStatementCommentUnitTest.inc') |
|
46 | 46 | { |
47 | 47 | switch ($testFile) { |
48 | 48 | case 'PostStatementCommentUnitTest.inc': |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | public function someFunctionWithAVeryLongName($firstParameter='something', |
3 | - $secondParameter='booooo', |
|
4 | - $third=null, $fourthParameter=false, |
|
5 | - $fifthParameter=123.12, |
|
3 | + $secondParameter='booooo', |
|
4 | + $third=null, $fourthParameter=false, |
|
5 | + $fifthParameter=123.12, |
|
6 | 6 | $sixthParam=true |
7 | 7 | ){ |
8 | 8 | } |
@@ -39,22 +39,22 @@ discard block |
||
39 | 39 | ) { |
40 | 40 | } |
41 | 41 | |
42 | - public function someFunctionWithAVeryLongName3( |
|
43 | - $firstParameter, $secondParameter, $third=null |
|
44 | - ) { |
|
45 | - } |
|
46 | - |
|
47 | - public function someFunctionWithAVeryLongName4( |
|
48 | - $firstParameter, $secondParameter |
|
49 | - ) { |
|
50 | - } |
|
51 | - |
|
52 | - public function someFunctionWithAVeryLongName5( |
|
53 | - $firstParameter, |
|
54 | - $secondParameter=array(1,2,3), |
|
55 | - $third=null |
|
56 | - ) { |
|
57 | - } |
|
42 | + public function someFunctionWithAVeryLongName3( |
|
43 | + $firstParameter, $secondParameter, $third=null |
|
44 | + ) { |
|
45 | + } |
|
46 | + |
|
47 | + public function someFunctionWithAVeryLongName4( |
|
48 | + $firstParameter, $secondParameter |
|
49 | + ) { |
|
50 | + } |
|
51 | + |
|
52 | + public function someFunctionWithAVeryLongName5( |
|
53 | + $firstParameter, |
|
54 | + $secondParameter=array(1,2,3), |
|
55 | + $third=null |
|
56 | + ) { |
|
57 | + } |
|
58 | 58 | |
59 | 59 | } |
60 | 60 |
@@ -1,16 +1,16 @@ discard block |
||
1 | 1 | <?php |
2 | -public function someFunctionWithAVeryLongName($firstParameter='something', |
|
3 | - $secondParameter='booooo', |
|
4 | - $third=null, $fourthParameter=false, |
|
5 | - $fifthParameter=123.12, |
|
6 | - $sixthParam=true |
|
7 | -){ |
|
2 | +public function someFunctionWithAVeryLongName($firstParameter = 'something', |
|
3 | + $secondParameter = 'booooo', |
|
4 | + $third = null, $fourthParameter = false, |
|
5 | + $fifthParameter = 123.12, |
|
6 | + $sixthParam = true |
|
7 | +) { |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | function someFunctionWithAVeryLongName2( |
11 | -$firstParameter='something', |
|
12 | -$secondParameter='booooo', |
|
13 | -) { |
|
11 | +$firstParameter = 'something', |
|
12 | +$secondParameter = 'booooo', |
|
13 | +) { |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | function blah() { |
@@ -24,23 +24,23 @@ discard block |
||
24 | 24 | { |
25 | 25 | |
26 | 26 | public function someFunctionWithAVeryLongName( |
27 | - $firstParameter='something', |
|
28 | - $secondParameter='booooo', |
|
29 | - $third=null, |
|
30 | - $fourthParameter=false, |
|
31 | - $fifthParameter=123.12, |
|
32 | - $sixthParam=true |
|
27 | + $firstParameter = 'something', |
|
28 | + $secondParameter = 'booooo', |
|
29 | + $third = null, |
|
30 | + $fourthParameter = false, |
|
31 | + $fifthParameter = 123.12, |
|
32 | + $sixthParam = true |
|
33 | 33 | ) /** w00t */ { |
34 | 34 | } |
35 | 35 | |
36 | - public function someFunctionWithAVeryLongName2($firstParameter='something', |
|
37 | - $secondParameter='booooo', |
|
38 | - $third=null |
|
36 | + public function someFunctionWithAVeryLongName2($firstParameter = 'something', |
|
37 | + $secondParameter = 'booooo', |
|
38 | + $third = null |
|
39 | 39 | ) { |
40 | 40 | } |
41 | 41 | |
42 | 42 | public function someFunctionWithAVeryLongName3( |
43 | - $firstParameter, $secondParameter, $third=null |
|
43 | + $firstParameter, $secondParameter, $third = null |
|
44 | 44 | ) { |
45 | 45 | } |
46 | 46 | |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | |
52 | 52 | public function someFunctionWithAVeryLongName5( |
53 | 53 | $firstParameter, |
54 | - $secondParameter=array(1,2,3), |
|
55 | - $third=null |
|
54 | + $secondParameter = array(1, 2, 3), |
|
55 | + $third = null |
|
56 | 56 | ) { |
57 | 57 | } |
58 | 58 | |
59 | 59 | } |
60 | 60 | |
61 | -$noArgs_longVars = function () use ( |
|
61 | +$noArgs_longVars = function() use ( |
|
62 | 62 | $longVar1, |
63 | 63 | $longerVar2, |
64 | 64 | $muchLongerVar3 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | // body |
67 | 67 | }; |
68 | 68 | |
69 | -$longArgs_longVars = function ( |
|
69 | +$longArgs_longVars = function( |
|
70 | 70 | $longArgument, |
71 | 71 | $longerArgument, |
72 | 72 | $muchLongerArgument |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | // body |
79 | 79 | }; |
80 | 80 | |
81 | -$longArgs_longVars = function ($longArgument, |
|
81 | +$longArgs_longVars = function($longArgument, |
|
82 | 82 | $muchLongerArgument) use ($muchLongerVar3 |
83 | 83 | ) { |
84 | 84 | // body |
85 | 85 | }; |
86 | 86 | |
87 | -$noArgs_longVars = function () use ( |
|
88 | - $longVar1, $longerVar2, |
|
87 | +$noArgs_longVars = function() use ( |
|
88 | + $longVar1, $longerVar2, |
|
89 | 89 | $muchLongerVar3 |
90 | 90 | ) { |
91 | 91 | // body |
@@ -93,19 +93,19 @@ discard block |
||
93 | 93 | |
94 | 94 | usort( |
95 | 95 | $data, |
96 | - function ($a, $b) { |
|
96 | + function($a, $b) { |
|
97 | 97 | // body |
98 | 98 | } |
99 | 99 | ); |
100 | 100 | |
101 | 101 | function myFunction( |
102 | - $firstParameter,$secondParameter=[1,2,3],$third=null |
|
102 | + $firstParameter, $secondParameter = [1, 2, 3], $third = null |
|
103 | 103 | ) { |
104 | 104 | } |
105 | 105 | |
106 | 106 | if (array_filter( |
107 | 107 | $commands, |
108 | - function ($cmd) use ($commandName) { |
|
108 | + function($cmd) use ($commandName) { |
|
109 | 109 | return ($cmd['name'] == $commandName); |
110 | 110 | } |
111 | 111 | )) { |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | // body |
128 | 128 | } |
129 | 129 | |
130 | -$foo = function ($bar = [ |
|
130 | +$foo = function($bar = [ |
|
131 | 131 | 1, |
132 | 132 | 2, |
133 | 133 | ]) use ($longVar1, $longerVar2) { |
@@ -72,7 +72,7 @@ |
||
72 | 72 | }//end class |
73 | 73 | |
74 | 74 | // Closures don't need end comments. |
75 | -echo preg_replace_callback('~-([a-z])~', function ($match) { return strtoupper($match[1]); }, 'hello-world'); |
|
75 | +echo preg_replace_callback('~-([a-z])~', function($match) { return strtoupper($match[1]); }, 'hello-world'); |
|
76 | 76 | |
77 | 77 | class TestClass |
78 | 78 | { |
@@ -58,10 +58,10 @@ |
||
58 | 58 | function myFunc( ) {} |
59 | 59 | |
60 | 60 | function multiLineFunction( |
61 | - array $flatList, |
|
62 | - $markup, |
|
63 | - array $otherList, |
|
64 | - $lastOffset=0 |
|
61 | + array $flatList, |
|
62 | + $markup, |
|
63 | + array $otherList, |
|
64 | + $lastOffset=0 |
|
65 | 65 | ) { |
66 | 66 | } |
67 | 67 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 0 |
@@ -2,38 +2,38 @@ discard block |
||
2 | 2 | function myFunc() {} |
3 | 3 | function myFunc( ) {} |
4 | 4 | function myFunc($blah) {} |
5 | -function myFunc( $blah ) {} |
|
5 | +function myFunc($blah) {} |
|
6 | +function myFunc($blah, $blah2, $blah3) {} |
|
7 | +function myFunc($blah, $blah2, $blah3) {} |
|
6 | 8 | function myFunc($blah, $blah2, $blah3) {} |
7 | -function myFunc($blah , $blah2, $blah3 ) {} |
|
8 | -function myFunc($blah,$blah2,$blah3) {} |
|
9 | -function myFunc($blah, $blah2, $blah3) {} |
|
10 | -function myFunc($blah='hello') {} |
|
9 | +function myFunc($blah, $blah2, $blah3) {} |
|
10 | +function myFunc($blah = 'hello') {} |
|
11 | 11 | function myFunc($blah = 'hello') {} |
12 | -function myFunc(PHP_CodeSniffer $object, array $array=array(), $blah3='yo') {} |
|
13 | -function myFunc( $blah='hello' , $blah2= 'hi', $blah3 = 'yo' ) {} |
|
14 | -function myFunc(PHP_CodeSniffer $object, array $array=array(), $blah3='yo') {} |
|
15 | -function myFunc( PHP_CodeSniffer $object, array $array=array(), $blah3='yo') {} |
|
16 | -function myFunc( array &$one, array &$two) {} |
|
12 | +function myFunc(PHP_CodeSniffer $object, array $array = array(), $blah3 = 'yo') {} |
|
13 | +function myFunc($blah = 'hello', $blah2 = 'hi', $blah3 = 'yo') {} |
|
14 | +function myFunc(PHP_CodeSniffer $object, array $array = array(), $blah3 = 'yo') {} |
|
15 | +function myFunc(PHP_CodeSniffer $object, array $array = array(), $blah3 = 'yo') {} |
|
16 | +function myFunc(array &$one, array &$two) {} |
|
17 | +function myFunc(&$blah) {} |
|
17 | 18 | function myFunc(&$blah) {} |
18 | -function myFunc( &$blah ) {} |
|
19 | 19 | |
20 | 20 | function multiLineFunction( |
21 | 21 | array $flatList, |
22 | 22 | $markup, |
23 | 23 | array $otherList, |
24 | - $lastOffset=0 |
|
24 | + $lastOffset = 0 |
|
25 | 25 | ) { |
26 | 26 | } |
27 | 27 | |
28 | 28 | function multiLineFunction( |
29 | 29 | $markup, |
30 | 30 | array $otherList, |
31 | - $lastOffset=0 |
|
31 | + $lastOffset = 0 |
|
32 | 32 | ) { |
33 | 33 | } |
34 | 34 | |
35 | -$noArgs_longVars = function ($longVar1, $longerVar2= false) use ( |
|
36 | - $longVar1 , $longerVar2= false, |
|
35 | +$noArgs_longVars = function($longVar1, $longerVar2 = false) use ( |
|
36 | + $longVar1, $longerVar2 = false, |
|
37 | 37 | $muchLongerVar3 |
38 | 38 | ) { |
39 | 39 | // body |
@@ -41,19 +41,19 @@ discard block |
||
41 | 41 | |
42 | 42 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing equalsSpacing 1 |
43 | 43 | function myFunc($blah = 'hello') {} |
44 | -function myFunc($blah = 'hello') {} |
|
45 | -function myFunc($blah = 'hello') {} |
|
44 | +function myFunc($blah = 'hello') {} |
|
45 | +function myFunc($blah = 'hello') {} |
|
46 | 46 | function myFunc($blah = 'hello') {} |
47 | 47 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing equalsSpacing 0 |
48 | 48 | |
49 | 49 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 1 |
50 | 50 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesBeforeClose 1 |
51 | 51 | function myFunc($blah) {} |
52 | -function myFunc( $blah ) {} |
|
53 | -function myFunc( $blah ) {} |
|
54 | -function myFunc( array $blah ) {} |
|
55 | -function myFunc(array $blah ) {} |
|
56 | -function myFunc( array $blah ) {} |
|
52 | +function myFunc($blah) {} |
|
53 | +function myFunc($blah) {} |
|
54 | +function myFunc(array $blah) {} |
|
55 | +function myFunc(array $blah) {} |
|
56 | +function myFunc(array $blah) {} |
|
57 | 57 | function myFunc() {} |
58 | 58 | function myFunc( ) {} |
59 | 59 | |
@@ -61,16 +61,16 @@ discard block |
||
61 | 61 | array $flatList, |
62 | 62 | $markup, |
63 | 63 | array $otherList, |
64 | - $lastOffset=0 |
|
64 | + $lastOffset = 0 |
|
65 | 65 | ) { |
66 | 66 | } |
67 | 67 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesAfterOpen 0 |
68 | 68 | // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesBeforeClose 0 |
69 | 69 | |
70 | -function myFunc($req, $opt=null, ...$params) {} |
|
70 | +function myFunc($req, $opt = null, ...$params) {} |
|
71 | 71 | function myFunc($param, &...$moreParams) {} |
72 | 72 | |
73 | 73 | function MissingParamTypeInDocBlock(array$a = null, callable$c, \ArrayObject$o, $foo = []) {} |
74 | 74 | |
75 | 75 | function myFunc(...$args) {} |
76 | -function myFunc( ...$args) {} |
|
76 | +function myFunc(...$args) {} |
@@ -2,5 +2,5 @@ |
||
2 | 2 | function myFunc($blah, $x, $blah) {} |
3 | 3 | function myFunc($a, $b, $c) {} |
4 | 4 | function myFunc($a, $a, $a) {} |
5 | -function myFunc($a='1', $b='1', $a='2') {} |
|
5 | +function myFunc($a = '1', $b = '1', $a = '2') {} |
|
6 | 6 | ?> |
@@ -57,7 +57,7 @@ |
||
57 | 57 | 48 => 1, |
58 | 58 | 70 => 1, |
59 | 59 | 71 => 1, |
60 | - ); |
|
60 | + ); |
|
61 | 61 | |
62 | 62 | }//end getErrorList() |
63 | 63 |
@@ -44,42 +44,42 @@ |
||
44 | 44 | { |
45 | 45 | if ($testFile === 'MultiLineFunctionDeclarationUnitTest.inc') { |
46 | 46 | $errors = array( |
47 | - 2 => 1, |
|
48 | - 3 => 1, |
|
49 | - 4 => 2, |
|
50 | - 5 => 1, |
|
51 | - 7 => 1, |
|
52 | - 11 => 1, |
|
53 | - 12 => 1, |
|
54 | - 13 => 1, |
|
55 | - 16 => 1, |
|
56 | - 36 => 1, |
|
57 | - 43 => 2, |
|
58 | - 48 => 1, |
|
59 | - 81 => 1, |
|
60 | - 82 => 2, |
|
61 | - 88 => 1, |
|
62 | - 102 => 2, |
|
63 | - 137 => 1, |
|
64 | - 141 => 2, |
|
65 | - 142 => 1, |
|
66 | - ); |
|
47 | + 2 => 1, |
|
48 | + 3 => 1, |
|
49 | + 4 => 2, |
|
50 | + 5 => 1, |
|
51 | + 7 => 1, |
|
52 | + 11 => 1, |
|
53 | + 12 => 1, |
|
54 | + 13 => 1, |
|
55 | + 16 => 1, |
|
56 | + 36 => 1, |
|
57 | + 43 => 2, |
|
58 | + 48 => 1, |
|
59 | + 81 => 1, |
|
60 | + 82 => 2, |
|
61 | + 88 => 1, |
|
62 | + 102 => 2, |
|
63 | + 137 => 1, |
|
64 | + 141 => 2, |
|
65 | + 142 => 1, |
|
66 | + ); |
|
67 | 67 | } else { |
68 | 68 | $errors = array( |
69 | - 2 => 1, |
|
70 | - 3 => 1, |
|
71 | - 4 => 2, |
|
72 | - 5 => 1, |
|
73 | - 7 => 1, |
|
74 | - 11 => 1, |
|
75 | - 12 => 1, |
|
76 | - 13 => 1, |
|
77 | - 16 => 1, |
|
78 | - 26 => 1, |
|
79 | - 36 => 1, |
|
80 | - 43 => 2, |
|
81 | - 48 => 1, |
|
82 | - ); |
|
69 | + 2 => 1, |
|
70 | + 3 => 1, |
|
71 | + 4 => 2, |
|
72 | + 5 => 1, |
|
73 | + 7 => 1, |
|
74 | + 11 => 1, |
|
75 | + 12 => 1, |
|
76 | + 13 => 1, |
|
77 | + 16 => 1, |
|
78 | + 26 => 1, |
|
79 | + 36 => 1, |
|
80 | + 43 => 2, |
|
81 | + 48 => 1, |
|
82 | + ); |
|
83 | 83 | }//end if |
84 | 84 | |
85 | 85 | return $errors; |
@@ -40,7 +40,7 @@ |
||
40 | 40 | * |
41 | 41 | * @return array<int, int> |
42 | 42 | */ |
43 | - public function getErrorList($testFile='MultiLineFunctionDeclarationUnitTest.inc') |
|
43 | + public function getErrorList($testFile = 'MultiLineFunctionDeclarationUnitTest.inc') |
|
44 | 44 | { |
45 | 45 | if ($testFile === 'MultiLineFunctionDeclarationUnitTest.inc') { |
46 | 46 | $errors = array( |
@@ -57,7 +57,7 @@ |
||
57 | 57 | 48 => 1, |
58 | 58 | 70 => 1, |
59 | 59 | 71 => 1, |
60 | - ); |
|
60 | + ); |
|
61 | 61 | |
62 | 62 | }//end getErrorList() |
63 | 63 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | 48 => 1, |
58 | 58 | 70 => 1, |
59 | 59 | 71 => 1, |
60 | - ); |
|
60 | + ); |
|
61 | 61 | |
62 | 62 | }//end getErrorList() |
63 | 63 |