File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -842,7 +842,8 @@ public function process($values=array())
842
842
843
843
// Set ignore patterns if they were specified.
844
844
if (empty ($ values ['ignored ' ]) === false ) {
845
- $ phpcs ->setIgnorePatterns ($ values ['ignored ' ]);
845
+ $ ignorePatterns = array_merge ($ phpcs ->getIgnorePatterns (), $ values ['ignored ' ]);
846
+ $ phpcs ->setIgnorePatterns ($ ignorePatterns );
846
847
}
847
848
848
849
// Set some convenience member vars.
Original file line number Diff line number Diff line change @@ -86,6 +86,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
86
86
- Fixed bug #414 : Squiz.WhiteSpace.MemberVarSpacing - inconsistent checking of member vars with comment
87
87
- Fixed bug #433 : Wrong detection of Squiz.Arrays.ArrayDeclaration.KeyNotAligned when key contains space
88
88
- Fixed bug #434 : False positive for spacing around "=>" in inline array within foreach
89
+ - Fixed bug #452 : Ruleset exclude-pattern for specific sniff code ignored when using CLI --ignore option
89
90
- Fixed bug #20482 : Scope indent sniff can get into infinite loop when processing a parse error
90
91
</notes >
91
92
<contents >
You can’t perform that action at this time.
0 commit comments