Putting the check style in the php.xml file
Merge branches 'develop' and 'master'