Fix some PHP 7 tests and PHPCS

Merge request reports

Loading