Skip to content

Commit a24e138

Browse files
committed
Changelog + tests for PR #869
1 parent 4fea2e6 commit a24e138

File tree

5 files changed

+46
-33
lines changed

5 files changed

+46
-33
lines changed

CodeSniffer/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.inc

+5-1
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ class Foo extends \SoapClient
114114
// body
115115
}
116116
}
117-
?>
117+
118+
function __debugInfo() {}
119+
class Foo {
120+
function __debugInfo() {}
121+
}

CodeSniffer/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php

+33-32
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,39 @@ class Generic_Tests_NamingConventions_CamelCapsFunctionNameUnitTest extends Abst
4141
public function getErrorList()
4242
{
4343
$errors = array(
44-
10 => 1,
45-
11 => 1,
46-
12 => 1,
47-
13 => 1,
48-
16 => 1,
49-
17 => 1,
50-
20 => 1,
51-
21 => 1,
52-
24 => 1,
53-
25 => 1,
54-
30 => 1,
55-
31 => 1,
56-
50 => 1,
57-
52 => 1,
58-
53 => 1,
59-
57 => 1,
60-
58 => 1,
61-
59 => 1,
62-
60 => 1,
63-
61 => 1,
64-
62 => 1,
65-
63 => 1,
66-
64 => 1,
67-
65 => 1,
68-
66 => 1,
69-
67 => 1,
70-
68 => 1,
71-
69 => 1,
72-
71 => 1,
73-
72 => 1,
74-
73 => 1,
75-
74 => 1,
44+
10 => 1,
45+
11 => 1,
46+
12 => 1,
47+
13 => 1,
48+
16 => 1,
49+
17 => 1,
50+
20 => 1,
51+
21 => 1,
52+
24 => 1,
53+
25 => 1,
54+
30 => 1,
55+
31 => 1,
56+
50 => 1,
57+
52 => 1,
58+
53 => 1,
59+
57 => 1,
60+
58 => 1,
61+
59 => 1,
62+
60 => 1,
63+
61 => 1,
64+
62 => 1,
65+
63 => 1,
66+
64 => 1,
67+
65 => 1,
68+
66 => 1,
69+
67 => 1,
70+
68 => 1,
71+
69 => 1,
72+
71 => 1,
73+
72 => 1,
74+
73 => 1,
75+
74 => 1,
76+
118 => 1,
7677
);
7778

7879
return $errors;

CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc

+5
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,8 @@ class Magic_Case_Test {
203203
}
204204
function __autoLoad() {}
205205
function _() {}
206+
207+
function __debugInfo() {}
208+
class Foo {
209+
function __debugInfo() {}
210+
}

CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public function getErrorList()
151151
173 => 1,
152152
174 => 1,
153153
175 => 1,
154+
207 => 1,
154155
);
155156

156157
return $errors;

package.xml

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
3737
-- Added error Squiz.Commenting.FunctionComment.ScalarTypeHintMissing for PHP7 only (request #858)
3838
-- These errors were previously reported as Squiz.Commenting.FunctionComment.TypeHintMissing on PHP7
3939
-- Disable this error message in a ruleset.xml file if your code needs to run on both PHP5 and PHP7
40+
- The PHP 5.6 __debugInfo magic method no longer produces naming convention errors
41+
-- Thanks to Michael Nowack for the patch
4042
- PEAR and Squiz FunctionComment sniffs now support variadic functions (request #841)
4143
- Fixed bug #622 : Wrong detection of Squiz.CSS.DuplicateStyleDefinition with media queries
4244
- Fixed bug #752 : The missing exception error is reported in first found DocBlock

0 commit comments

Comments
 (0)