Reconcile linting discrepancies with civicrm-core

ufundorequested to merge
ufundo/riverlea:check-in-discrepancies into main

This should get the linting in this repo into line with the version accepted into civicrm-core

Merge request reports