Code

PHP7 Support#48

Code

Closed

Sean-Der wants to merge 75 commits intomsgpack:mastermsgpack/msgpack-php:masterfrom Sean-Der:php7-supportCopy head branch name to clipboard

+852-2,559

Commits

Commits on May 3, 2015

• Mass replace smart_str -> smart_string

  Sean-Der

  committed
  d3c7ca6

• Update PS_SERIALIZER_ENCODE_FUNC returns a zend_string instead of passing in a char/int to mutate

  Sean-Der

  committed
  bb36411

• Update PS_SERIALIZER_DECODE_FUNC to use the new hash iteration API, php_session functions also expect smart_string instead of char* + int

  Sean-Der

  committed
  39a9afd

• Update msgpack_var_add to use new hash API

  Sean-Der

  committed
  2a472e7

• zend_uint -> uint32_t

  Sean-Der

  committed
  805e4a2

• Update msgpack_serialize_zval. PHP_SET_CLASS_ATTRIBUTES now returns a zend_string instead of char* + len. IS_BOOL is not a distinct type anymore IS_TRUE/IS_FALSE instead

  Sean-Der

  committed
  6f31cba

• Update msgpack_serialize_object for new hashmap and zend_string API

  Sean-Der

  committed
  e75fe8a

• Rough version of msgpack_serialize_array, use new hash iteration API

  Sean-Der

  committed
  83f6ec0

• Refactor msgpack_serialize_class to use new hash API and one level less of zval indirection

  Sean-Der

  committed
  8793909

• Refactor msgpack_unserialize_class to drop one level of zval deference, and zend_string instead of char+int for zend_lookup_class

  Sean-Der

  committed
  fbc4e8e

• Remove unused macros from msgpack_unpack.c, update msgpack_var_push and msgpack_unserialize_raw to have one level less of dereference

  Sean-Der

  committed
  4f1e6e7

• Update msgpack_unserialize_map_item to handle zend_string inputs and macro removal PHP 5 -> 7

  Sean-Der

  committed
  8814fdd

• Replace MSGPACK_UNPACKER_OBJECT and MSGPACK_BASE_OBJECT macros with msgpack_unpacker_fetch_object and msgpack_base_fetch_object

  Sean-Der

  committed
  41800b5

• Update php_msgpack_base_t and php_msgpack_unpacker_t to use the new custom object API

  Sean-Der

  committed
  51f7642

• Cleanup last zval deref changes in msgpack_class.c

  Sean-Der

  committed
  01d6519

• Update msgpack_convert_long_to_properties to new hash table iteration API

  Sean-Der

  committed
  8e8e23c

• Update msgpack_convert_string_to_properties to use new zend_string API

  Sean-Der

  committed
  67deff3

• Port msgpack_convert_array to the new hash iteration API

  Sean-Der

  committed
  e5ec207

• Update ZEND_FUNCTION declaration of msgpack_unserialize to use new zend_parse_parameters, which returns a zend_string instead of char+int

  Sean-Der

  committed
  272eebd

• Make sure to free returned smart_string in exposed ZEND_FUNCTION msgpack_serialize

  Sean-Der

  committed
  c52e1a7

• Update msgpack_check_ht_is_map to properly call zend_hash_add

  Sean-Der

  committed
  ff23828

• Cleanup indentation, remove redundant casting

  Sean-Der

  committed
  3137c5b

• Port msgpack_convert_array to the new hash iteration API

  Sean-Der

  committed
  19e32ed

• Off by one when serializing a string during array serialization

  Sean-Der

  committed
  a765bd8

• msgpack_unserialize_map_item was incorrectly ported, MSGPACK_WARNING was being fired when zend_symtable_update succeeded instead of failed

  Sean-Der

  committed
  f1388a6

• Add Z_TYPE_REF_AWARE_P macro since when packing we can are possibly processing refs

  Sean-Der

  committed
  9d6d636

• Z_LVAL_P -> zval_get_long in case where we could have refs

  Sean-Der

  committed
  aaeee58

• When packing make everything ref aware, before TYPE/VAL would fail

  Sean-Der

  committed
  d9b6553

• FIXME update msgpack_serialize_zval to call Z_INDIRECT_P if the type equals IS_INDIRECT

  Sean-Der

  committed
  b37104b

• Cleanup msgpack_unserialize_class, fixing 012 test segment fault

  Sean-Der

  committed
  f5b47f8

• FIXME add temporary version of ALLOC_INIT_ZVAL to msgpack_unpack, until we I do a proper refactor of zval allocation for the MSGPACK_UNSERIALIZE_ALLOC_STACK and MSGPACK_UNSERIALIZE_ALLOC_VALUE macros

  Sean-Der

  committed
  774659c

• msgpack_serialize_class expects a list of keys, not a map. Update msgpack_serialize_object so it passes an initalized zval to call_user_function_ex

  Sean-Der

  committed
  487f76d

• Properly call __wakeup during unpacking

  Sean-Der

  committed
  85f58f4

Commits on May 4, 2015

• Update var_push/stack_push to use a var_entries where data is a zval[] instead of *zval[], following the current pattern in ext/standard/var_unserializer.re

  Sean-Der

  committed
  ea2d5be

Commits on May 5, 2015

• FIXME: Comment out the call_user_function_ex calls implemented via opcodes, still need to migrate

  Sean-Der

  committed
  76d5a8a

• Add commented out loop over var_hash for freeing after serialization

  Sean-Der

  committed
  c4baa8e

Commits on May 7, 2015

• Update msgpack_unserialize_class to use call_user_function_ex correctly

  Sean-Der

  committed
  4e19afa

