The issue doesn't exist anymore and I am comfortable with using PHPCS for fix...