Add PHP 8.6 [skip ci]

Fix building oauth and swoole

Author: shivammathur

.github/workflows/cache-nightly.yml

@@ -7,7 +7,7 @@ on:
     inputs:
       php-versions:
         description: 'PHP version to build'
-        default: '8.5'
+        default: '8.5 8.6'
         required: false
       builds:
         description: 'Build type'
@@ -23,7 +23,7 @@ on:
         required: false
 
 env:
-  PHP_VERSIONS: '8.5'
+  PHP_VERSIONS: '8.5 8.6'
   BUILDS: 'debug release'
   TS: 'nts zts'
   CONTAINERS: 'ubuntu:24.04 ubuntu:22.04 arm64v8/ubuntu:22.04 arm64v8/ubuntu:24.04'

README.md

@@ -2,7 +2,7 @@
 
 <a href="https://github.com/shivammathur/php-ubuntu" title="PHP Package Cache"><img alt="Build status" src="https://github.com/shivammathur/php-ubuntu/workflows/Cache%20PHP%20for%20stable%20versions/badge.svg"></a>
 <a href="https://github.com/shivammathur/php-ubuntu/blob/main/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
-<a href="https://github.com/shivammathur/php-ubuntu/tree/main/builds" title="builds"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.6%20to%208.5-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
+<a href="https://github.com/shivammathur/php-ubuntu/tree/main/builds" title="builds"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.6%20to%208.6-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
 <a href="https://cloudsmith.io/~shivammathur/repos/php-ubuntu" title="mirror"><img alt="cloudsmith mirror" src="https://img.shields.io/badge/builds-cloudsmith-blue?logo=cloudsmith"></a>
 
 > Cache PHP packages for installing on GitHub Actions

scripts/extensions.sh

@@ -41,10 +41,12 @@ add_swoole() {
     yes '' 2>/dev/null | sudo pecl install -f -D 'enable-openssl="yes" enable-sockets="yes" enable-swoole-curl="yes"' swoole-5.1.6 && configure_extension swoole
   elif [[ "$PHP_VERSION" =~ 8.[1-4] ]]; then
     yes '' 2>/dev/null | sudo pecl install -f -D 'enable-openssl="yes" enable-sockets="yes" enable-swoole-curl="yes"' swoole && configure_extension swoole
-  elif [[ "$PHP_VERSION" = "8.5" ]]; then
+  elif [[ "$PHP_VERSION" =~ 8.[5-6] ]]; then
     git clone https://github.com/swoole/swoole-src
     (
       cd swoole-src
+      curl -o swoole.patch -sL https://patch-diff.githubusercontent.com/raw/swoole/swoole-src/pull/5823.patch
+      git apply swoole.patch
       phpize
       ./configure --enable-openssl=yes --enable-sockets=yes --enable-swoole-curl="yes"
       make -j$(nproc)
@@ -79,7 +81,10 @@ add_oauth() {
     sudo tar xf oauth-*
     (
       cd oauth-*/
-      [[ "$PHP_VERSION" =~ 8.5 ]] && for file in provider.c oauth.c; do sed -i 's/zend_exception_get_default()/zend_ce_exception/' $file; done
+      if [[ "$PHP_VERSION" =~ 8.[5-6] ]]; then
+        for file in provider.c oauth.c; do sed -i 's/zend_exception_get_default()/zend_ce_exception/' $file; done
+        sed -i 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#' php_oauth.h
+      fi
       build_oauth
     )
   fi