Nikita Popov 4fea054ee0 Merge branch '3.x' ...

Conflicts:
	lib/PhpParser/Parser/Php7.php

2017-06-28 23:06:38 +02:00

..

Multiple.php

Generate PHP 7 type annotations

2017-04-28 21:40:59 +02:00

Php5.php

Always use Identifier nodes

2017-04-28 20:57:32 +02:00

Php7.php

Merge branch '3.x'

2017-06-28 23:06:38 +02:00

Tokens.php

Move token constants into separate class

2015-06-13 18:39:55 +02:00