Skip to content

Commit 6658315

Browse files
committed
Merge remote-tracking branch 'up/master' into gh10043
* up/master: (571 commits) Expose time spent collecting cycles in gc_status() (php#11523) Warn when fpm socket was not registered on the expected path Implement DOMElement::id Fix ? Implement DOMParentNode::replaceChildren() Implement DOMElement::className RFC: Deprecate remains of string evaluated code assertions (php#11671) Prevent decimal int precision loss in number_format() Implement DOMNode::getRootNode() Implement DOMElement::getAttributeNames() Refactor dom_node_node_name_read() to avoid double allocation Handle fragments consisting out of multiple children without a single root correctly Avoid allocations in DOMElement::getAttribute() Avoid string allocation in dom_get_dom1_attribute() for as long as possible Fix use-of-uninitialized-value when calling php_posix_stream_get_fd (php#11694) Reorder list construction in the function php_intpow10 (php#11683) proc_open: Use posix_spawn(3) interface on systems where it is profitable zend_gdb disable gdb detection for FreeBSD < 11. Fix iface const visibility variance check Fix missing iface class const inheritance type check ...
2 parents 962acdd + d073193 commit 6658315

File tree

1,281 files changed

+65090
-44801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,281 files changed

+65090
-44801
lines changed

.appveyor.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

.cirrus.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ asan_task:
184184
freebsd_task:
185185
name: FREEBSD_DEBUG_NTS
186186
freebsd_instance:
187-
image_family: freebsd-13-0
187+
image_family: freebsd-13-2
188188
env:
189189
ARCH: amd64
190190
install_script:
@@ -211,7 +211,7 @@ freebsd_task:
211211
arm_task:
212212
name: ARM_DEBUG_NTS
213213
arm_container:
214-
image: gcc:12
214+
image: debian:12
215215
additional_containers:
216216
- name: mysql
217217
image: mysql:8
@@ -233,6 +233,9 @@ arm_task:
233233
- apt-get update -y
234234
- >-
235235
apt-get install -y
236+
gcc
237+
g++
238+
autoconf
236239
bison
237240
re2c
238241
locales
@@ -249,6 +252,7 @@ arm_task:
249252
libsasl2-dev
250253
libxpm-dev
251254
libzip-dev
255+
libbz2-dev
252256
libsqlite3-dev
253257
libwebp-dev
254258
libonig-dev
@@ -385,6 +389,7 @@ arm_task:
385389
-d opcache.jit=function
386390
-P -q -x -j2
387391
-g FAIL,BORK,LEAK,XLEAK
392+
--no-progress
388393
--offline
389394
--show-diff
390395
--show-slow 1000
@@ -397,6 +402,7 @@ arm_task:
397402
-d opcache.jit=tracing
398403
-P -q -x -j2
399404
-g FAIL,BORK,LEAK,XLEAK
405+
--no-progress
400406
--offline
401407
--show-diff
402408
--show-slow 1000

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Collapse generated files within a pull request.
2323
**/*_arginfo.h linguist-generated
2424
/Zend/zend_vm_execute.h linguist-generated
25-
/Zend/zend_vm_opcodes.{h,c} linguist-generated
25+
/Zend/zend_vm_opcodes.[ch] linguist-generated
2626

2727
# The OSS fuzz files are bunary
2828
/ext/date/tests/ossfuzz*.txt binary

.github/actions/apt-x32/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ runs:
1313
apt-get install -y \
1414
autoconf \
1515
bison \
16+
curl \
1617
g++-multilib \
1718
gcc-multilib \
1819
language-pack-de \

.github/actions/brew/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ runs:
1212
re2c
1313
brew install \
1414
15+
curl \
1516
krb5 \
1617
bzip2 \
1718
enchant \

.github/actions/configure-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ runs:
1111
set -x
1212
export PATH="/usr/local/opt/bison/bin:$PATH"
1313
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig"
14+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
1415
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
1516
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
1617
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Notify Slack
2+
inputs:
3+
token:
4+
required: true
5+
runs:
6+
using: composite
7+
steps:
8+
- shell: bash
9+
run: >-
10+
curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<https://github.com/php/php-src/actions/runs/${{ github.run_id }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ inputs.token }}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Setup Caddy server
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
sudo curl 'https://caddyserver.com/api/download?os=linux&arch=amd64' -o /usr/bin/caddy
9+
sudo chmod +x /usr/bin/caddy
10+
sudo caddy start --config ext/curl/tests/Caddyfile

.github/labeler.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
- Zend/Optimizer/**/*
66

77
"Category: Build System":
8-
- build/*
8+
- '**/*.m4'
9+
- '**/*.w32'
10+
- build/**/*
11+
- buildconf
12+
- buildconf.bat
13+
- configure.ac
914
- scripts/**/*
15+
- win32/build/**/*
1016

1117
"Extension: bcmath":
1218
- ext/bcmath/**/*

.github/lsan-suppressions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
leak:acommon::DictInfoList::elements
22
leak:timer_create
3+
leak:netsnmp_init_mib_internals

0 commit comments

Comments
 (0)