BAP-9463: Provide compatibility with PHP7 - Updated code according to comments
BAP-9463: Provide compatibility with PHP7
- Updated code according to comments

Djamy/platform,trustify/oroplatform,Djamy/platform,trustify/oroplatform,geoffroycochard/platform,orocrm/platform,orocrm/platform,geoffroycochard/platform,orocrm/platform,Djamy/platform,geoffroycochard/platform,trustify/oroplatform