phabel/php-parser
1
0
Fork 0
mirror of https://github.com/phabelio/PHP-Parser.git synced 2024-12-02 17:38:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.x'

Browse Source 
Conflicts:
	CHANGELOG.md
	lib/PhpParser/NodeAbstract.php
This commit is contained in:
Nikita Popov 2018-02-28 21:32:04 +01:00
commit 9cea94000a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
Version 4.0.0-dev Version 4.0.0-dev
----------------- -----------------
@ -109,11 +110,20 @@ Version 4.0.0-alpha1 (2017-10-18)
However, this is an internal class and should not be used directly. However, this is an internal class and should not be used directly.
Version 3.1.5-dev Version 3.1.5-dev
=======
Version 3.1.6-dev
>>>>>>> 3.x
----------------- -----------------
Nothing yet.
Version 3.1.5 (2018-02-28)
--------------------------
### Fixed ### Fixed
* Fixed duplicate comment assignment in switch statements. (#469) * Fixed duplicate comment assignment in switch statements. (#469)
* Improve compatibility with PHP-Scoper. (#477)
Version 3.1.4 (2018-01-25) Version 3.1.4 (2018-01-25)
-------------------------- --------------------------

2
lib/PhpParser/NodeAbstract.php
View File

@ -2,6 +2,8 @@
namespace PhpParser; namespace PhpParser;
use PhpParser\Node;
abstract class NodeAbstract implements Node, \JsonSerializable abstract class NodeAbstract implements Node, \JsonSerializable
{ {
protected $attributes; protected $attributes;