Merge pull request #26 from php/master

sync

Author: chopins

.circleci/config.yml

@@ -153,6 +153,7 @@ jobs:
               `#--enable-werror`
       - run:
           name: make
+          no_output_timeout: 30m
           command: make -j2 > /dev/null
       - run:
           name: make install

.cirrus.yml

@@ -32,3 +32,7 @@ max_line_length          = 80
 
 [*.patch]
 trim_trailing_whitespace = false
+
+[*.rst]
+indent_style             = space
+max_line_length          = 100

.editorconfig

@@ -21,7 +21,7 @@
 
 # Collapse generated files within git and pull request diff.
 **/*_arginfo.h linguist-generated -diff
-/main/gdb_inlined_script.c linguist-generated -diff
+/main/debug_gdb_scripts.c linguist-generated -diff
 /Zend/zend_vm_execute.h linguist-generated -diff
 /Zend/zend_vm_handlers.h linguist-generated -diff
 /Zend/zend_vm_opcodes.[ch] linguist-generated -diff

.gitattributes

@@ -5,10 +5,16 @@
 # the problem area and could aid in deciding whether a pull request is ready
 # for merging.
 #
+# When changing this file, please make sure to commit the changes to the
+# earliest supported PHP branch (PHP-X.Y) and not only to the master branch.
+# GitHub reads the CODEOWNERS file from the pull request's targeted branch.
+# Commit changes here similar to bug fixes:
+# https://github.com/php/php-src/blob/master/CONTRIBUTING.md#pull-requests
+#
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/.github @iluuu1994 @TimWolla
+/.github @TimWolla
 /build/gen_stub.php @kocsismate
 /ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
@@ -22,23 +28,26 @@
 /ext/intl @devnexen
 /ext/json @bukka
 /ext/libxml @nielsdos
-/ext/mbstring @alexdowad
-/ext/mysqlnd @SakiTakamachi
+/ext/mbstring @alexdowad @youkidearitai
+/ext/mysqli @bukka @kamil-tekiela
+/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
 /ext/odbc @NattyNarwhal
-/ext/opcache @dstogov @iluuu1994
+/ext/opcache @dstogov
 /ext/openssl @bukka
 /ext/pcntl @devnexen
 /ext/pdo @SakiTakamachi
 /ext/pdo_dblib @SakiTakamachi
 /ext/pdo_firebird @SakiTakamachi
-/ext/pdo_mysql @SakiTakamachi
+/ext/pdo_mysql @kamil-tekiela @SakiTakamachi
 /ext/pdo_odbc @NattyNarwhal @SakiTakamachi
 /ext/pdo_pgsql @devnexen @SakiTakamachi
 /ext/pdo_sqlite @SakiTakamachi
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
+/ext/reflection @DanielEScherzer
 /ext/session @Girgias
 /ext/simplexml @nielsdos
+/ext/soap @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
@@ -48,27 +57,24 @@
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
-/Zend/Optimizer @dstogov @iluuu1994
+/Zend/Optimizer @dstogov
 /Zend/zend.* @dstogov
 /Zend/zend_alloc.* @dstogov
-/Zend/zend_API.* @dstogov @iluuu1994
+/Zend/zend_API.* @dstogov
 /Zend/zend_call_stack.* @arnaud-lb
 /Zend/zend_closures.* @dstogov
-/Zend/zend_compile.* @iluuu1994
-/Zend/zend_enum.* @iluuu1994
-/Zend/zend_execute.* @dstogov @iluuu1994
-/Zend/zend_execute_API.c @dstogov @iluuu1994
-/Zend/zend_frameless_function.* @iluuu1994
+/Zend/zend_execute.* @dstogov
+/Zend/zend_execute_API.c @dstogov
 /Zend/zend_gc.* @dstogov @arnaud-lb
 /Zend/zend_hash.* @dstogov
-/Zend/zend_inheritance.* @dstogov @iluuu1994
+/Zend/zend_inheritance.* @dstogov
 /Zend/zend_max_execution_timer.* @arnaud-lb
-/Zend/zend_object_handlers.* @dstogov @iluuu1994
-/Zend/zend_objects.* @dstogov @iluuu1994
-/Zend/zend_objects_API.* @dstogov @iluuu1994
-/Zend/zend_opcode.* @dstogov @iluuu1994
+/Zend/zend_object_handlers.* @dstogov
+/Zend/zend_objects.* @dstogov
+/Zend/zend_objects_API.* @dstogov
+/Zend/zend_opcode.* @dstogov
 /Zend/zend_string.* @dstogov
-/Zend/zend_type*.h @dstogov @iluuu1994
+/Zend/zend_type*.h @dstogov
 /Zend/zend_variables.* @dstogov
-/Zend/zend_vm* @dstogov @iluuu1994
+/Zend/zend_vm* @dstogov
 *.stub.php @kocsismate

.github/CODEOWNERS

@@ -0,0 +1,56 @@
+name: apk
+runs:
+  using: composite
+  steps:
+    - shell: sh
+      run: |
+        set -x
+
+        apk update -q
+        apk add \
+            util-linux \
+            bash \
+            sudo \
+            build-base \
+            autoconf \
+            unzip \
+            tar \
+            bison \
+            re2c \
+            pkgconf \
+            mysql-client \
+            bzip2-dev \
+            curl-dev \
+            freetype-dev \
+            gettext-dev \
+            gnu-libiconv-dev \
+            gmp-dev \
+            icu-dev \
+            icu-data-full \
+            jpeg-dev \
+            libffi-dev \
+            libpng-dev \
+            libsodium-dev \
+            libwebp-dev \
+            libxml2-dev \
+            libxpm-dev \
+            libxslt-dev \
+            libzip-dev \
+            oniguruma-dev \
+            openssl-dev \
+            readline-dev \
+            sqlite-dev \
+            tidyhtml-dev \
+            gdbm-dev \
+            lmdb-dev \
+            argon2-dev \
+            enchant2-dev \
+            freetds-dev \
+            imap-dev \
+            net-snmp-dev \
+            openldap-dev \
+            unixodbc-dev \
+            postgresql14-dev \
+            tzdata \
+            musl-locales \
+            musl-locales-lang

.github/actions/apk/action.yml

@@ -33,13 +33,12 @@ runs:
           libsodium-dev:i386 \
           libsqlite3-dev:i386 \
           libssl-dev:i386 \
-          libtidy-dev:i386 \
           libwebp-dev:i386 \
           libxml2-dev:i386 \
           libxml2-dev:i386 \
           libxpm-dev:i386 \
           libxslt1-dev:i386 \
-          libzip-dev:i386 \
+          firebird-dev:i386 \
           locales \
           make \
           pkg-config:i386 \

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

@@ -1,4 +1,8 @@
 name: apt
+inputs:
+  asan:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
@@ -39,15 +43,16 @@ runs:
           libsqlite3-dev \
           libsqlite3-mod-spatialite \
           libwebp-dev \
+          ${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \
           libonig-dev \
           libcurl4-openssl-dev \
           libxml2-dev \
           libxslt1-dev \
           libpq-dev \
-          libreadline-dev \
+          libedit-dev \
           libldap2-dev \
           libsodium-dev \
-          libargon2-0-dev \
+          libargon2-dev \
           libmm-dev \
           libsnmp-dev \
           postgresql \

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

@@ -11,32 +11,19 @@ runs:
         code=" keg.link\(verbose: verbose\?"
         sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
 
+        # Some packages exist on x86 but not arm, or vice versa.
+        # Install them with reinstall to avoid warnings.
+        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl
         brew install \
-          pkg-config \
-          autoconf \
           bison \
           re2c
         brew install \
-          openssl@1.1 \
-          curl \
           bzip2 \
           enchant \
           libffi \
-          libpng \
-          webp \
-          freetype \
           intltool \
-          icu4c \
           libiconv \
-          zlib \
           t1lib \
-          gd \
-          libzip \
-          gmp \
-          tidy-html5 \
           libxml2 \
           libjpeg \
-          libsodium \
-          libxslt \
-          postgresql
-        brew link icu4c gettext --force
+          libxslt

.github/actions/brew/action.yml

@@ -0,0 +1,79 @@
+name: ./configure
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
+  skipSlow:
+    default: false
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        ./buildconf --force
+        ./configure \
+          --enable-option-checking=fatal \
+          --prefix=/usr \
+          --enable-phpdbg \
+          --enable-fpm \
+          --with-pdo-mysql=mysqlnd \
+          --with-mysqli=mysqlnd \
+          ${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \
+          --enable-intl \
+          --without-pear \
+          --enable-gd \
+          --with-jpeg \
+          --with-webp \
+          --with-freetype \
+          --with-xpm \
+          --enable-exif \
+          --with-zip \
+          --with-zlib \
+          --enable-soap \
+          --enable-xmlreader \
+          --with-xsl \
+          ${{ inputs.skipSlow == 'false' && '--with-tidy' || '' }} \
+          --enable-sysvsem \
+          --enable-sysvshm \
+          --enable-shmop \
+          --enable-pcntl \
+          --with-readline \
+          --enable-mbstring \
+          --with-iconv=/usr \
+          --with-curl \
+          --with-gettext \
+          --enable-sockets \
+          --with-bz2 \
+          --with-openssl \
+          --with-gmp \
+          --enable-bcmath \
+          --enable-calendar \
+          --enable-ftp \
+          ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
+          --enable-sysvmsg \
+          --with-ffi \
+          --enable-zend-test \
+          ${{ inputs.skipSlow == 'false' && '--enable-dl-test=shared' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap-sasl' || '' }} \
+          --with-password-argon2 \
+          --with-mhash \
+          --with-sodium \
+          --enable-dba \
+          --with-cdb \
+          --enable-flatfile \
+          --enable-inifile \
+          --with-lmdb \
+          --with-gdbm \
+          ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
+          --with-config-file-path=/etc \
+          --with-config-file-scan-dir=/etc/php.d \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
+          --enable-werror \
+          ${{ inputs.configurationParameters }}