syntax error, unexpected 'Trait' (T_TRAIT)

Hi!

This patch is unfortunately not created based on the dev version.

Hi @nagy.balint - you are right.. I actually will need to make a few more modifications to the patch. I will add it later today.

Actually. some of the issues I found had already been fixed on dev.2.x I will have to open another issue to add the new bugs I found in dev.