Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
45a50d0
phar: Remove pointless efree() (#20232)
nielsdos Oct 20, 2025
40b3f88
phar: Avoid string duplication just for error message, use truncation…
nielsdos Oct 20, 2025
0805953
phar: Restructure code to get rid of a goto
nielsdos Oct 19, 2025
0098f3e
phar: De-indent code
nielsdos Oct 19, 2025
6291f97
phar: Move code to avoid goto
nielsdos Oct 19, 2025
a69b353
phar: Re-indent code
nielsdos Oct 19, 2025
9c90e16
phar: Avoid an error goto in phar_zip_flush() (#20233)
nielsdos Oct 20, 2025
df8ce6d
Zend: remove zval_dtor() compatibility macro
nielsdos Oct 19, 2025
8e84e9a
pgsql: Use cheaper string conversion functions
nielsdos Oct 18, 2025
e2396a6
pgsql: Simplify pgsql_copy_from_query() by using character buffers
nielsdos Oct 18, 2025
da96382
pgsql: Avoid unnecessary work in pgsql_copy_from_query() if the input…
nielsdos Oct 18, 2025
5eec4d8
pgsql: Avoid duplicating strings and factor out parameter building code
nielsdos Oct 18, 2025
020bbea
phar: Fix memory leak when openssl polyfill returns garbage
nielsdos Oct 17, 2025
4c043d8
Merge branch 'PHP-8.3' into PHP-8.4
nielsdos Oct 20, 2025
90eabf5
Merge branch 'PHP-8.4' into PHP-8.5
nielsdos Oct 20, 2025
41d6d36
Merge branch 'PHP-8.5'
nielsdos Oct 20, 2025
fba06d8
Fix merge issue
nielsdos Oct 20, 2025
4094bf7
Merge branch 'PHP-8.5'
nielsdos Oct 20, 2025
90bc40e
Create separate workflow for nightly slack notification
iluuu1994 Oct 20, 2025
0bd904b
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Oct 20, 2025
0a2717e
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 20, 2025
e76c2e2
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 20, 2025
8bce65d
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Oct 20, 2025
3943bb0
Merge branch 'PHP-8.5'
iluuu1994 Oct 20, 2025
0e17dcf
Fix Windows test for openssl-3.5 upgrade (#19384)
shivammathur Aug 6, 2025
5d8a392
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 20, 2025
43621e1
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 20, 2025
80ebe86
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Oct 20, 2025
0ff366a
Merge branch 'PHP-8.5'
iluuu1994 Oct 20, 2025
1bfe934
[skip ci] Skip openssl tests currently failing on 8.2
iluuu1994 Oct 20, 2025
d37e454
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 20, 2025
f86e8ce
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 20, 2025
0ea8aca
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Oct 20, 2025
d0dcec0
Merge branch 'PHP-8.5'
iluuu1994 Oct 20, 2025
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
10 changes: 0 additions & 10 deletions .github/actions/notify-slack/action.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/nightly-results.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Nightly results
on:
workflow_run:
workflows:
- Nightly
types:
- completed
jobs:
on-failure:
runs-on: ubuntu-latest
if: ${{ github.repository == 'php/php-src' && github.event.workflow_run.conclusion == 'failure' }}
steps:
- run: |
export DEBIAN_FRONTEND=noninteractive
sudo apt-get install -y curl
curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<${{ github.event.workflow_run.jobs_url }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ secrets.ACTION_MONITORING_SLACK }}
51 changes: 0 additions & 51 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ jobs:
-d opcache.enable_cli=1
- name: Extra tests
uses: ./.github/actions/extra-tests
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}

LINUX_X64:
services:
mysql:
Expand Down Expand Up @@ -272,11 +266,6 @@ jobs:
uses: ./.github/actions/extra-tests
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
LINUX_X32:
strategy:
fail-fast: false
Expand Down Expand Up @@ -358,11 +347,6 @@ jobs:
-d opcache.enable_cli=1
- name: Extra tests
uses: ./.github/actions/extra-tests
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
MACOS:
strategy:
fail-fast: false
Expand Down Expand Up @@ -418,11 +402,6 @@ jobs:
uses: ./.github/actions/extra-tests
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
COVERAGE_DEBUG_NTS:
if: inputs.branch == 'master'
services:
Expand Down Expand Up @@ -483,11 +462,6 @@ jobs:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
COMMUNITY:
strategy:
fail-fast: false
Expand Down Expand Up @@ -674,11 +648,6 @@ jobs:
if [ $EXIT_CODE -gt 128 ]; then
exit 1
fi
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
OPCACHE_VARIATION:
services:
mysql:
Expand Down Expand Up @@ -760,11 +729,6 @@ jobs:
-d opcache.file_cache_only=1
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
MSAN:
name: MSAN
runs-on: ubuntu-${{ inputs.ubuntu_version }}
Expand Down Expand Up @@ -851,11 +815,6 @@ jobs:
-d opcache.enable_cli=1
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
LIBMYSQLCLIENT:
name: LIBMYSQLCLIENT
runs-on: ubuntu-${{ inputs.ubuntu_version }}
Expand Down Expand Up @@ -898,11 +857,6 @@ jobs:
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
PECL:
if: inputs.branch == 'master'
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -1010,11 +964,6 @@ jobs:
/opt/php/bin/phpize
./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
make -j$(/usr/bin/nproc)
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
WINDOWS:
strategy:
fail-fast: false
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ jobs:
- name: Generate Matrix
id: set-matrix
run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.head_ref || github.ref_name }}"
- name: Notify Slack
if: failure()
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
NIGHTLY:
needs: GENERATE_MATRIX
name: ${{ matrix.branch.ref }}
Expand Down
2 changes: 2 additions & 0 deletions UPGRADING.INTERNALS
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES
. ZEND_LTOA() (and ZEND_LTOA_BUF_LEN) has been removed, as it was
unsafe. Directly use ZEND_LONG_FMT with a function from the
printf family.
. The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed.
Call zval_ptr_dtor_nogc() directly instead.

========================
2. Build system changes
Expand Down
3 changes: 0 additions & 3 deletions Zend/zend_variables.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ ZEND_API void zval_ptr_dtor(zval *zval_ptr);
ZEND_API void zval_ptr_safe_dtor(zval *zval_ptr);
ZEND_API void zval_internal_ptr_dtor(zval *zvalue);

/* Kept for compatibility */
#define zval_dtor(zvalue) zval_ptr_dtor_nogc(zvalue)

ZEND_API void zval_add_ref(zval *p);

END_EXTERN_C()
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo/pdo_stmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ PHP_METHOD(PDOStatement, fetch)
array_init_size(return_value, 1);
bool success = pdo_do_key_pair_fetch(stmt, ori, off, Z_ARRVAL_P(return_value));
if (!success) {
zval_dtor(return_value);
zval_ptr_dtor_nogc(return_value);
PDO_HANDLE_STMT_ERR();
RETURN_FALSE;
}
Expand Down
Loading