Modernise code

Alex Pottrequested to merge
issue/entity_usage-3612460:3612460-bump-minimum-drupal into 5.x

Closes #3612460

Merge request reports