Merge pull request phpmd#1044 from tvbeek/fix_1020-strict-with-CountI…

…nLoopExpression-rule

Fix the strict option on applyOnClassMethods.

src/main/php/PHPMD/AbstractRule.php

@@ -101,6 +101,13 @@ abstract class AbstractRule implements Rule
      */
     private $report = null;
 
+    /**
+     * Should this rule force the strict mode.
+     *
+     * @var boolean
+     */
+    private $strict = false;
+
     /**
      * Returns the name for this rule instance.
      *
@@ -378,6 +385,15 @@ public function getStringProperty($name, $default = null)
         return (string)$this->getProperty($name, $default);
     }
 
+    /**
+     * @param bool $strict
+     * @return void
+     */
+    public function setStrict($strict)
+    {
+        $this->strict = $strict;
+    }
+
     /**
      * This method adds a violation to all reports for this violation type and
      * for the given <b>$node</b> instance.
@@ -409,7 +425,7 @@ protected function addViolation(
     protected function applyOnClassMethods(AbstractTypeNode $node)
     {
         foreach ($node->getMethods() as $method) {
-            if ($method->hasSuppressWarningsAnnotationFor($this)) {
+            if (!$this->strict && $method->hasSuppressWarningsAnnotationFor($this)) {
                 continue;
             }
 

src/main/php/PHPMD/RuleSet.php

@@ -259,6 +259,9 @@ public function apply(AbstractNode $node)
                 continue;
             }
             $rule->setReport($this->report);
+            if (method_exists($rule, 'setStrict')) {
+                $rule->setStrict($this->strict);
+            }
             $rule->apply($node);
         }
     }