From 7f0761e545d64cb73fdda73f815df1eb4b581445 Mon Sep 17 00:00:00 2001
From: crazywhalecc <jesse2061@outlook.com>
Date: Sat, 20 May 2023 19:01:55 +0800
Subject: [PATCH] fix plugin:make autoload bug

---
 src/ZM/Framework.php                           | 2 +-
 src/ZM/Utils/CodeGenerator/PluginGenerator.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php
index 4ed3a9f2..9ce2654a 100644
--- a/src/ZM/Framework.php
+++ b/src/ZM/Framework.php
@@ -50,7 +50,7 @@ class Framework
     public const VERSION_ID = 715;
 
     /** @var string 版本名称 */
-    public const VERSION = '3.1.9';
+    public const VERSION = '3.1.10';
 
     /**
      * @var RuntimePreferences 运行时偏好（环境信息&参数）
diff --git a/src/ZM/Utils/CodeGenerator/PluginGenerator.php b/src/ZM/Utils/CodeGenerator/PluginGenerator.php
index aa316af5..e6057050 100644
--- a/src/ZM/Utils/CodeGenerator/PluginGenerator.php
+++ b/src/ZM/Utils/CodeGenerator/PluginGenerator.php
@@ -83,7 +83,8 @@ class PluginGenerator
         // TODO: 寻找 PHP 运行环境和 Composer 是否在当前目录的情况
         chdir($plugin_base_dir);
         $env = ZMUtil::getComposerExecutable();
-        passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload');
+        $cmd = $env === 'composer' ? $env . ' dump-autoload' : PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload';
+        passthru($cmd);
         chdir(WORKING_DIR);
         return $plugin_base_dir;
     }