Fix PHPCS for completeness query builder
Fix PHPCS for resolver