Fixed warning
Merge branch 'master' of https://git.php.net/repository/php-src
Removed useless checks