Run Rector on your code to see what it can do for you:
Applied Rules:
Is the result wrong?
rector.php