Code style fixes according to php-cs-fixer 0.4.0 #2642