Fix phpcs and phpstan issues

Problem/Motivation

There are a number of phpcs and phpstan issues. We should fix them to improve code quality.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes