Merge pull request #911 from jingjingxyk/experiment-feature

Experiment feature

Author: jingjingxyk

docs/upgrade.md

@@ -1,7 +1,12 @@
-## 升级 PHP 版本 步骤
+# 升级 PHP 版本 步骤
 
 > 1、修改 sapi/PHP-VERSION.conf 文件里版本号即可
-> 2、执行同步源码脚本， 拉取 PHP 官方源码 到本项目
+
+> 2、修改 sync-source-code.php 文件里 PHP 源码包的 sha256sum 配置
+
+> 3、执行同步源码脚本， 拉取 PHP 官方源码 到本项目
+
+> 4、sapi/cli/ 代码的升级，需要手动确认
 
 ```shell
 

sapi/scripts/cygwin/cygwin-pack.sh

@@ -21,12 +21,13 @@ NAME="swoole-cli-v${APP_VERSION}-cygwin-x64"
 test -d /tmp/${NAME} && rm -rf /tmp/${NAME}
 mkdir -p /tmp/${NAME}
 mkdir -p /tmp/${NAME}/etc/
+mkdir -p /tmp/${NAME}/bin/
 
 cd ${__PROJECT__}/
 ldd ${__PROJECT__}/bin/swoole-cli.exe | grep -v '/cygdrive/' | awk '{print $3}'
-ldd ${__PROJECT__}/bin/swoole-cli.exe | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/
+ldd ${__PROJECT__}/bin/swoole-cli.exe | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/bin/
 
-ls -lh  /tmp/${NAME}/
+ls -lh /tmp/${NAME}/
 
 cp -f ${__PROJECT__}/bin/swoole-cli.exe /tmp/${NAME}/
 # cp -f ${__PROJECT__}/bin/LICENSE /tmp/${NAME}/

sapi/scripts/download-php-src-archive.php

@@ -3,17 +3,32 @@
 $poject_dir = realpath(__DIR__ . '/../../');
 $php_version_tag = trim(file_get_contents($poject_dir . '/sapi/PHP-VERSION.conf'));
 $php_source_folder = $poject_dir . "/var/php-{$php_version_tag}";
-$php_archive_file = $poject_dir . "/pool/php/php-{$php_version_tag}.tar.gz";
+$php_archive_file = $poject_dir . "/pool/php-tar/php-{$php_version_tag}.tar.gz";
+$php_archive_file_sha256sum = '41c9e703caaf73ba6c77ee641709a3a5378a5dcb7bcc1fd1997f6e156a84abd4';
 $download_dir = dirname($php_archive_file);
+$download_php_counter = 0;
 
+DOWNLOAD_PHP:
 # 下载 PHP 源码
 $download_cmd = "curl -fSL https://github.com/php/php-src/archive/refs/tags/php-{$php_version_tag}.tar.gz -o {$php_archive_file}";
 echo $download_cmd . PHP_EOL;
 if (!file_exists($php_archive_file)) {
     `test -d {$download_dir} || mkdir -p {$download_dir}`;
+    $download_php_counter++;
     `{$download_cmd}`;
 }
 
+$hash = hash_file('sha256', $php_archive_file);
+echo "sha256sum: " . $hash . PHP_EOL;
+if ($hash !== $php_archive_file_sha256sum) {
+    if ($download_php_counter > 3) {
+        throw  new \Exception('curl download php archive Exception!', 500);
+    }
+    echo 'archive sha256sum mismatched , will re-download ' . PHP_EOL;
+    unlink($php_archive_file);
+    goto    DOWNLOAD_PHP;
+}
+
 # 若不存在则解压 PHP 源码包
 # tar -zxvf 文件名.tar.gz --strip-components=1 -C 指定解压目录
 

sync-source-code.php

@@ -30,7 +30,6 @@
     //测试同步
     # 准备工作 测试目录
 
-
     $directories = array_intersect($scanned_directory_source, $scanned_directory_destination);
 
     `test -d {$sync_dest_dir} && rm -rf {$sync_dest_dir}`;
@@ -59,7 +58,9 @@
 #  执行代码同步之前准备
 $SYNC_SOURCE_CODE_SHELL .= PHP_EOL . <<<EOF
     SRC={$php_source_folder}
-    cd {$sync_dest_dir}
+    __PROJECT__={$project_dir}
+    __WORKDIR__={$sync_dest_dir}
+    cd \${WORKDIR}
 EOF;
 
 # 准备 同步代码脚本
@@ -70,6 +71,19 @@
     cp -rf $SRC/Zend/. ./Zend
 
     # Extension
+    echo 'clean extension'
+    cd ${SRC}/ext/
+    EXTENSIONS=$(ls -d */)
+    cd ${__WORKDIR__}/
+    for EXT_NAME in $EXTENSIONS; do
+      EXT_NAME=$(echo "$EXT_NAME" | sed 's@.\{1\}$@@')
+      echo "EXTENSION_NAME: $EXT_NAME "
+      test -d ${__WORKDIR__}/ext/${EXT_NAME} && rm -rf ${__WORKDIR__}/ext/${EXT_NAME}
+    done
+
+    echo 'sync extensions '
+    cd ${__WORKDIR__}/
+
     cp -rf $SRC/ext/bcmath/. ./ext/bcmath
     cp -rf $SRC/ext/bz2/. ./ext/bz2
     cp -rf $SRC/ext/calendar/. ./ext/calendar