Issue #3581803: Fix phpcs and phpstan warnings.

Closes #3581803

Merge request reports

Loading