use php 8.2 to setup php runtime

.github/workflows/build-linux-arm.yml

@@ -15,6 +15,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'

.github/workflows/build-linux-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'

.github/workflows/build-macos-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'

.github/workflows/download-cache.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ "8.0", "8.1", "8.2" ]
+        php-version: [ "8.0", "8.1", "8.2", "8.3" ]
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/tests.yml

@@ -67,6 +67,7 @@ jobs:
         include:
           - php: '8.1'
           - php: '8.2'
+          - php: '8.3'
 
     steps:
       - name: "Checkout"
@@ -106,6 +107,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         os:
           - ubuntu-latest
           - macos-latest

README-zh.md

@@ -130,7 +130,7 @@ chmod +x bin/spc
 ./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
 ```
 
-你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.2：
+你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.3：
 
 ```bash
 # 优先考虑使用 >= 8.0 的 PHP 版本，因为 phpmicro 不支持在 PHP7 中构建

README.md

@@ -146,7 +146,7 @@ Basic usage for building php and micro with some extensions:
 ./bin/spc build bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl --build-cli --build-micro
 ```
 
-You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.2:
+You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.3:
 
 ```bash
 # Using PHP >= 8.0 is recommended, because PHP7 cannot use phpmicro

bin/setup-runtime

@@ -25,7 +25,7 @@ __DIR__=$(cd "$(dirname "$0")" && pwd)
 __PROJECT__=$(cd "${__DIR__}"/../ && pwd)
 
 # set download dir
-__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.10-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
 __COMPOSER_URL__="https://getcomposer.org/download/latest-stable/composer.phar"
 
 # use china mirror
@@ -46,7 +46,7 @@ done
 
 case "$mirror" in
 china)
-  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.10-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
   __COMPOSER_URL__="https://mirrors.aliyun.com/composer/composer.phar"
   ;;
 

config/ext.json

@@ -278,11 +278,6 @@
             "sqlite"
         ]
     },
-    "rar": {
-        "type": "external",
-        "source": "rar",
-        "cpp-extension": true
-    },
     "pgsql": {
         "type": "builtin",
         "arg-type": "with-prefix",
@@ -311,6 +306,11 @@
             "aspell"
         ]
     },
+    "rar": {
+        "type": "external",
+        "source": "rar",
+        "cpp-extension": true
+    },
     "readline": {
         "type": "builtin",
         "arg-type": "with-prefix",
@@ -435,7 +435,7 @@
     },
     "tidy": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "with-prefix",
         "lib-depends": [
             "tidy"
         ]

config/lib.json

@@ -483,6 +483,12 @@
             "sqlite3ext.h"
         ]
     },
+    "tidy": {
+        "source": "tidy",
+        "static-libs-unix": [
+            "libtidy.a"
+        ]
+    },
     "xz": {
         "source": "xz",
         "static-libs-unix": [

config/source.json

@@ -51,16 +51,6 @@
             "path": "LICENSE"
         }
     },
-    "rar": {
-        "type": "git",
-        "url": "https://github.com/static-php/php-rar.git",
-        "path": "php-src/ext/rar",
-        "rev": "issue-php82",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ext-glfw": {
         "type": "git",
         "url": "https://github.com/mario-deluna/php-glfw",
@@ -412,6 +402,16 @@
             "path": "LICENSE"
         }
     },
+    "rar": {
+        "type": "git",
+        "url": "https://github.com/static-php/php-rar.git",
+        "path": "php-src/ext/rar",
+        "rev": "issue-php82",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "readline": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/readline/",
@@ -469,6 +469,15 @@
             "path": "LICENSE"
         }
     },
+    "tidy": {
+        "type": "url",
+        "url": "https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz",
+        "filename": "tidy-html5.tgz",
+        "license": {
+            "type": "file",
+            "path": "README/LICENSE.md"
+        }
+    },
     "xlswriter": {
         "type": "url",
         "url": "https://pecl.php.net/get/xlswriter",

src/SPC/builder/linux/library/tidy.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class tidy extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}

src/SPC/builder/macos/library/tidy.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class tidy extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}

src/SPC/builder/unix/library/tidy.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+trait tidy
+{
+    /**
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    protected function build(): void
+    {
+        FileSystem::resetDir($this->source_dir . '/build-dir');
+        shell()->cd($this->source_dir . '/build-dir')
+            ->exec(
+                'cmake ' .
+                "{$this->builder->makeCmakeArgs()} " .
+                '-DBUILD_SHARED_LIB=OFF ' .
+                '-DSUPPORT_CONSOLE_APP=OFF ' .
+                '..'
+            )
+            ->exec("cmake --build . -j {$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['tidy.pc']);
+    }
+}

src/globals/test-extensions.php

@@ -3,6 +3,6 @@
 declare(strict_types=1);
 
 # If you want to test new extensions here, just modify it.
-$extensions = 'rar,zlib,zip';
+$extensions = 'tidy,bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip';
 
 echo $extensions;