danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2025-01-22 22:01:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.x'

Browse Source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
Nikita Popov 2017-12-26 15:44:25 +01:00
commit aa289c9694
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
Version 4.0.0-dev
-----------------
@ -84,11 +85,19 @@ Version 4.0.0-alpha1 (2017-10-18)
* The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`.
However, this is an internal class and should not be used directly.
Version 3.1.3-dev
Version 3.1.4-dev
-----------------
Nothing yet.
Version 3.1.3 (2017-12-26)
--------------------------
### Fixed
* Improve compatibility with php-scoper, by supporting prefixed namespaces in
`NodeAbstract::getType()`.
Version 3.1.2 (2017-11-04)
--------------------------