Issue #3386937 by Spokje, smustgrave: Remove error suppressions and...

Issue #3386937 by Spokje, smustgrave: Remove error suppressions and workarounds for https://bugs.php.net/bug.php?id=50688

(cherry picked from commit 3b490aae)