Skip to content

general signatures discrepencies #13122

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

Jump to bottom
Merged
merged 1 commit into from
Jan 10, 2024
Merged

general signatures discrepencies #13122

merged 1 commit into from
Jan 10, 2024

Conversation

devnexen
Copy link
Member

No description provided.

@devnexen devnexen requested a review from iluuu1994 as a code owner January 10, 2024 19:44
@nielsdos
Copy link
Member

OK for DOM, incomplete for SimpleXML (see line 50 of simplexml.c)

@devnexen
Copy link
Member Author

:) there are more fixes anyway.

@devnexen devnexen force-pushed the few_sig_fixes branch 2 times, most recently from 2a24585 to 390bfb8 Compare January 10, 2024 20:46
Girgias
Girgias approved these changes Jan 10, 2024
View reviewed changes
Copy link
Member

@Girgias Girgias left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Zend/zend_iterators.h
Comment on lines 33 to +34
/* check for end of iteration (FAILURE or SUCCESS if data is valid) */
int (*valid)(zend_object_iterator *iter);
zend_result (*valid)(zend_object_iterator *iter);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should have an entry in UPGRADING.INTERNALS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true true :)

@Girgias
Copy link
Member

Girgias commented Jan 10, 2024

Seems that something got missed. As Windows is more strict on this:

ext\spl\spl_iterators.c(484): error C2220: the following warning is treated as an error
ext\spl\spl_iterators.c(484): warning C4133: 'initializing': incompatible types - from 'int (__cdecl *)(zend_object_iterator *)' to 'zend_result (__cdecl *)(zend_object_iterator *)'
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64\cl.exe"' : return code '0x2'

@devnexen
Copy link
Member Author

yes I wait all pass :)

@devnexen devnexen force-pushed the few_sig_fixes branch 3 times, most recently from 4069ac7 to 66750f1 Compare January 10, 2024 21:34
@devnexen devnexen merged commit 9726721 into php:master Jan 10, 2024
@youkidearitai youkidearitai mentioned this pull request Jan 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Girgias Girgias Girgias approved these changes

@iluuu1994 iluuu1994 Awaiting requested review from iluuu1994

@dstogov dstogov Awaiting requested review from dstogov dstogov is a code owner

@nielsdos nielsdos Awaiting requested review from nielsdos nielsdos is a code owner

@derickr derickr Awaiting requested review from derickr derickr is a code owner

Assignees
No one assigned
Labels
Category: Engine Extension: com_dotnet Extension: date Extension: dom Extension: ffi Extension: gd Extension: intl Extension: mysqli Extension: pdo (core) Extension: simplexml Extension: spl Extension: zend_test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@devnexen @nielsdos @Girgias