Skip to content

[pull] master from php:master - #1255

Merged
pull[bot] merged 13 commits into
turkdevops:masterfrom
php:master
Sep 8, 2026
Merged

[pull] master from php:master#1255
pull[bot] merged 13 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Sep 8, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

SakiTakamachi and others added 13 commits September 8, 2026 23:55
* PHP-8.4:
  PHP-8.4 is now for PHP 8.4.27-dev
* PHP-8.5:
  PHP-8.4 is now for PHP 8.4.27-dev
* PHP-8.5:
  PHP-8.5 is now for PHP 8.5.12-dev
SQLError is the ODBC 2.0 diagnostic call, deprecated since ODBC 3.0, which
ext/odbc already requires unconditionally via SQLAllocHandle,
SQLColAttribute and SQLFetchScroll. Both callers now go through one helper
that selects the statement, connection or environment handle the way
SQLError did, so the reported SQLSTATE and message are unchanged.
odbc_cursor() read its state and message buffers uninitialized when the
diagnostic fetch failed; it now falls back to the same HY000 placeholder
odbc_sql_error() uses.

Closes GH-23614
Fix an integer-overflow risk when calculating the allocation size for IR
sparse sets.

Calculate the size separately and assert that multiplying by the element
count did not overflow before allocating, while preserving the existing
sparse/dense memory layout. This imports the final upstream IR fix.

Closes #23482
* PHP-8.4:
  Fix sparse set allocation size overflow (#23482)
* PHP-8.5:
  Fix sparse set allocation size overflow (#23482)
The only purpose of these files is to (hopefully) reduce false-positive security
reports. LLMs still do not respect our policy, and this eats a lot of our
resources.

Annoyingly, Claude does not follow the AGENTS.md convention and requires a
separate file to point to AGENTS.md.
After php/web-php@b24d310, the paths to
some files changes. After php/web-php#1998 is merged to fix the tools
that generate these files, this should be merged as well.
@pull pull Bot locked and limited conversation to collaborators Sep 8, 2026
@pull pull Bot added the ⤵️ pull label Sep 8, 2026
@pull
pull Bot merged commit 1bb25ce into turkdevops:master Sep 8, 2026
1 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants