From 3d830f1f9496e47ee14c14449c4369e3a7fe5a78 Mon Sep 17 00:00:00 2001 From: Martijn Otto Date: Wed, 18 May 2016 17:00:59 +0200 Subject: Set the return type hint to undefined, otherwise PHP will not accept __construct member functions (they are not allowed to return anything) --- zend/callable.h | 2 +- zend/classimpl.cpp | 2 +- zend/classimpl.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/zend/callable.h b/zend/callable.h index 789d129..f6a172f 100644 --- a/zend/callable.h +++ b/zend/callable.h @@ -114,7 +114,7 @@ protected: * Suggestion for the return type * @var Type */ - Type _return = Type::Null; + Type _return = Type::Undefined; /** * Required number of arguments diff --git a/zend/classimpl.cpp b/zend/classimpl.cpp index e4a620f..75191f5 100644 --- a/zend/classimpl.cpp +++ b/zend/classimpl.cpp @@ -1341,7 +1341,7 @@ const struct _zend_function_entry *ClassImpl::entries() zend_function_entry *last = &_entries[i]; // all should be set to zero - memset(last, 0, sizeof(zend_function_entry)); + memset(last, 0, sizeof(*last)); // done return _entries; diff --git a/zend/classimpl.h b/zend/classimpl.h index 1754755..370fa81 100644 --- a/zend/classimpl.h +++ b/zend/classimpl.h @@ -102,7 +102,6 @@ private: * properties for each method. This method is called at extension * startup time to register all methods. * - * @param classname The class name * @return zend_function_entry[] */ const zend_function_entry *entries(); -- cgit v1.2.3