Fix match static method name in annotation (#446)

rectorphp · Jul 19, 2021 · 75c06ea · 75c06ea
1 parent 10e545f
commit 75c06ea
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
diff --git a/packages/NodeCollector/StaticAnalyzer.php b/packages/NodeCollector/StaticAnalyzer.php
@@ -43,9 +43,10 @@ private function hasStaticAnnotation(string $methodName, ClassReflection $classR
             return false;
         }
 
+        // @see https://regex101.com/r/7Zkej2/1
         return (bool) Strings::match(
             $resolvedPhpDocBlock->getPhpDocString(),
-            '#@method\s*static\s*(.*?)\b' . $methodName . '\b#'
+            '#@method\s*static\s*((([\w\|\\\\]+)|\$this)*+(\[\])*)*\s+\b' . $methodName . '\b#'
         );
     }
 }
diff --git a/...nStaticMethodToStaticCallRector/Fixture/skip_string_not_method_name_in_annotation.php.inc b/...nStaticMethodToStaticCallRector/Fixture/skip_string_not_method_name_in_annotation.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector\Fixture;
+
+/**
+ * @method static static create($parameters) some description with parameters
+ */
+trait SkipStringNotMethodNameInAnnotation
+{
+    public function run()
+    {
+        $this->parameters();
+    }
+
+    public function parameters(): void
+    {
+    }
+}
diff --git a/...Call/ThisCallOnStaticMethodToStaticCallRector/Fixture/static_method_in_annotation.php.inc b/...Call/ThisCallOnStaticMethodToStaticCallRector/Fixture/static_method_in_annotation.php.inc
@@ -0,0 +1,49 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector\Fixture;
+
+/**
+ * @method static static staticReturnStatic()
+ * @method static static|StaticMethodInAnnotation|string[]|$this staticReturnMixed()
+ * @method static withoutReturnType()
+ * @method static withoutParameters
+ * @method StaticMethodInAnnotation|static returnStatic
+ */
+trait StaticMethodInAnnotation
+{
+    public function run()
+    {
+        $this->staticReturnStatic();
+        $this->staticReturnMixed();
+        $this->withoutReturnType();
+        $this->withoutParameters();
+        $this->returnStatic();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector\Fixture;
+
+/**
+ * @method static static staticReturnStatic()
+ * @method static static|StaticMethodInAnnotation|string[]|$this staticReturnMixed()
+ * @method static withoutReturnType()
+ * @method static withoutParameters
+ * @method StaticMethodInAnnotation|static returnStatic
+ */
+trait StaticMethodInAnnotation
+{
+    public function run()
+    {
+        static::staticReturnStatic();
+        static::staticReturnMixed();
+        static::withoutReturnType();
+        static::withoutParameters();
+        $this->returnStatic();
+    }
+}
+
+?>