Kaynağa Gözat

fix: 应用启动时自动生成 installedSixShop,bin 脚本常量防重复定义

runphp 1 ay önce
ebeveyn
işleme
6b0e801186
2 değiştirilmiş dosya ile 4 ekleme ve 5 silme
  1. 1 1
      bin/generate-installed-sixshop.php
  2. 3 4
      src/Plugin.php

+ 1 - 1
bin/generate-installed-sixshop.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-const EXTENSION_TYPE = 'sixshop-extension';
+defined('EXTENSION_TYPE') || define('EXTENSION_TYPE', 'sixshop-extension');
 
 $dir = __DIR__;
 while (!is_file($dir . '/vendor/composer/installed.php')) {

+ 3 - 4
src/Plugin.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SixShop\Core;
 
 use Composer\InstalledVersions;
-use RuntimeException;
 
 class Plugin
 {
@@ -23,9 +22,9 @@ class Plugin
         }
         $composerDir = dirname(InstalledVersions::getInstallPath('composer/composer'), 2);
         $filePath = $composerDir . '/installedSixShop.php';
-        if (file_exists($filePath)) {
-            return self::$installedSixShopExtensions = require $filePath;
+        if (!file_exists($filePath)) {
+            require dirname(__DIR__) . '/bin/generate-installed-sixshop.php';
         }
-        throw new RuntimeException('Please run "composer dump-autoload" to generate installedSixShop.php');
+        return self::$installedSixShopExtensions = require $filePath;
     }
 }