Skip to content

merge #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.

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 47 commits into from
Feb 6, 2019
Merged

merge #6

merged 47 commits into from
Feb 6, 2019

Conversation

rjhdby
Copy link
Owner

@rjhdby rjhdby commented Feb 6, 2019

No description provided.

cmb69 and others added 30 commits January 31, 2019 16:12
* PHP-7.3:
  Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
* PHP-7.4:
  Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
This variable was dropped in the pkg-config migration, which resulted
in spurious warnings about using valgrind with external PCRE. Fix the
checks to use the right variable.
I'm counting this towards the non-string needle deprecation from
https://wiki.php.net/rfc/deprecations_php_7_3. I wasn't aware that
mb_ereg_replace() is also affected by this issue. It's even more
ridiculous than usual here, because the integer is interpreted as
an ASCII codepoint, even though these are supposed to be multibyte
functions :(
Instead of manually handling the string conversion, use the standard
zpp mechanism.
This is logically an integer, and the function also returns the old
value as an integer. The fact that the integer needs to be converted
to a string for the ini assignment is an implementation detail.
Due to a typo, this code used to check for array_merge_recursive
twice.
* PHP-7.2:
  Properly check for array_replace_recursive in sccp.c
* PHP-7.3:
  Properly check for array_replace_recursive in sccp.c
* PHP-7.4:
  Properly check for array_replace_recursive in sccp.c
* PHP-7.3:
  [ci skip] Add missing notes regarding gc_status()
* PHP-7.4:
  [ci skip] Add missing notes regarding gc_status()
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files.  All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
* PHP-7.4:
  Remove local variables
Instead of having custom parameter handling.
* PHP-7.4:
  Reset common fields of EG(trampoline)
… as deprecated

These functions have serious limitations and may confuse users.
Same operations can be done using the new ldap control system in search
 operations.
Côme Chilliet and others added 17 commits February 4, 2019 12:21
* PHP-7.4:
  Mark ldap_control_paged_result and ldap_control_paged_result_response as deprecated
ldap_sort was deprecated in PHP7, it is now removed.
This allows removing the LDAP_DEPRECATED flag when building against
 openldap.
* PHP-7.4:
  Remove copyright years.
Noticed these while implementing error handler changes.
I'm removing the argument entirely here, but we might want to change
this to passing null or and empty array instead, if the impact of
dropping it entirely turns out to be too large.

This was deprecated as part of https://wiki.php.net/rfc/deprecations_php_7_2
as a doc-only deprecation.
Bug #77287 is already fixed in PHP 7.3.2.
* PHP-7.4:
  Fix NEWS
@rjhdby rjhdby merged commit f059d74 into rjhdby:master Feb 6, 2019
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.

9 participants