Skip to content

[pull] master from CopernicaMarketingSoftware:master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2022
Merged

[pull] master from CopernicaMarketingSoftware:master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
088e402
prepare makefile for next version
EmielBruijntjes Jun 14, 2022
c253505
moved setting the ce_flags a bit up so that we no longer need php7.2 …
EmielBruijntjes Jun 14, 2022
7a2212b
fixed another mess up with the class access modifier
EmielBruijntjes Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ INSTALL_LIB = ${INSTALL_PREFIX}/lib
#

SONAME = 2.3
VERSION = 2.3.2
VERSION = 2.3.4


#
Expand Down
12 changes: 4 additions & 8 deletions zend/classimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ zend_class_entry *ClassImpl::initialize(ClassBase *base, const std::string &pref
// register the class
_entry = zend_register_internal_class(&entry);
}

// register the interfaces
for (auto &interface : _interfaces)
{
Expand All @@ -1436,6 +1436,9 @@ zend_class_entry *ClassImpl::initialize(ClassBase *base, const std::string &pref
if (_base->traversable()) zend_class_implements(_entry, 1, zend_ce_traversable);
if (_base->serializable()) zend_class_implements(_entry, 1, zend_ce_serializable);

// instal the right modifier (to make the class an interface, abstract class, etc)
_entry->ce_flags |= uint64_t(_type);

// this pointer has to be copied to temporary pointer, as &this causes compiler error
ClassImpl *impl = this;

Expand All @@ -1452,13 +1455,6 @@ zend_class_entry *ClassImpl::initialize(ClassBase *base, const std::string &pref
// install the doc_comment
_entry->info.user.doc_comment = _self;

// set access types flags for class
#if PHP_VERSION_ID >= 70400
_entry->ce_flags |= (int)_type;
#else
_entry->ce_flags = (int)_type;
#endif

// declare all member variables
for (auto &member : _members) member->initialize(_entry);

Expand Down