• Update ZEND_METHOD(msgpack_unpacker, feed) to use a zend_string for zend_parse_parameters instead of val+len

  Sean-Der

  committed
  51960ae

• When updating a class in msgpack_unserialize_map_item call zend_update_property to update a class instead of zend_symtable_update, which would cause undefined behavior

  Sean-Der

  committed
  3e67e92

Commits on May 9, 2015

• Update msgpack_unserialize_map_item to properly handle adding elements to a map that is a reference

  Sean-Der

  committed
  591b3b3

• Update msgpack_var_add to return to the index of an already serialized object as a zval instead of a ulong

  Sean-Der

  committed
  0cd9aed

Commits on May 10, 2015

• Update msgpack_unserialize_map_item to unmangle the property key set by zend_mangle_propery_name, since we now use zend_update_property instead of zend_symtable_update

  Sean-Der

  committed
  12c8a02

• Update msgpack_var_access to use a zval** instead of a zval*** when fetching a value, fixing the caller

  Sean-Der

  committed
  70557c8

Commits on May 11, 2015

• Start fixing the compile time errors in msgpack_convert.c

  Sean-Der

  committed
  5306649

• Accidently disabled branch used to update classes in msgpack_unserialize_map_item

  Sean-Der

  committed
  414f72b

Commits on May 12, 2015

• MSGPACK_UNPACK_CONTINUE returned from template_execute means we should return false, fixes test 018

  Sean-Der

  committed
  94d6f04

• Bring back serializable interface support, was behind IFDEFs

  Sean-Der

  committed
  60a3044

• msgpack_serialize_object is now ref aware

  Sean-Der

  committed
  308e918

Commits on May 14, 2015

• Bring back seperate stacks for dtor variables, still emalloc leaks

  Sean-Der

  committed
  b265cd9

Commits on May 15, 2015

• Fix memory leak, don't make pointless dupe of zval string when updating a map with a string key

  Sean-Der

  committed
  a40f0e7

Commits on May 16, 2015

• Fix memory leaks for non-dtor allocations

  Sean-Der

  committed
  1185dba

• Fix pack/unpack memory leaks for classes

  Sean-Der

  committed
  93ec0c7

• Fix zend_string memory leak in msgpack_serialize_class

  Sean-Der

  committed
  351c29c

• Fix memory leak in msgpack_unserialize_map_item when executing __wakeup

  Sean-Der

  committed
  2247ba1

• In msgpack_serialize_object allocate strings later, to make error handling and freeing cleaner

  Sean-Der

  committed
  210da3d

• Memory leaks in msgpack_unserialize_class

  Sean-Der

  committed
  45d832a

• PS_SERIALIZER_ENCODE_FUNC would pass an null zval * as return_value to msgpack_unserialize_var_destroy causing a segfault

  Sean-Der

  committed
  f1b108a

Commits on May 17, 2015

• Use Z_OBJCE_P instead of Z_OBJ_P()->ce

  Sean-Der

  committed
  caa80cb

Commits on May 18, 2015

• Cleaner ref handling when unpacking a map item

  Sean-Der

  committed
  3a75af1

Commits on May 20, 2015

• Update msgpack_unserialize_map_item to remove accidently added Z_ISREF_P

  Sean-Der

  committed
  676e6bd

• msgpack_unserialize_class now properly handles references, before it would object_init_ex and squash the zval ref

  Sean-Der

  committed
  6fbc26a

• msgpack_serialize_array was incorrectly ported to handle when php_only is 0

  Sean-Der

  committed
  88217d0

• Remove MSGPACK_METHOD1 macro which created the necessary opcodes to call a method on an object, use call_user_function_ex instead

  Sean-Der

  committed
  f53f484

Commits on May 22, 2015

• Update MessagePackUnpacker to use new object API, fixing unpacker tests

  Sean-Der

  committed
  b1a2abc

• Z_LVAL_P on a boolean is no longer valid, msgpack->setOption incorrectly set php_only using Z_LVAL_P causing it to always be true

  Sean-Der

  committed
  3fb45c3

Commits on May 26, 2015

• Began converting msgpack_convert.c from using symtable_update to update properties to proper zend_object handlers

  Sean-Der

  committed
  3572938

• Fix memory leak when serializing a class with a unserialize entry

  Sean-Der

  committed
  db405c4

Commits on May 27, 2015

• Update msgpack_convert_long_to_properties to properly detect keys

  Sean-Der

  committed
  3866934

Commits on May 28, 2015

• Finish converting msgpack_convert_array

  Sean-Der

  committed
  fd19e23

Commits on May 29, 2015

• ZEND_HASH_FOREACH_KEY_VAL -> ZEND_HASH_FOREACH_STR_KEY_VAL ulong key was unused

  Sean-Der

  committed
  edcaeda

Commits on May 30, 2015

• Fix unpacking code, we can't just reuse the stack anymore since the zval's are still used by non_dtor members

  Sean-Der

  committed
  c51a499

Commits on Jun 1, 2015

• Finish 'unpack of template convertor' test fails, memory leaks unfixed

  Sean-Der

  committed
  0ecf768

Commits on Jun 3, 2015

• Fixes from review by @zxcvdavid

  Sean-Der

  committed
  138072b

• Update msgpack_convert_template tests to assert we can create create invalid objects (non-string and 0 length keys)

  Sean-Der

  committed
  94ad5fd

Commits on Jun 7, 2015

• Cleaning up memory leaks in msgpack_convert.c

  Sean-Der

  committed
  7bdfe4b