Fix some other phpcs issues and changing approach.

Tauany Buenorequested to merge
issue/form_mode_manager-3291954:3291954-drupal-coding-standard into 8.x-2.x

Closes #3291954

Merge request reports