Fix sysconf functions in FreeBSD

.github/nightly_matrix.php

@@ -5,7 +5,6 @@
     ['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]],
     ['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]],
     ['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]],
-    ['name' => 'PHP-8.0', 'ref' => 'PHP-8.0', 'version' => ['major' => 8, 'minor' => 0]],
 ];
 
 function get_branch_commit_cache_file_path(): string {
@@ -49,28 +48,26 @@ function get_matrix_include(array $branches) {
             'test_function_jit' => false,
             'asan' => true,
         ];
-        if ($branch['ref'] !== 'PHP-8.0') {
-            $jobs[] = [
-                'name' => '_REPEAT',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => false,
-                'run_tests_parameters' => '--repeat 2',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-                'asan' => false,
-            ];
-            $jobs[] = [
-                'name' => '_VARIATION',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => true,
-                'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-                'asan' => false,
-            ];
-        }
+        $jobs[] = [
+            'name' => '_REPEAT',
+            'branch' => $branch,
+            'debug' => true,
+            'zts' => false,
+            'run_tests_parameters' => '--repeat 2',
+            'timeout_minutes' => 360,
+            'test_function_jit' => true,
+            'asan' => false,
+        ];
+        $jobs[] = [
+            'name' => '_VARIATION',
+            'branch' => $branch,
+            'debug' => true,
+            'zts' => true,
+            'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
+            'timeout_minutes' => 360,
+            'test_function_jit' => true,
+            'asan' => false,
+        ];
     }
     return $jobs;
 }

.github/workflows/nightly.yml

@@ -234,7 +234,7 @@ jobs:
         debug: [true, false]
         zts: [true, false]
     name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-12
+    runs-on: macos-${{ matrix.branch.version.minor >= 4 && '13' || '12' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -401,7 +401,6 @@ jobs:
           echo memory_limit=-1 >> /etc/php.d/opcache.ini
           php -v
       - name: Test AMPHP
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server"
           X=0
@@ -420,7 +419,6 @@ jobs:
           done
           exit $X
       - name: Test Laravel
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           git clone https://github.com/laravel/framework.git --branch=master --depth=1
           cd framework
@@ -434,7 +432,6 @@ jobs:
             exit 1
           fi
       - name: Test ReactPHP
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream"
           X=0
@@ -453,7 +450,6 @@ jobs:
           done
           exit $X
       - name: Test Revolt PHP
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           git clone https://github.com/revoltphp/event-loop.git --depth=1
           cd event-loop
@@ -465,7 +461,6 @@ jobs:
             exit 1
           fi
       - name: Test Symfony
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           git clone https://github.com/symfony/symfony.git --depth=1
           cd symfony
@@ -499,7 +494,6 @@ jobs:
             exit 1
           fi
       - name: 'Symfony Preloading'
-        if: matrix.branch.ref != 'PHP-8.0'
         run: |
           php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-reqs
           cd symfony_demo
@@ -680,7 +674,7 @@ jobs:
             --enable-memory-sanitizer \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d \
-            ${{ matrix.branch.ref != 'PHP-8.0' && '--enable-dl-test=shared' || '' }}
+            --enable-dl-test=shared
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -724,8 +718,6 @@ jobs:
       fail-fast: false
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-        exclude:
-          - branch: { name: 'PHP-80', ref: 'PHP-8.0', major: 8, minor: 0 }
     name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
     runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }}
     steps:

.github/workflows/push.yml

@@ -14,8 +14,6 @@ on:
       - travis/*
       - .circleci/*
     branches:
-      - PHP-7.4
-      - PHP-8.0
       - PHP-8.1
       - PHP-8.2
       - PHP-8.3
@@ -123,7 +121,7 @@ jobs:
           configurationParameters: >-
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
-            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16 --disable-opcache-jit' || '' }}
+            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=pointer-overflow -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=pointer-overflow" CC=clang-16 CXX=clang++-16' || '' }}
           skipSlow: ${{ matrix.asan }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
@@ -137,11 +135,11 @@ jobs:
         uses: ./.github/actions/test-linux
         with:
           testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
-      - name: Test ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
+      - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
-          jitType: ${{ matrix.asan && 'disable' || 'tracing' }}
+          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_Tracing JIT
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -150,7 +148,7 @@ jobs:
         if: ${{ !matrix.asan }}
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4

CODEOWNERS

@@ -8,7 +8,6 @@
 # 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
 
-*.stub.php @kocsismate
 /.github @iluuu1994 @TimWolla
 /build/gen_stub.php @kocsismate
 /ext/bcmath @Girgias
@@ -54,3 +53,4 @@
 /Zend/zend_type*.h @dstogov
 /Zend/zend_variables.* @dstogov
 /Zend/zend_vm* @dstogov
+*.stub.php @kocsismate

CONTRIBUTING.md

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

EXTENSIONS

@@ -422,7 +422,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           random
 PRIMARY MAINTAINER   Go Kudo <zeriyoshi@php.net> (2022 - 2022)
-                     Tim Düsterhus <timwolla@php.net> (2022 - 2023)
+                     Tim Düsterhus <timwolla@php.net> (2022 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               8.2.0

LICENSE

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2023 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2024 The PHP Group. All rights reserved.
 --------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without

NEWS

@@ -6,6 +6,10 @@ Core:
   . Added zend_call_stack_get implementation for NetBSD, DragonFlyBSD,
     Solaris and Haiku. (David Carlier)
   . Enabled ifunc checks on FreeBSD from the 12.x releases. (Freaky)
+  . Changed the type of PHP_DEBUG and PHP_ZTS constants to bool. (haszi)
+
+Curl:
+  . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 
 Date:
   . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
@@ -18,14 +22,20 @@ DOM:
   . Implement DOM HTML5 parsing and serialization RFC. (nielsdos)
   . Fix DOMElement->prefix with empty string creates bogus prefix. (nielsdos)
   . Handle OOM more consistently. (nielsdos)
+  . Implemented "Improve callbacks in ext/dom and ext/xsl" RFC. (nielsdos)
 
 FPM:
   . Implement GH-12385 (flush headers without body when calling flush()).
     (nielsdos)
+  . Added DragonFlyBSD system to the list which set FPM_BACKLOG_DEFAULT
+    to SOMAXCONN. (David Carlier)
 
 FTP:
   . Removed the deprecated inet_ntoa call support. (David Carlier)
 
+GD:
+  . Fixed detection of image formats in system gd library. (Michael Orlitzky)
+
 Intl:
   . Added IntlDateFormatter::PATTERN constant. (David Carlier)
   . Fixed Numberformatter::__construct when the locale is invalid, now
@@ -46,25 +56,38 @@ OpenSSL:
     (Jakub Zelenka)
   . Implement request #48520 (openssl_csr_new - allow multiple values in DN).
     (Jakub Zelenka)
+  . Introduced new serial_hex parameter to openssl_csr_sign. (Jakub Zelenka,
+    Florian Sowade)
 
 PDO:
-  . Fixed setAttribute and getAttribute (SakiTakamachi)
+  . Fixed setAttribute and getAttribute. (SakiTakamachi)
+  . Implemented PDO driver-specific subclasses RFC. (danack, kocsismate)
 
 PDO_DBLIB:
-  . Fixed setAttribute and getAttribute (SakiTakamachi)
+  . Fixed setAttribute and getAttribute. (SakiTakamachi)
+  . Added class PdoDbLib (danack, kocsismate)
 
 PDO_FIREBIRD:
-  . Fixed setAttribute and getAttribute (SakiTakamachi)
-  . Feature: Add transaction isolation level and mode settings to pdo_firebird
+  . Fixed setAttribute and getAttribute. (SakiTakamachi)
+  . Feature: Add transaction isolation level and mode settings to pdo_firebird.
     (SakiTakamachi)
+  . Added class PdoFirebird. (danack, kocsismate)
 
 PDO_MYSQL:
-  . Fixed setAttribute and getAttribute (SakiTakamachi)
+  . Fixed setAttribute and getAttribute. (SakiTakamachi)
+  . Added class PdoMysql. (danack, kocsismate)
+
+PDO_ODBC:
+  . Added class PdoOdbc. (danack, kocsismate)
 
 PDO_PGSQL:
   . Fixed GH-12423, DSN credentials being prioritized over the user/password
     PDO constructor arguments. (SakiTakamachi)
   . Fixed native float support with pdo_pgsql query results. (Yurunsoft)
+  . Added class PdoPgsql. (danack, kocsismate)
+
+PDO_SQLITE:
+  . Added class PdoSqlite. (danack, kocsismate)
 
 PGSQL:
   . Added the possibility to have no conditions for pg_select. (OmarEmaraDev)
@@ -99,6 +122,7 @@ SOAP:
 
 Sockets:
   . Removed the deprecated inet_ntoa call support. (David Carlier)
+  . Added the SO_EXECLUSIVEADDRUSE windows constant. (David Carlier)
 
 Sodium:
   . Add support for AEGIS-128L and AEGIS-256 (jedisct1)
@@ -116,12 +140,14 @@ Standard:
   . Cast large floats that are within int range to int in number_format so
     the precision is not lost. (Marc Bennewitz)
   . Add support for 4 new rounding modes to the round() function. (Jorg Sowa)
+  . debug_zval_dump() now indicates whether an array is packed. (Max Semenik)
 
 XML:
   . Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)
 
 XSL:
   . Implement request #64137 (XSLTProcessor::setParameter() should allow both
     quotes to be used). (nielsdos)
+  . Implemented "Improve callbacks in ext/dom and ext/xsl" RFC. (nielsdos)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

TSRM/threads.m4

@@ -31,12 +31,6 @@ dnl
 dnl Set some magic defines to achieve POSIX threads conformance.
 dnl
 AC_DEFUN([PTHREADS_FLAGS],[
-  if test -z "$host_alias" && test -n "$host"; then
-    host_alias=$host
-  fi
-  if test -z "$host_alias"; then
-    AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
-  fi
   case $host_alias in
   *solaris*)
     PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;