- TSPHP-795 Reduce code branches - use antlr with fix 157
-- exchanged antlr (for consistency with other components)
- added new components