Compatibility fixes for phpcs 2.0