Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 19:41:45 +0000 (22:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 19:41:45 +0000 (22:41 +0300)
commit6dab6523799209bde63b3d7bf6e658bdef00f7a2
treeeab5d54e9567152cf25e47344098f0a78ac49bb7
parent30d3698114c139e5308d9c76c4ae5df76e7fac43
parentad4fa8f75810facff8bea509249a735232235443
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
  Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE