Drupal 11 compatibility fixes and PHPCS fixes

Closes #3549243

Merge request reports

Loading