Update code to latest PHP standards
issue