Merge "Pass phpcs-strict on resources/"