Fix compatibility with PHP 7.4 due to trailing comma's in method declarations
Revert "Coding standard fixes" This reverts commit af431a03cf2e937b01b4fffb4f1b05fbfc282f69.
Revert "Coding standard fixes" This reverts commit af431a03cf2e937b01b4fffb4f1b05fbfc282f69.