Issue #3554793 by jwilson3: Fix phpcs & stylelint errors

James Wilsonrequested to merge
issue/rivet-3554793:3554793-fix-phpcs-stylelint-errors into 1.0.x

Closes #3554793

Merge request reports