Fixed a problem where excluding a message from a custom standard's ow…

…n sniff would exclude the whole sniff (ref #1480)

package.xml

@@ -51,6 +51,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- If ommitted, the namespace is assumed to be the same as the directory name containing the ruleset.xml file
     -- The namespace is set in the ruleset tag of the ruleset.xml file
     -- e.g., ruleset name="My Coding Standard" namespace="MyProject\CS\Standard"
+  - Fixed a problem where excluding a message from a custom standard's own sniff would exclude the whole sniff
+    -- This caused some PSR2 errors to be under-reported
   - Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
   - Fixed bug #1447 : Running the unit tests with a phpunit config file breaks the test suite
     -- Unknown arguments were not being handled correctly, but are now stored in $config->unknown

src/Ruleset.php

@@ -371,14 +371,17 @@ public function processRuleset($rulesetPath, $depth=0)
                         echo "\t\t=> severity set to 5".PHP_EOL;
                     }
                 } else if (empty($newSniffs) === false) {
-                    // Including a sniff that hasn't been included higher up, but
-                    // only including a single message from it. So turn off all messages in
-                    // the sniff, except this one.
-                    $this->ruleset[$sniffCode]['severity']            = 0;
-                    $this->ruleset[(string) $rule['ref']]['severity'] = 5;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo "\t\tExcluding sniff \"".$sniffCode.'" except for "'.$parts[3].'"'.PHP_EOL;
+                    $newSniff = $newSniffs[0];
+                    if (in_array($newSniff, $ownSniffs) === false) {
+                        // Including a sniff that hasn't been included higher up, but
+                        // only including a single message from it. So turn off all messages in
+                        // the sniff, except this one.
+                        $this->ruleset[$sniffCode]['severity']            = 0;
+                        $this->ruleset[(string) $rule['ref']]['severity'] = 5;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", $depth);
+                            echo "\t\tExcluding sniff \"".$sniffCode.'" except for "'.$parts[3].'"'.PHP_EOL;
+                        }
                     }
                 }//end if
             }//end if