Issue #3490680 by bluegeek9: Issues reported by phpcs

Steven Ayersrequested to merge
issue/charts-3490680:3490680-issues-reported-by into 5.1.x

Closes #3490680

Merge request reports