gen_stub: Allow additional text after @return

nikic · nikic · commit 85bfa2243a7f · 2021-01-18T13:13:32.000+01:00
In case the stub file also contains documentation.
diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -1027,7 +1027,7 @@ public function getType(): string {
         if ($this->name === "param") {
             preg_match('/^\s*([\w\|\\\\\[\]]+)\s*\$\w+.*$/', $value, $matches);
         } elseif ($this->name === "return") {
-            preg_match('/^\s*([\w\|\\\\\[\]]+)\s*$/', $value, $matches);
+            preg_match('/^\s*([\w\|\\\\\[\]]+)(\s+|$)/', $value, $matches);
         }
 
         if (isset($matches[1]) === false) {

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ public function getType(): string {`
`1027`	`1027`	`if ($this->name === "param") {`
`1028`	`1028`	`preg_match('/^\s([\w\\|\\\\\[\]]+)\s\$\w+.*$/', $value, $matches);`
`1029`	`1029`	`} elseif ($this->name === "return") {`
`1030`		`- preg_match('/^\s([\w\\|\\\\\[\]]+)\s$/', $value, $matches);`
	`1030`	`+ preg_match('/^\s*([\w\\|\\\\\[\]]+)(\s+\|$)/', $value, $matches);`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`	`1033`	`if (isset($matches[1]) === false) {`