Merge branch 'release/3.1'

This commit is contained in:
Dylan K. Taylor
2018-07-10 12:48:14 +01:00
2 changed files with 52 additions and 2 deletions

View File

@ -630,9 +630,9 @@ class Utils{
* @return string[] an array of tagName => tag value. If the tag has no value, an empty string is used as the value.
*/
public static function parseDocComment(string $docComment) : array{
preg_match_all('/^[\t ]*\* @([a-zA-Z]+)(?:[\t ]+(.+))?[\t ]*$/m', $docComment, $matches);
preg_match_all('/(*ANYCRLF)^[\t ]*\* @([a-zA-Z]+)(?:[\t ]+(.+))?[\t ]*$/m', $docComment, $matches);
return array_combine($matches[1], array_map("trim", $matches[2]));
return array_combine($matches[1], $matches[2]);
}
/**