src updated

.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,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --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 --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

.editorconfig

@@ -9,7 +9,7 @@ end_of_line              = lf
 charset                  = utf-8
 tab_width                = 4
 
-[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
+[{*.{awk,bat,c,cpp,d,dasc,h,l,re,skl,w32,y},Makefile*}]
 indent_size              = 4
 indent_style             = tab
 

.gdbinit

@@ -318,7 +318,8 @@ define ____print_ht
 		set $n = $n - 1
 	end
 
-	if $ht->u.v.flags & 4
+	set $packed = $ht->u.v.flags & 4
+	if $packed
 		printf "Packed"
 	else
 		printf "Hash"
@@ -329,36 +330,45 @@ define ____print_ht
 	set $i = 0
 	set $ind = $ind + 1
 	while $i < $num
-		set $p = (Bucket*)($ht->arData + $i)
+		if $packed
+			set $val = (zval*)($ht->arPacked + $i)
+			set $key = (zend_string*)0
+			set $h = $i
+		else
+			set $bucket = (Bucket*)($ht->arData + $i)
+			set $val = &$bucket->val
+			set $key = $bucket->key
+			set $h = $bucket->h
+		end
 		set $n = $ind
-		if $p->val.u1.v.type > 0
+		if $val->u1.v.type > 0
 			while $n > 0
 				printf "  "
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $p->key
-				____print_str $p->key->val $p->key->len
+			if $key
+				____print_str $key->val $key->len
 				printf " => "
 			else
-				printf "%d => ", $p->h
+				printf "%d => ", $h
 			end
 			if $arg1 == 0
-				printf "%p\n", (zval *)&$p->val
+				printf "%p\n", $val
 			end
 			if $arg1 == 1
-				set $zval = (zval *)&$p->val
+				set $zval = $val
 				____printzv $zval 1
 			end
 			if $arg1 == 2
-				printf "%s\n", (char*)$p->val.value.ptr
+				printf "%s\n", (char*)$val->value.ptr
 			end
 			if $arg1 == 3
-				set $func = (zend_function*)$p->val.value.ptr
+				set $func = (zend_function*)$val->value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
 			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
+				set $const = (zend_constant *)$val->value.ptr
 				____printzv $const 1
 			end
 		end

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

@@ -1,5 +1,8 @@
 name: Test
 inputs:
+  testArtifacts:
+    default: null
+    required: false
   runTestsParameters:
     default: ''
     required: false
@@ -18,10 +21,17 @@ runs:
         export PDO_DBLIB_TEST_USER="pdo_test"
         export PDO_DBLIB_TEST_PASS="password"
         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,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
+          -g FAIL,BORK,LEAK,XLEAK \
           --offline \
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
+    - uses: actions/upload-artifact@v3
+      if: always() && inputs.testArtifacts != null
+      with:
+        name: ${{ github.job }}_${{ inputs.testArtifacts }}
+        path: ${{ github.workspace }}/junit.out.xml
+        retention-days: 5

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

@@ -1,5 +1,8 @@
 name: Test
 inputs:
+  testArtifacts:
+    default: null
+    required: false
   runTestsParameters:
     default: ''
     required: false
@@ -11,10 +14,17 @@ runs:
         set -x
         export SKIP_IO_CAPTURE_TESTS=1
         export CI_NO_IPV6=1
+        export TEST_PHP_JUNIT=junit.out.xml
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(sysctl -n hw.ncpu) \
-          -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
+          -g FAIL,BORK,LEAK,XLEAK \
           --offline \
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
+    - uses: actions/upload-artifact@v3
+      if: always() && inputs.testArtifacts != null
+      with:
+        name: ${{ github.job }}_${{ inputs.testArtifacts }}
+        path: ${{ github.workspace }}/junit.out.xml
+        retention-days: 5

.github/actions/verify-generated-files/action.yml

@@ -6,9 +6,10 @@ runs:
       run: |
         set -x
         [[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
+        scripts/dev/credits
         scripts/dev/genfiles
         Zend/zend_vm_gen.php
+        ext/tokenizer/tokenizer_data_gen.php
         build/gen_stub.php -f
         build/gen_stub.php --generate-optimizer-info
-        ext/tokenizer/tokenizer_data_gen.php
-        git add . -Nu && git diff --exit-code
+        git add . -N && git diff --exit-code

.github/labeler.yml

@@ -146,6 +146,9 @@
 "Extension: pspell":
 - ext/pspell/**/*
 
+"Extension: random":
+- ext/random/**/*
+
 "Extension: readline":
 - ext/readline/**/*
 
@@ -219,22 +222,22 @@
 - ext/zlib/**/*
 
 "SAPI: apache2handler":
-- ext/sapi/apache2handler/**/*
+- sapi/apache2handler/**/*
 
 "SAPI: cgi":
-- ext/sapi/cgi/**/*
+- sapi/cgi/**/*
 
 "SAPI: cli":
-- ext/sapi/cli/**/*
+- sapi/cli/**/*
 
 "SAPI: fpm":
-- ext/sapi/fpm/**/*
+- sapi/fpm/**/*
 
 "SAPI: fuzzer":
-- ext/sapi/fuzzer/**/*
+- sapi/fuzzer/**/*
 
 "SAPI: litespeed":
-- ext/sapi/litespeed/**/*
+- sapi/litespeed/**/*
 
 "SAPI: phpdbg":
-- ext/sapi/phpdbg/**/*
+- sapi/phpdbg/**/*

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

@@ -0,0 +1,23 @@
+name: Close stale feature requests
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  stale:
+    if: github.repository_owner == 'php'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          days-before-close: 7
+          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
+            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/nightly.yml

@@ -67,11 +67,13 @@ jobs:
       - name: Test
         uses: ./.github/actions/test-linux
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -80,13 +82,15 @@ jobs:
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
       - name: Test Function JIT
         uses: ./.github/actions/test-linux
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -127,9 +131,12 @@ jobs:
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
+        with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -138,13 +145,15 @@ jobs:
       - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.protect_memory=1
       - name: Test Function JIT
         uses: ./.github/actions/test-macos
         with:
+          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -153,3 +162,34 @@ jobs:
             -d opcache.jit=1205
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
+  COVERAGE_DEBUG_NTS:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v2
+      - name: Create mssql container
+        uses: ./.github/actions/mssql
+      - name: apt
+        uses: ./.github/actions/apt-x64
+      - name: Install gcovr
+        run: sudo -H pip install gcovr
+      - name: ./configure
+        uses: ./.github/actions/configure-x64
+        with:
+          configurationParameters: --enable-debug --disable-zts --enable-gcov
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-linux
+      - name: Setup
+        uses: ./.github/actions/setup-x64
+      # We only test with OpCache, the difference in coverage is negligible
+      - name: Test OpCache
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+      - name: Upload Test Coverage to Codecov.io
+        if: always()
+        run: bash <(curl -s https://codecov.io/bash)

.github/workflows/push.yml

@@ -50,9 +50,12 @@ jobs:
         uses: ./.github/actions/setup-x64
       - name: Test
         uses: ./.github/actions/test-linux
+        with:
+          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -78,9 +81,12 @@ jobs:
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
+        with:
+          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
+          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1

.gitignore

@@ -281,6 +281,7 @@ tmp-php.ini
 # GitHub actions cache
 # ------------------------------------------------------------------------------
 /branch-commit-cache.json
+/junit.out.xml
 
 # ------------------------------------------------------------------------------
 # Special cases to invert previous ignore patterns

EXTENSIONS

@@ -375,6 +375,7 @@ STATUS:              Working
 EXTENSION:           mbstring
 PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net> (2001 - 2013)
                      Nikita Popov <nikic@php.net> (2017 - 2020)
+                     Alex Dowad <alexinbeijing@gmail.com> (2021 - 2022)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -425,6 +426,13 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
+EXTENSION:           random
+PRIMARY MAINTAINER   Go Kudo <zeriyoshi@php.net> (2022 - 2022)
+                     Tim Düsterhus <timwolla@php.net> (2022 - 2022)
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               8.2.0
+-------------------------------------------------------------------------------
 EXTENSION:           readline
 PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown