Skip to content

Commit bda9813

Browse files
authored
Merge pull request #17 from php/master
merge
2 parents b510ebd + 9b19d90 commit bda9813

File tree

421 files changed

+6906
-2323
lines changed

Some content is hidden

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

421 files changed

+6906
-2323
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ task:
1414
- 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
1515
script:
1616
- ./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
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-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
1818
- gmake -j2
1919
- mkdir /etc/php.d
2020
- gmake install

.gitattributes

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
/UPGRADING merge=NEWS
1414
/UPGRADING.INTERNALS merge=NEWS
1515

16-
# Enable commit diffs for binary PHP test files. Some PHP test files include
17-
# special characters, such as ASCII control characters. Git recognizes these as
18-
# binary and wouldn't generate diffs.
19-
*.phpt diff
16+
# Configure proper diff drivers to improve the context lines in the output
17+
# of git diff and to improve token splitting for --word-diff.
18+
*.phpt diff=php
19+
*.php diff=php
20+
*.[ch] diff=cpp

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ runs:
5959
libpng-dev \
6060
libfreetype6-dev
6161
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
62+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
63+
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
64+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
65+
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
6666
mv instantclient_*_* /opt/oracle/instantclient
6767
# Interferes with libldap2 headers.
6868
rm /opt/oracle/instantclient/sdk/include/ldap.h

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ runs:
6161
--enable-sysvmsg \
6262
--with-ffi \
6363
--enable-zend-test \
64+
--enable-dl-test=shared \
6465
--enable-intl \
6566
--with-mhash \
6667
--with-sodium \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ runs:
5656
--enable-sysvmsg \
5757
--with-ffi \
5858
--enable-zend-test \
59+
--enable-dl-test=shared \
5960
--with-ldap \
6061
--with-ldap-sasl \
6162
--with-password-argon2 \

.github/actions/install-linux/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ runs:
1010
sudo chmod 777 /etc/php.d
1111
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
1212
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
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Verify generated files are up to date
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
[[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
9+
scripts/dev/genfiles
10+
Zend/zend_vm_gen.php
11+
build/gen_stub.php -f
12+
git add . -Nu && git diff --exit-code

.github/workflows/nightly.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
GENERATE_MATRIX:
88
name: Generate Matrix
9+
if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
910
runs-on: ubuntu-latest
1011
outputs:
1112
branches: ${{ steps.set-matrix.outputs.branches }}
@@ -74,21 +75,26 @@ jobs:
7475
runTestsParameters: >-
7576
${{ matrix.run_tests_parameters }}
7677
-d zend_extension=opcache.so
78+
-d opcache.enable_cli=1
7779
-d opcache.jit_buffer_size=16M
7880
- name: Test OpCache
7981
uses: ./.github/actions/test-linux
8082
with:
8183
runTestsParameters: >-
8284
${{ matrix.run_tests_parameters }}
8385
-d zend_extension=opcache.so
86+
-d opcache.enable_cli=1
8487
- name: Test Function JIT
8588
uses: ./.github/actions/test-linux
8689
with:
8790
runTestsParameters: >-
8891
${{ matrix.run_tests_parameters }}
8992
-d zend_extension=opcache.so
93+
-d opcache.enable_cli=1
9094
-d opcache.jit_buffer_size=16M
9195
-d opcache.jit=1205
96+
- name: Verify generated files are up to date
97+
uses: ./.github/actions/verify-generated-files
9298
MACOS:
9399
needs: GENERATE_MATRIX
94100
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
@@ -126,19 +132,24 @@ jobs:
126132
with:
127133
runTestsParameters: >-
128134
-d zend_extension=opcache.so
135+
-d opcache.enable_cli=1
129136
-d opcache.protect_memory=1
130137
-d opcache.jit_buffer_size=16M
131138
- name: Test OpCache
132139
uses: ./.github/actions/test-macos
133140
with:
134141
runTestsParameters: >-
135142
-d zend_extension=opcache.so
143+
-d opcache.enable_cli=1
136144
-d opcache.protect_memory=1
137145
- name: Test Function JIT
138146
uses: ./.github/actions/test-macos
139147
with:
140148
runTestsParameters: >-
141149
-d zend_extension=opcache.so
150+
-d opcache.enable_cli=1
142151
-d opcache.protect_memory=1
143152
-d opcache.jit_buffer_size=16M
144153
-d opcache.jit=1205
154+
- name: Verify generated files are up to date
155+
uses: ./.github/actions/verify-generated-files

.github/workflows/push.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ jobs:
5353
- name: Test Tracing JIT
5454
uses: ./.github/actions/test-linux
5555
with:
56-
runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
56+
runTestsParameters: >-
57+
-d zend_extension=opcache.so
58+
-d opcache.enable_cli=1
59+
-d opcache.jit_buffer_size=16M
60+
- name: Verify generated files are up to date
61+
uses: ./.github/actions/verify-generated-files
5762
MACOS_DEBUG_NTS:
5863
runs-on: macos-10.15
5964
steps:
@@ -78,5 +83,8 @@ jobs:
7883
with:
7984
runTestsParameters: >-
8085
-d zend_extension=opcache.so
86+
-d opcache.enable_cli=1
8187
-d opcache.protect_memory=1
8288
-d opcache.jit_buffer_size=16M
89+
- name: Verify generated files are up to date
90+
uses: ./.github/actions/verify-generated-files

CONTRIBUTING.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ supported branch of PHP that the bug affects (only green branches on
3636
[the supported version page](https://www.php.net/supported-versions.php) are
3737
supported). For example, at the time of writing, the lowest supported version is
3838
PHP 8.0, which corresponds to the `PHP-8.0` branch in Git. Please also make sure
39-
you add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/).
39+
you add a link to the PR in the bug on [the bug tracker](https://github.com/php/php-src/issues)
40+
or [the old bug tracker](https://bugs.php.net/).
4041

4142
Pull requests implementing RFCs should be submitted against `master`.
4243

@@ -49,7 +50,8 @@ them by using `git rebase` instead of `git merge`.
4950
Fork the official PHP repository and send a pull request. A notification will be
5051
sent to the pull request mailing list. Sending a note to PHP Internals list
5152
([email protected]) may help getting more feedback and quicker turnaround.
52-
You can also add pull requests to [bug reports](https://bugs.php.net/).
53+
You can also add pull requests to [bug reports](https://github.com/php/php-src/issues)
54+
and [old bug reports](https://bugs.php.net/).
5355

5456
Read [Git access page](https://www.php.net/git.php) for help on using Git to get
5557
and build PHP source code. We recommend to look at our

0 commit comments

Comments
 (0)