Code style guidelines for PHP and better property syntax
Merge remote-tracking branch 'origin/master'