[TypeResolver] Updated Lexer PREG pattern to ignore whitespaces

popy-dev · popy-dev · commit 481a805fd907 · 2018-02-24T21:58:35.000+01:00
diff --git a/src/TypeResolver.php b/src/TypeResolver.php
@@ -115,7 +115,7 @@ public function resolve($type, Context $context = null)
         }
 
         // split the type string into tokens `|`, `?`, `(`, `)[]`, '<', '>' and type names
-        $tokens = preg_split('/(\\||\\?|<|>|,|\\(|\\)(?:\\[\\])+)/', $type, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $tokens = preg_split('/\s*(\\||\\?|<|>|,|\\(|\\)(?:\\[\\])+)\s*/', $type, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         $tokenIterator = new \ArrayIterator($tokens);
 
         return $this->parseTypes($tokenIterator, $context, self::PARSER_IN_COMPOUND);

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function resolve($type, Context $context = null)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	// split the type string into tokens `\|`, `?`, `(`, `)[]`, '<', '>' and type names
`118`		`- $tokens = preg_split('/(\\\|\|\\?\|<\|>\|,\|\\(\|\\)(?:\\[\\])+)/', $type, -1, PREG_SPLIT_NO_EMPTY \| PREG_SPLIT_DELIM_CAPTURE);`
	`118`	`+ $tokens = preg_split('/\s(\\\|\|\\?\|<\|>\|,\|\\(\|\\)(?:\\[\\])+)\s/', $type, -1, PREG_SPLIT_NO_EMPTY \| PREG_SPLIT_DELIM_CAPTURE);`
`119`	`119`	`$tokenIterator = new \ArrayIterator($tokens);`
`120`	`120`
`121`	`121`	`return $this->parseTypes($tokenIterator, $context, self::PARSER_IN_COMPOUND);`