Bug 449839 - XDebug debugger hangs when trying to perform 'Step Over'
immediately after 'Step Into'

Change-Id: I642a965c464985d54dac0e7196a41cc5d583ab1d
Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>
Bug 446163 - phpdoc: code hints not avaiable for several types in
@property

Change-Id: Ia547a92933e99f20d51dd390baaaa2449f6e1a88
Signed-off-by: Michal Niewrzal <michal.n@zend.com>
Bug 439557 - Indentation problem when pasting code

Change-Id: Ia105fe82a9d0c45874d7f5a59b66166f71be6f33
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 450175 - Automatically set up debugger type while adding new PHP
executable

Change-Id: I1de9ac1249135190ca9af23a3b87b88e2322baee
Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>
No bug - Update php facets support

Signed-off-by: Dawid Pakuła <zulus@w3des.net>
Merge "No bug - Update php facets support"
Merge "Bug 446163 - phpdoc: code hints not avaiable for several types in @property"
Bug 399725 - Empty heredoc produces unexpected 'EOF'

Change-Id: Ic5ff70d363be8346d7385c96a7d3f9b2b17c94ba
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 317291 - PHPDoc starting with /*** are highlighted like Multi line
comments

Change-Id: I26a65c8d2c2458f327ed803d63bb6b60878e7cb6
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 418959 - Formatting not work on one line file with assignment

Change-Id: I2bec4bec99a58054abf39967edb1349455141674
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Merge "Bug 418959 - Formatting not work on one line file with assignment"
Bug 434454 - Wrong autocomplete with aliased classes

Change-Id: I631b609b4cb75fc5238f66bfbde4513cf00d98f4
Signed-off-by: Michal Niewrzal <michal.n@zend.com>
Merge "Bug 450175 - Automatically set up debugger type while adding new PHP executable"
Merge "Bug 439557 - Indentation problem when pasting code"
Merge "Bug 449839 - XDebug debugger hangs when trying to perform 'Step Over' immediately after 'Step Into'"
Merge remote-tracking branch 'upstream/master'
Changes to resolve errors after merge with original PDT