phpmd
diff --git a/‎src/main/php/PHPMD/AbstractNode.php
Lines changed: 1 addition & 1 deletion b/‎src/main/php/PHPMD/AbstractNode.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/php/PHPMD/Rule/Naming/LongMethodName.php
Lines changed: 3 additions & 2 deletions b/‎src/main/php/PHPMD/Rule/Naming/LongMethodName.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/main/php/PHPMD/Rule/Naming/ShortMethodName.php
Lines changed: 3 additions & 2 deletions b/‎src/main/php/PHPMD/Rule/Naming/ShortMethodName.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/test/php/PHPMD/TextUI/CommandLineOptionsTest.php
Lines changed: 6 additions & 6 deletions b/‎src/test/php/PHPMD/TextUI/CommandLineOptionsTest.php
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/test/php/fix-php-compatibility.php
Lines changed: 6 additions & 0 deletions b/‎src/test/php/fix-php-compatibility.php
Lines changed: 6 additions & 0 deletions
@@ -200,7 +200,7 @@ public function getImage()
      * Returns the source name for this node, maybe a class or interface name,
      * or a package, method, function name.
      *
-     * @return string
+     * @return string|null
      */
     public function getName()
     {
 
@@ -38,14 +38,15 @@ class LongMethodName extends AbstractRule implements MethodAware, FunctionAware
     public function apply(AbstractNode $node)
     {
         $threshold = $this->getIntProperty('maximum');
+        $name = (string) $node->getName();
 
-        if (strlen($node->getName()) <= $threshold) {
+        if (strlen($name) <= $threshold) {
             return;
         }
 
         $exceptions = $this->getExceptionsList();
 
-        if (in_array($node->getName(), $exceptions, true)) {
+        if (in_array($name, $exceptions, true)) {
             return;
         }
 
 
@@ -38,14 +38,15 @@ class ShortMethodName extends AbstractRule implements MethodAware, FunctionAware
     public function apply(AbstractNode $node)
     {
         $threshold = $this->getIntProperty('minimum');
+        $name = (string) $node->getName();
 
-        if (strlen($node->getName()) >= $threshold) {
+        if (strlen($name) >= $threshold) {
             return;
         }
 
         $exceptions = $this->getExceptionsList();
 
-        if (in_array($node->getName(), $exceptions, true)) {
+        if (in_array($name, $exceptions, true)) {
             return;
         }
 
 
@@ -154,7 +154,7 @@ public function testThrowsExpectedExceptionWhenRequiredArgumentsNotSet()
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Unknown option --help.
      *
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testThrowsExpectedExceptionWhenOptionNotFound()
     {
@@ -175,7 +175,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFound()
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Unknown option -foobar
      *
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testThrowsExpectedExceptionWhenOptionNotFoundInFront()
     {
@@ -196,7 +196,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFoundInFront()
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Unknown option --help.
      *
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testThrowsExpectedExceptionWhenOptionNotFoundUsingArgumentSeparator()
     {
@@ -217,7 +217,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFoundUsingArgumentSepara
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage --color option does not accept a value
      *
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testThrowsExpectedExceptionWhenBooleanOptionReceiveValue()
     {
@@ -226,7 +226,7 @@ public function testThrowsExpectedExceptionWhenBooleanOptionReceiveValue()
     }
 
     /**
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testOptionEqualSyntax()
     {
@@ -237,7 +237,7 @@ public function testOptionEqualSyntax()
     }
 
     /**
-     * @covers \PHPMD\TextUI\ArgumentsValidator
+     * @covers \PHPMD\Utility\ArgumentsValidator
      */
     public function testArgumentSeparatorEnforced()
     {
 
@@ -172,6 +172,12 @@
             '#[\\ReturnTypeWillChange]',
         ),
     ),
+    __DIR__ . '/../../../../vendor/phpunit/phpunit/src/Util/Getopt.php' => array(
+        array(
+            'strlen($opt_arg)',
+            'strlen((string) $opt_arg)',
+        ),
+    ),
     __DIR__ . '/../../../vendor/phpunit/php-code-coverage/src/CodeCoverage.php' => (PHP_VERSION >= 7) ? array(
         array(
             '$docblock = $token->getDocblock();',
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public function getImage()`
`200`	`200`	`* Returns the source name for this node, maybe a class or interface name,`
`201`	`201`	`* or a package, method, function name.`
`202`	`202`	`*`
`203`		`- * @return string`
	`203`	`+ * @return string\|null`
`204`	`204`	`*/`
`205`	`205`	`public function getName()`
`206`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,15 @@ class LongMethodName extends AbstractRule implements MethodAware, FunctionAware`
`38`	`38`	`public function apply(AbstractNode $node)`
`39`	`39`	`{`
`40`	`40`	`$threshold = $this->getIntProperty('maximum');`
	`41`	`+ $name = (string) $node->getName();`
`41`	`42`
`42`		`- if (strlen($node->getName()) <= $threshold) {`
	`43`	`+ if (strlen($name) <= $threshold) {`
`43`	`44`	`return;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`$exceptions = $this->getExceptionsList();`
`47`	`48`
`48`		`- if (in_array($node->getName(), $exceptions, true)) {`
	`49`	`+ if (in_array($name, $exceptions, true)) {`
`49`	`50`	`return;`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,15 @@ class ShortMethodName extends AbstractRule implements MethodAware, FunctionAware`
`38`	`38`	`public function apply(AbstractNode $node)`
`39`	`39`	`{`
`40`	`40`	`$threshold = $this->getIntProperty('minimum');`
	`41`	`+ $name = (string) $node->getName();`
`41`	`42`
`42`		`- if (strlen($node->getName()) >= $threshold) {`
	`43`	`+ if (strlen($name) >= $threshold) {`
`43`	`44`	`return;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`$exceptions = $this->getExceptionsList();`
`47`	`48`
`48`		`- if (in_array($node->getName(), $exceptions, true)) {`
	`49`	`+ if (in_array($name, $exceptions, true)) {`
`49`	`50`	`return;`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function testThrowsExpectedExceptionWhenRequiredArgumentsNotSet()`
`154`	`154`	`* @expectedException \InvalidArgumentException`
`155`	`155`	`* @expectedExceptionMessage Unknown option --help.`
`156`	`156`	`*`
`157`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`157`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`158`	`158`	`*/`
`159`	`159`	`public function testThrowsExpectedExceptionWhenOptionNotFound()`
`160`	`160`	`{`
`@@ -175,7 +175,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFound()`
`175`	`175`	`* @expectedException \InvalidArgumentException`
`176`	`176`	`* @expectedExceptionMessage Unknown option -foobar`
`177`	`177`	`*`
`178`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`178`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`179`	`179`	`*/`
`180`	`180`	`public function testThrowsExpectedExceptionWhenOptionNotFoundInFront()`
`181`	`181`	`{`
`@@ -196,7 +196,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFoundInFront()`
`196`	`196`	`* @expectedException \InvalidArgumentException`
`197`	`197`	`* @expectedExceptionMessage Unknown option --help.`
`198`	`198`	`*`
`199`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`199`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`200`	`200`	`*/`
`201`	`201`	`public function testThrowsExpectedExceptionWhenOptionNotFoundUsingArgumentSeparator()`
`202`	`202`	`{`
`@@ -217,7 +217,7 @@ public function testThrowsExpectedExceptionWhenOptionNotFoundUsingArgumentSepara`
`217`	`217`	`* @expectedException \InvalidArgumentException`
`218`	`218`	`* @expectedExceptionMessage --color option does not accept a value`
`219`	`219`	`*`
`220`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`220`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`221`	`221`	`*/`
`222`	`222`	`public function testThrowsExpectedExceptionWhenBooleanOptionReceiveValue()`
`223`	`223`	`{`
`@@ -226,7 +226,7 @@ public function testThrowsExpectedExceptionWhenBooleanOptionReceiveValue()`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`/**`
`229`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`229`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`230`	`230`	`*/`
`231`	`231`	`public function testOptionEqualSyntax()`
`232`	`232`	`{`
`@@ -237,7 +237,7 @@ public function testOptionEqualSyntax()`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`/**`
`240`		`- * @covers \PHPMD\TextUI\ArgumentsValidator`
	`240`	`+ * @covers \PHPMD\Utility\ArgumentsValidator`
`241`	`241`	`*/`
`242`	`242`	`public function testArgumentSeparatorEnforced()`
`243`	`243`	`{`