[Code Style] Fixing phpcs errors from recent commits