优化代码 (#240)

imiphp · Dec 31, 2021 · 14eb7fd · 14eb7fd
1 parent 93d3ae6
commit 14eb7fd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -4,12 +4,12 @@
     "license": "MIT",
     "description": "在 imi 框架中集成 gRPC 服务开发、客户端调用及连接池",
     "require": {
-        "ext-swoole": ">=4.4.0",
-        "imiphp/imi-rpc": "2.*",
+        "imiphp/imi-rpc": "~2.0.0",
         "yurunsoft/yurun-http": "^4.0.0",
         "google/protobuf": "^3.10.0"
     },
-    "require-dev": {},
+    "require-dev": {
+    },
     "autoload": {
         "psr-4": {
             "Imi\\Grpc\\": "src/grpc",
@@ -23,7 +23,11 @@
             "GPBMetadata\\": "example/grpc/GPBMetadata",
             "Imi\\Grpc\\Test\\": "tests/Grpc",
             "Imi\\Grpc\\Dev\\": "dev/"
-        }
+        },
+        "files": [
+            "../../../vendor/autoload.php",
+            "../../../dev/try-include-swoole.php"
+        ]
     },
     "scripts": {
         "pre-install-cmd": "Imi\\Grpc\\Dev\\Dev::preUpdate",

diff --git a/dev/Dev.php b/dev/Dev.php
@@ -13,19 +13,32 @@ class Dev
     // @phpstan-ignore-next-line
     public static function preUpdate(Event $event): void
     {
+        $dir = \dirname(__DIR__);
         // @phpstan-ignore-next-line
         $package = $event->getComposer()->getPackage();
         $requires = $package->getRequires();
         foreach ($requires as $name => &$require)
         {
-            if ('imiphp/' !== substr($name, 0, 7))
+            if ('imiphp/' !== substr($name, 0, 7) || !is_dir(\dirname($dir) . '/' . substr($name, 11)))
             {
                 continue;
             }
             // @phpstan-ignore-next-line
             $require = new Link($require->getSource(), $require->getTarget(), new Constraint('>', '0'), $require->getDescription());
         }
         $package->setRequires($requires);
+
+        $requires = $package->getDevRequires();
+        foreach ($requires as $name => &$require)
+        {
+            if ('imiphp/' !== substr($name, 0, 7) || !is_dir(\dirname($dir) . '/' . substr($name, 11)))
+            {
+                continue;
+            }
+            // @phpstan-ignore-next-line
+            $require = new Link($require->getSource(), $require->getTarget(), new Constraint('>', '0'), $require->getDescription());
+        }
+        $package->setDevRequires($requires);
     }
 
     // @phpstan-ignore-next-line
@@ -35,15 +48,15 @@ public static function postUpdate(Event $event): void
 
         // @phpstan-ignore-next-line
         $package = $event->getComposer()->getPackage();
-        $requires = $package->getRequires();
+        $requires = array_merge($package->getRequires(), $package->getDevRequires());
         foreach ($requires as $name => $require)
         {
-            if ('imiphp/' !== substr($name, 0, 7))
+            $componentDir = \dirname($dir) . '/' . substr($name, 11);
+            if ('imiphp/' !== substr($name, 0, 7) || !is_dir($componentDir))
             {
                 continue;
             }
 
-            $componentDir = \dirname($dir) . '/' . substr($name, 11);
             $path = "{$dir}/vendor/{$name}";
             $cmd = "rm -rf {$path} && ln -s -f {$componentDir} {$path}";
             echo '[cmd] ', $cmd, \PHP_EOL;

diff --git a/example/bin/imi b/example/bin/imi
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-require_once dirname(__DIR__, 5) . '/vendor/' . 'autoload.php';
+require_once \dirname(__DIR__, 2) . '/vendor/autoload.php';
 
 \Imi\App::setDebug(true);
 
-require dirname(\Imi\Util\Imi::getNamespacePath('Imi\Swoole')) . '/bin/imi-swoole';
+require \dirname(\Imi\Util\Imi::getNamespacePath('Imi\Swoole')) . '/bin/imi-swoole';
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -4,7 +4,6 @@
 
 use function Yurun\Swoole\Coroutine\batch;
 
-require \dirname(__DIR__, 4) . '/vendor/autoload.php';
 require \dirname(__DIR__) . '/vendor/autoload.php';
 
 /**