Merge pull request #2 from php/master

sync

Author: developersharif

.cirrus.yml

@@ -25,4 +25,4 @@ task:
   tests_script:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
-    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
+    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

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

@@ -5,6 +5,7 @@ runs:
     - shell: bash
       run: |
         set -x
+
         sudo apt-get update
         sudo apt-get install \
           bison \
@@ -58,11 +59,15 @@ runs:
           libjpeg-dev \
           libpng-dev \
           libfreetype6-dev
+
         mkdir /opt/oracle
         wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
         unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
         wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
         unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
         mv instantclient_*_* /opt/oracle/instantclient
-        # Interferes with libldap2 headers.
+        # interferes with libldap2 headers
         rm /opt/oracle/instantclient/sdk/include/ldap.h
+        # fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
+        echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
+        sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'

.github/actions/brew/action.yml

@@ -27,8 +27,9 @@ runs:
           gd \
           libzip \
           gmp \
-          tidyp \
+          tidy-html5 \
           libxml2 \
+          libjpeg \
           libxslt \
           postgresql
         brew link icu4c gettext --force

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

@@ -38,7 +38,7 @@ runs:
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
-          --with-tidy=/usr/local/opt/tidyp \
+          --with-tidy=/usr/local/opt/tidy-html5 \
           --with-libxml \
           --enable-sysvsem \
           --enable-sysvshm \

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

@@ -10,3 +10,5 @@ runs:
         sudo chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
+        echo extension=oci8.so    > /etc/php.d/oci8.ini
+        echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini

.github/actions/mssql/action.yml renamed to .github/actions/setup-mssql/action.yml

@@ -1,4 +1,4 @@
-name: Create mssql container
+name: Create MSSQL container
 runs:
   using: composite
   steps:

.github/actions/setup-oracle/action.yml

@@ -0,0 +1,13 @@
+name: Create Oracle container
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        docker run \
+          -e "ORACLE_PASSWORD=pass" \
+          -p 1521:1521 \
+          --name oracle \
+          -h oracle \
+          -d gvenzl/oracle-xe:slim

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

@@ -17,7 +17,7 @@ runs:
         docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
         sudo locale-gen de_DE
 
-        ./.github/scripts/setup-slapd.sh
+        ./.github/scripts/setup-slapd.sh &>/dev/null
 
         sudo cp ext/snmp/tests/snmpd.conf /etc/snmp
         sudo cp ext/snmp/tests/bigtest /etc/snmp

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

@@ -20,11 +20,18 @@ runs:
         export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
         export PDO_DBLIB_TEST_USER="pdo_test"
         export PDO_DBLIB_TEST_PASS="password"
+        export PHP_OCI8_TEST_USER="system"
+        export PHP_OCI8_TEST_PASS="pass"
+        export PHP_OCI8_TEST_DB="localhost/XEPDB1"
+        export PDO_OCI_TEST_USER="system"
+        export PDO_OCI_TEST_PASS="pass"
+        export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export SKIP_IO_CAPTURE_TESTS=1
         export TEST_PHP_JUNIT=junit.out.xml
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(/usr/bin/nproc) \
           -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress \
           --offline \
           --show-diff \
           --show-slow 1000 \

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

@@ -18,6 +18,7 @@ runs:
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(sysctl -n hw.ncpu) \
           -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress \
           --offline \
           --show-diff \
           --show-slow 1000 \

.github/nightly_matrix.php

@@ -1,6 +1,6 @@
 <?php
 
