Fix vimeo#4481 - ReflectionProperty implements Reflector

danog · Jan 29, 2021 · e7a4645 · e7a4645
1 parent c673d61
commit e7a4645
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Scanner/DocblockParser.php b/src/Psalm/Internal/Scanner/DocblockParser.php
@@ -23,8 +23,17 @@ public static function parse(string $docblock) : ParsedDocblock
         // Strip off comments.
         $docblock = trim($docblock);
 
-        $docblock = preg_replace('@^/\*\*@', '', $docblock);
-        $docblock = preg_replace('@\*\*?/$@', '', $docblock);
+        if (substr($docblock, 0, 3) === '/**') {
+            $docblock = substr($docblock, 3);
+        }
+
+        if (substr($docblock, -2) === '*/') {
+            $docblock = substr($docblock, 0, -2);
+
+            if (substr($docblock, -1) === '*') {
+                $docblock = substr($docblock, 0, -1);
+            }
+        }
 
         // Normalize multi-line @specials.
         $lines = explode("\n", $docblock);

diff --git a/stubs/CoreGenericClasses.phpstub b/stubs/CoreGenericClasses.phpstub
@@ -2151,7 +2151,7 @@ class ReflectionClass implements Reflector {
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 }
 
-class ReflectionFunction
+class ReflectionFunction implements Reflector
 {
     /**
      * @since 8.0
@@ -2162,7 +2162,7 @@ class ReflectionFunction
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 }
 
-class ReflectionProperty
+class ReflectionProperty implements Reflector
 {
     /**
      * @since 8.0
@@ -2173,7 +2173,7 @@ class ReflectionProperty
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 }
 
-class ReflectionMethod
+class ReflectionMethod implements Reflector
 {
     /**
      * @since 8.0