Move length calculation inside the if for consistency amongst rules

Moved "threshold" to the right side so it's better understandable. Tightened the LongVariable length constraints in the test case.
phpmd · May 5, 2020 · 0e56d78 · 0e56d78
1 parent 083628e
commit 0e56d78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/main/php/PHPMD/Rule/Naming/LongClassName.php b/src/main/php/PHPMD/Rule/Naming/LongClassName.php
@@ -46,10 +46,10 @@ class LongClassName extends AbstractRule implements ClassAware, InterfaceAware
     public function apply(AbstractNode $node)
     {
         $threshold = $this->getIntProperty('maximum');
-        $length    = Strings::length($node->getName(), $this->getSubtractSuffixList());
-        if ($length > $threshold) {
-            $this->addViolation($node, array($node->getName(), $threshold));
+        if (Strings::length($node->getName(), $this->getSubtractSuffixList()) <= $threshold) {
+            return;
         }
+        $this->addViolation($node, array($node->getName(), $threshold));
     }
 
     /**

diff --git a/src/main/php/PHPMD/Rule/Naming/LongVariable.php b/src/main/php/PHPMD/Rule/Naming/LongVariable.php
@@ -106,7 +106,7 @@ protected function checkNodeImage(AbstractNode $node)
     protected function checkMaximumLength(AbstractNode $node)
     {
         $threshold = $this->getIntProperty('maximum');
-        if ($threshold >= Strings::length($node->getImage(), $this->getSubtractSuffixList()) - 1) {
+        if (Strings::length($node->getImage(), $this->getSubtractSuffixList()) - 1 <= $threshold) {
             return;
         }
         if ($this->isNameAllowedInContext($node)) {

diff --git a/src/main/php/PHPMD/Rule/Naming/ShortClassName.php b/src/main/php/PHPMD/Rule/Naming/ShortClassName.php
@@ -45,8 +45,7 @@ class ShortClassName extends AbstractRule implements ClassAware, InterfaceAware
     public function apply(AbstractNode $node)
     {
         $threshold = $this->getIntProperty('minimum');
-
-        if ($threshold <= strlen($node->getName())) {
+        if (strlen($node->getName()) >= $threshold) {
             return;
         }
 

diff --git a/src/test/php/PHPMD/Rule/Naming/LongVariableTest.php b/src/test/php/PHPMD/Rule/Naming/LongVariableTest.php
@@ -34,7 +34,7 @@ class LongVariableTest extends AbstractTest
     public function testRuleAppliesToLocalVariableInFunctionWithNameLongerThanThreshold()
     {
         $rule = new LongVariable();
-        $rule->addProperty('maximum', 17);
+        $rule->addProperty('maximum', 21);
         $rule->setReport($this->getReportWithOneViolation());
         $rule->apply($this->getFunction());
     }
@@ -47,7 +47,7 @@ public function testRuleAppliesToLocalVariableInFunctionWithNameLongerThanThresh
     public function testRuleNotAppliesToLocalVariableInFunctionWithNameSmallerThanThreshold()
     {
         $rule = new LongVariable();
-        $rule->addProperty('maximum', 17);
+        $rule->addProperty('maximum', 6);
         $rule->setReport($this->getReportWithNoViolation());
         $rule->apply($this->getFunction());
     }