Updates for PHPCS and PHPMD