Skip to content

Commit 2ac46dc

Browse files
committed
Merge branch 'master' into bug-77726
2 parents 60c68c3 + 51f750e commit 2ac46dc

File tree

10,938 files changed

+560909
-206255
lines changed

Some content is hidden

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

10,938 files changed

+560909
-206255
lines changed

.cirrus.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
env:
2+
CIRRUS_CLONE_DEPTH: 1
3+
ARCH: amd64
4+
5+
freebsd_instance:
6+
image_family: freebsd-13-0
7+
8+
task:
9+
name: FREEBSD_DEBUG_NTS
10+
install_script:
11+
#- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
12+
#- pkg upgrade -y
13+
- kldload accf_http
14+
- pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
15+
script:
16+
- ./buildconf -f
17+
- ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
18+
- gmake -j2
19+
- mkdir /etc/php.d
20+
- gmake install
21+
- echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
22+
- echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
23+
# Specify opcache.preload_user as we're running as root.
24+
- echo opcache.preload_user=root >> /etc/php.d/opcache.ini
25+
tests_script:
26+
- export SKIP_IO_CAPTURE_TESTS=1
27+
- export CI_NO_IPV6=1
28+
- sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Bug report
2+
description: Create a bug report
3+
labels: ["Bug", "Status: Needs Triage"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Description
8+
description: "Please provide a minimal way to reproduce the problem and describe what the expected vs actual behavior is. Provide a [3v4l.org](https://3v4l.org/) link if possible."
9+
value: |
10+
The following code:
11+
12+
```php
13+
<?php
14+
```
15+
16+
Resulted in this output:
17+
```
18+
```
19+
20+
But I expected this output instead:
21+
```
22+
```
23+
validations:
24+
required: true
25+
- type: input
26+
attributes:
27+
label: PHP Version
28+
description: "The used PHP version. Make sure it is [supported](https://www.php.net/supported-versions.php)."
29+
placeholder: "PHP 8.0.12"
30+
validations:
31+
required: true
32+
- type: input
33+
attributes:
34+
label: Operating System
35+
description: "The used operating system, if relevant."
36+
placeholder: "Ubuntu 20.04"

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Documentation issue
4+
url: https://github.com/php/doc-en/issues
5+
about: Please report documentation issues on the doc-en repository.
6+
- name: Security issue
7+
url: https://bugs.php.net/report.php?security_bug
8+
about: Please report security issues in this private bug tracker.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Feature request
2+
description: Create a feature request
3+
labels: ["Feature", "Status: Needs Triage"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Description
8+
description: "Please describe the requested feature and why it should be included in PHP."
9+
validations:
10+
required: true

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: apt
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
sudo apt-get update
9+
sudo apt-get install \
10+
bison \
11+
re2c \
12+
locales \
13+
ldap-utils \
14+
openssl \
15+
slapd \
16+
language-pack-de \
17+
libgmp-dev \
18+
libicu-dev \
19+
libtidy-dev \
20+
libenchant-dev \
21+
libaspell-dev \
22+
libpspell-dev \
23+
libsasl2-dev \
24+
libxpm-dev \
25+
libzip-dev \
26+
libsqlite3-dev \
27+
libwebp-dev \
28+
libonig-dev \
29+
libkrb5-dev \
30+
libgssapi-krb5-2 \
31+
libcurl4-openssl-dev \
32+
libxml2-dev \
33+
libxslt1-dev \
34+
libpq-dev \
35+
libreadline-dev \
36+
libldap2-dev \
37+
libsodium-dev \
38+
libargon2-0-dev \
39+
libmm-dev \
40+
libsnmp-dev \
41+
postgresql \
42+
postgresql-contrib \
43+
snmpd \
44+
snmp-mibs-downloader \
45+
freetds-dev \
46+
unixodbc-dev \
47+
llvm \
48+
libc-client-dev \
49+
dovecot-core \
50+
dovecot-pop3d \
51+
dovecot-imapd \
52+
sendmail \
53+
firebird-dev \
54+
liblmdb-dev \
55+
libtokyocabinet-dev \
56+
libdb-dev \
57+
libqdbm-dev \
58+
libjpeg-dev \
59+
libpng-dev \
60+
libfreetype6-dev
61+
mkdir /opt/oracle
62+
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
63+
unzip instantclient-basiclite-linuxx64.zip
64+
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
65+
unzip instantclient-sdk-linuxx64.zip
66+
mv instantclient_*_* /opt/oracle/instantclient
67+
# Interferes with libldap2 headers.
68+
rm /opt/oracle/instantclient/sdk/include/ldap.h

.github/actions/brew/action.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: brew
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
brew install \
9+
pkg-config \
10+
autoconf \
11+
bison \
12+
re2c
13+
brew install \
14+
openssl@1.1 \
15+
krb5 \
16+
bzip2 \
17+
enchant \
18+
libffi \
19+
libpng \
20+
webp \
21+
freetype \
22+
intltool \
23+
icu4c \
24+
libiconv \
25+
zlib \
26+
t1lib \
27+
gd \
28+
libzip \
29+
gmp \
30+
tidyp \
31+
libxml2 \
32+
libxslt \
33+
postgresql
34+
brew link icu4c gettext --force
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: ./configure
2+
inputs:
3+
configurationParameters:
4+
default: ''
5+
required: false
6+
runs:
7+
using: composite
8+
steps:
9+
- shell: bash
10+
run: |
11+
set -x
12+
export PATH="/usr/local/opt/bison/bin:$PATH"
13+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig"
14+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
15+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
16+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
17+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
18+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
19+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
20+
./buildconf --force
21+
./configure \
22+
--enable-option-checking=fatal \
23+
--prefix=/usr/local \
24+
--enable-fpm \
25+
--with-pdo-mysql=mysqlnd \
26+
--with-mysqli=mysqlnd \
27+
--with-pgsql=/usr/local/opt/libpq \
28+
--with-pdo-pgsql=/usr/local/opt/libpq \
29+
--with-pdo-sqlite \
30+
--without-pear \
31+
--enable-gd \
32+
--with-jpeg \
33+
--with-webp \
34+
--with-freetype \
35+
--enable-exif \
36+
--with-zip \
37+
--with-zlib \
38+
--enable-soap \
39+
--enable-xmlreader \
40+
--with-xsl \
41+
--with-tidy=/usr/local/opt/tidyp \
42+
--with-libxml \
43+
--enable-sysvsem \
44+
--enable-sysvshm \
45+
--enable-shmop \
46+
--enable-pcntl \
47+
--with-readline=/usr/local/opt/readline \
48+
--enable-mbstring \
49+
--with-curl \
50+
--with-gettext=/usr/local/opt/gettext \
51+
--enable-sockets \
52+
--with-bz2=/usr/local/opt/bzip2 \
53+
--with-openssl \
54+
--with-gmp=/usr/local/opt/gmp \
55+
--with-iconv=/usr/local/opt/libiconv \
56+
--enable-bcmath \
57+
--enable-calendar \
58+
--enable-ftp \
59+
--with-pspell=/usr/local/opt/aspell \
60+
--with-kerberos \
61+
--enable-sysvmsg \
62+
--with-ffi \
63+
--enable-zend-test \
64+
--enable-intl \
65+
--with-mhash \
66+
--with-sodium \
67+
--enable-dba \
68+
--enable-werror \
69+
--with-config-file-path=/etc \
70+
--with-config-file-scan-dir=/etc/php.d \
71+
${{ inputs.configurationParameters }}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: ./configure
2+
inputs:
3+
configurationParameters:
4+
default: ''
5+
required: false
6+
runs:
7+
using: composite
8+
steps:
9+
- shell: bash
10+
run: |
11+
set -x
12+
./buildconf --force
13+
./configure \
14+
--enable-option-checking=fatal \
15+
--prefix=/usr \
16+
--enable-phpdbg \
17+
--enable-fpm \
18+
--with-pdo-mysql=mysqlnd \
19+
--with-mysqli=mysqlnd \
20+
--with-pgsql \
21+
--with-pdo-pgsql \
22+
--with-pdo-sqlite \
23+
--enable-intl \
24+
--without-pear \
25+
--enable-gd \
26+
--with-jpeg \
27+
--with-webp \
28+
--with-freetype \
29+
--with-xpm \
30+
--enable-exif \
31+
--with-zip \
32+
--with-zlib \
33+
--with-zlib-dir=/usr \
34+
--enable-soap \
35+
--enable-xmlreader \
36+
--with-xsl \
37+
--with-tidy \
38+
--enable-sysvsem \
39+
--enable-sysvshm \
40+
--enable-shmop \
41+
--enable-pcntl \
42+
--with-readline \
43+
--enable-mbstring \
44+
--with-curl \
45+
--with-gettext \
46+
--enable-sockets \
47+
--with-bz2 \
48+
--with-openssl \
49+
--with-gmp \
50+
--enable-bcmath \
51+
--enable-calendar \
52+
--enable-ftp \
53+
--with-pspell=/usr \
54+
--with-enchant=/usr \
55+
--with-kerberos \
56+
--enable-sysvmsg \
57+
--with-ffi \
58+
--enable-zend-test \
59+
--with-ldap \
60+
--with-ldap-sasl \
61+
--with-password-argon2 \
62+
--with-mhash \
63+
--with-sodium \
64+
--enable-dba \
65+
--with-cdb \
66+
--enable-flatfile \
67+
--enable-inifile \
68+
--with-tcadb \
69+
--with-lmdb \
70+
--with-qdbm \
71+
--with-snmp \
72+
--with-unixODBC \
73+
--with-imap \
74+
--with-kerberos \
75+
--with-imap-ssl \
76+
--with-pdo-odbc=unixODBC,/usr \
77+
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
78+
--with-oci8=shared,instantclient,/opt/oracle/instantclient \
79+
--with-config-file-path=/etc \
80+
--with-config-file-scan-dir=/etc/php.d \
81+
--with-pdo-firebird \
82+
--with-pdo-dblib \
83+
--enable-werror \
84+
${{ inputs.configurationParameters }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Install
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
sudo make install
9+
sudo mkdir /etc/php.d
10+
sudo chmod 777 /etc/php.d
11+
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
12+
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
13+
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
14+
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini

.github/actions/mssql/action.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Create mssql container
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
docker run \
9+
-e "ACCEPT_EULA=Y" \
10+
-e "SA_PASSWORD=<YourStrong@Passw0rd>" \
11+
-p 1433:1433 \
12+
--name sql1 \
13+
-h sql1 \
14+
-d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04

0 commit comments

Comments
 (0)