Fix phpcs warnings

Solved all the PHP_CS errors.

There are some merge conflicts.

Resolved the merge conflicts and removed phpcs errors in the updated code after resolving merge conflicts.

astonvictor → changed the visibility of the branch 3486768-fix-phpcs-warnings to hidden.

astonvictor → changed the visibility of the branch 3486768-fix-phpcs-warnings to active.

astonvictor → changed the visibility of the branch 8.x-1.x to hidden.

Automatically closed - issue fixed for 2 weeks with no activity.