Skip to content
forked from php/php-src

sync #4

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.

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 71 commits into from
Sep 16, 2020
Merged

sync #4

merged 71 commits into from
Sep 16, 2020

Conversation

chopins
Copy link
Owner

@chopins chopins commented Sep 16, 2020

No description provided.

Girgias and others added 30 commits September 12, 2020 18:41
This is a follow-up on commit 4a438b4

Add some tests to hopefully not forget it next time
Test is borked if the posix_geteui() function is unavailable.
These tests segfault with tracing JIT on Windows as of a recent
commit[1].  A link to a backtrace is available in a comment[2].  For
now, we mark these tests as XFAIL, to keep AppVeyor CI helpful.

[1] <817ae41>
[2] <817ae41#commitcomment-42227420>
These tests segfault with tracing JIT on Windows as of a recent
commit[1].  A link to a backtrace is available in a comment[2].  For
now, we mark these tests as XFAIL, to keep AppVeyor CI helpful.

[1] <7b0a053>
[2] <7b0a053#commitcomment-42267637>
This issue has been resolved[1], so the tests are expected to pass on
Windows again.

[1] <0a03291>
The $additional_headers parameter shouldn't accept null.
The same condition uses Error exceptions in lots of other classes.
We shouldn't assume that call->prev_execute_data is NULL here. The
value needs to be preserved for call chains.
* The array "subject" of a function gets called $array.

* Further parameters should be self-descriptive if used
  as a named parameter, and a full word, not an abbreviation.

* If there is a "bunch more arrays" variadic, it gets
  called $arrays (because that's what was already there).

* A few functions have a variadic "a bunch more arrays,
  and then a callable", and were already called $rest.
  I left those as is and died a little inside.

* Any callable provided to an array function that acts
  on the array is called $callback. (Nearly all were already,
  I just fixed the one or two outliers.)

* array_multisort() is beyond help so I ran screaming.
Do some drive by indentation fixes
Also fix pg_select() in regards to the $result_type arg which was missing from ZPP

Closes GH-6129
cmb69 and others added 29 commits September 15, 2020 10:59
* PHP-7.4:
  7.3.24 is next
That adds a ref if not immutable. Also audit uses of GC_IMMUTABLE
to either use GC_TRY_ADDREF or GC_TRY_PROTECT_RECURSION.
Apparently this "feature" was completely untested...
ReflectionReference::fromArrayElement(array $array, int|string $key): ?ReflectionReference
is going to be its official signature for PHP 8.0.

Closes GH-5651
This addresses two issues:
 * ~ throws for a number of types, and we should not compile-time
   evaluate in that case. Add a check similar to what we do for
   binary ops.
 * Unary +/- may produce a different error message due to
   canonicalization of the constant operand to the RHS. To avoid
   this, put the constant operand on the RHS right away.

Fixes oss-fuzz #25649.
re-add mbfl_convert_filter_feed API
re-add pointer cast
The "member" string here does not necessarily have a pre-calculated
hash value. In particular this is not the case if the class has no
properties.

Fixes oss-fuzz #25546.
* PHP-7.4:
  Fix assumption about property guard hash value
We need to initialize the result variable in the exceptional
case as well.

Fixes oss-fuzz #25526.
@chopins chopins merged commit 728d914 into chopins:master Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.