phpcs-changes; and bugfix for undefined setting