Merge pull request #819 from crazywhalecc/php-85

Add PHP 8.5 initial support

config/ext.json

@@ -531,9 +531,10 @@
         },
         "notes": true,
         "type": "builtin",
-        "arg-type": "with-path",
+        "arg-type": "custom",
         "lib-depends": [
-            "libargon2"
+            "libargon2",
+            "openssl"
         ]
     },
     "pcntl": {

config/source.json

@@ -1012,6 +1012,7 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
+        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",

src/SPC/builder/extension/openssl.php

@@ -5,23 +5,11 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('openssl')]
 class openssl extends Extension
 {
-    public function patchBeforeBuildconf(): bool
-    {
-        // Fix php 8.5 alpha1~4 zts openssl build bug
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/php-src/ext/openssl/config.w32',
-            'WARNING("OpenSSL argon2 hashing not supported in ZTS mode for now");',
-            'AC_DEFINE("HAVE_OPENSSL_ARGON2", 1, "Define to 1 to enable OpenSSL argon2 password hashing.");'
-        );
-        return true;
-    }
-
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
@@ -40,7 +28,7 @@ class openssl extends Extension
     {
         $openssl_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : ' --with-openssl-dir=' . BUILD_ROOT_PATH;
         $args = '--with-openssl=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $openssl_dir;
-        if ($this->builder->getPHPVersionID() >= 80500) {
+        if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
             $args .= ' --with-openssl-argon2 OPENSSL_LIBS="-lz"';
         }
         return $args;
@@ -49,7 +37,7 @@ class openssl extends Extension
     public function getWindowsConfigureArg(bool $shared = false): string
     {
         $args = '--with-openssl';
-        if ($this->builder->getPHPVersionID() >= 80500) {
+        if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
             $args .= ' --with-openssl-argon2';
         }
         return $args;

src/SPC/builder/extension/password_argon2.php

@@ -42,4 +42,14 @@ class password_argon2 extends Extension
         }
         return $patched;
     }
+
+    public function getConfigureArg(bool $shared = false): string
+    {
+        if ($this->builder->getLib('openssl') !== null) {
+            if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
+                return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
+            }
+        }
+        return '--with-password-argon2';
+    }
 }

src/SPC/builder/linux/LinuxBuilder.php

@@ -359,7 +359,6 @@ class LinuxBuilder extends UnixBuilderBase
         $static = SPCTarget::isStatic() ? '-all-static' : '';
         $lib = BUILD_LIB_PATH;
         return [
-            // 'CPPFLAGS' => '-Dsomethinghere',
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LIBS' => $config['libs'],
             'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),