升级guanguans/soar-php至3.0

wilbur-yu · Feb 17, 2023 · 53d9659 · 53d9659
1 parent 5c56f82
commit 53d9659
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,7 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": ">=7.0",
+        "swoole/ide-helper": "^5.0",
         "symfony/var-dumper": "^5.1"
     },
     "config": {

diff --git a/src/Aspect/ResponseAspect.php b/src/Aspect/ResponseAspect.php
@@ -122,7 +122,7 @@ protected function parallel(array $eventSqlList): array
         try {
             foreach ($eventSqlList as $sql) {
                 $parallel->add(function () use ($sql) {
-                    $soar = $this->service->score($sql);
+                    $soar = $this->service->jsonScores($sql);
 
                     return $this->formatting($soar);
                 });

diff --git a/src/Exec.php b/src/Exec.php
@@ -16,7 +16,7 @@
 namespace Wilbur\HyperfSoar;
 
 use Guanguans\SoarPHP\Exceptions\RuntimeException;
-use Guanguans\SoarPHP\Support\OsHelper;
+use Guanguans\SoarPHP\Support\OS;
 use Swoole\Coroutine\System;
 
 trait Exec
@@ -30,7 +30,7 @@ trait Exec
      */
     public function exec(string $command): string
     {
-        OsHelper::isWindows() && $command = 'powershell '.$command;
+        OS::isWindows() && $command = 'powershell '.$command;
         $result = System::exec($command);
 
         if ($result['code'] !== 0) {

diff --git a/src/SoarService.php b/src/SoarService.php
@@ -17,13 +17,13 @@
 
 use Guanguans\SoarPHP\Soar;
 
-use Guanguans\SoarPHP\Support\OsHelper;
+use Guanguans\SoarPHP\Support\OS;
 
 use function config;
 
 class SoarService extends Soar
 {
-    use Exec;
+//    use Exec;
 
     public function __construct(array $config = null)
     {
@@ -33,16 +33,4 @@ public function __construct(array $config = null)
         unset($config['enabled'], $config['cut_classes'], $config['-soar-path']);
         parent::__construct($config, $soarPath);
     }
-
-    protected function getDefaultSoarPath(): string
-    {
-        if (OsHelper::isWindows()) {
-            return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.windows-amd64';
-        }
-        if (OsHelper::isMacOS()) {
-            return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.darwin-amd64';
-        }
-
-        return __DIR__.'/../vendor/guanguans/soar-php/bin/soar.linux-amd64';
-    }
 }