-const BRANCHES = ['master', 'PHP-8.1', 'PHP-8.0'];
+const BRANCHES = ['master', 'PHP-8.2', 'PHP-8.1', 'PHP-8.0'];
 
 function get_branch_commit_cache_file_path(): string {
     return dirname(__DIR__) . '/branch-commit-cache.json';

.github/workflows/close-needs-feedback.yml

@@ -4,10 +4,16 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   build:
     if: github.repository_owner == 'php'
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
       - name: Close old issues that need feedback
         uses: dwieeb/needs-reply@v2

.github/workflows/close-stale-feature-requests.yml

@@ -4,20 +4,26 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     if: github.repository_owner == 'php'
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
       - uses: actions/stale@v4
         with:
-          days-before-close: 7
+          days-before-close: 14
           days-before-stale: 90
           exempt-all-assignees: true
           only-issue-labels: "Status: Requires RFC,Feature"
           # Hack to skip PRs, unfortunately there's no option to disable PRs
           only-pr-labels: inexistent-label
           stale-issue-message: >-
-            There has not been any recent activity in this feature request. It will automatically be closed in 7 days
+            There has not been any recent activity in this feature request. It will automatically be closed in 14 days
             if no further action is taken. Please see https://github.com/probot/stale#is-closing-stale-issues-really-a-good-idea
             to understand why we auto-close stale feature requests.

.github/workflows/close-stale-prs.yml

@@ -4,10 +4,16 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     if: github.repository_owner == 'php'
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
       - uses: actions/stale@v4
         with:

.github/workflows/nightly.yml

@@ -3,6 +3,8 @@ on:
   schedule:
    - cron: "0 1 * * *"
   workflow_dispatch: ~
+permissions:
+  contents: read
 jobs:
   GENERATE_MATRIX:
     name: Generate Matrix
@@ -47,8 +49,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branch.ref }}
-      - name: Create mssql container
-        uses: ./.github/actions/mssql
+      - name: Create MSSQL container
+        uses: ./.github/actions/setup-mssql
+      - name: Create Oracle container
+        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -109,7 +113,7 @@ jobs:
         debug: [true, false]
         zts: [true, false]
     name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: git checkout
         uses: actions/checkout@v2
@@ -167,8 +171,10 @@ jobs:
     steps:
       - name: git checkout
         uses: actions/checkout@v2
-      - name: Create mssql container
-        uses: ./.github/actions/mssql
+      - name: Create MSSQL container
+        uses: ./.github/actions/setup-mssql
+      - name: Create Oracle container
+        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: Install gcovr

.github/workflows/push.yml

@@ -13,10 +13,13 @@ on:
       - PHP-7.4
       - PHP-8.0
       - PHP-8.1
+      - PHP-8.2
       - master
   pull_request:
     branches:
       - '**'
+permissions:
+  contents: read
 jobs:
   LINUX_X64:
     strategy:
@@ -32,8 +35,10 @@ jobs:
     steps:
       - name: git checkout
         uses: actions/checkout@v2
-      - name: Create mssql container
-        uses: ./.github/actions/mssql
+      - name: Create MSSQL container
+        uses: ./.github/actions/setup-mssql
+      - name: Create Oracle container
+        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -63,7 +68,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: git checkout
         uses: actions/checkout@v2

.github/workflows/remove-needs-feedback.yml

@@ -5,10 +5,16 @@ on:
     types:
       - created
 
+permissions:
+  contents: read
+
 jobs:
   build:
     if: "github.repository_owner == 'php' && contains(github.event.issue.labels.*.name, 'Status: Needs Feedback') && github.event.issue.user.login == github.event.sender.login"
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
       - uses: actions-ecosystem/action-remove-labels@v1
         with:

.gitignore

@@ -202,6 +202,9 @@ php
 # Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
 /x64/
 
+# Generated by arm64 compiler, includes Debug, Debug_TS, Release, Release_TS
+/arm64/
+
 # Miscellaneous files generated by Windows build system
 /main/config.w32.h
 /win32/build/deplister.exe

CONTRIBUTING.md

@@ -331,7 +331,8 @@ Currently we have the following branches in use:
 
 | Branch    |           |
 | --------- | --------- |
-| master    | Active development branch for PHP 8.2, which is open for backwards incompatible changes and major internal API changes. |
+| master    | Active development branch for PHP 8.3, which is open for backwards incompatible changes and major internal API changes. |
+| PHP-8.2   | Is used to release the PHP 8.2.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.1   | Is used to release the PHP 8.1.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.0   | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.4   | Is used to release the PHP 7.4.x series. This is an old stable version and is open for security fixes only. |