Nikita Popov 46e7fea72d Merge branch '3.x' ...

Conflicts:
	test/PhpParser/Builder/ParamTest.php

2017-06-28 23:13:33 +02:00

..

ClassTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

FunctionTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

InterfaceTest.php

Always use Identifier nodes

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

MethodTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

NamespaceTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

ParamTest.php

Merge branch '3.x'

2017-06-28 23:13:33 +02:00

PropertyTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

TraitTest.php

Bump phpunit version (#381)

2017-04-27 18:14:07 +02:00

UseTest.php

Distinguish between implicit/explicit alias

2017-04-28 21:05:01 +02:00