From: Xinchen Hui Date: Thu, 10 Mar 2016 07:43:53 +0000 (+0800) Subject: Merge branch 'PHP-7.0' X-Git-Tag: php-7.1.0alpha1~503 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50960d85ccabdacd0c91897617b8c8c21dc4ec25;p=php Merge branch 'PHP-7.0' * PHP-7.0: Useless check (part of #71753) object->ce should not be NULL Fixed typo (partially fix for #71753) emalloc never returns NULL (partially fix for #71753) --- 50960d85ccabdacd0c91897617b8c8c21dc4ec25