修复测试 (imiphp#696)

* 修复 Swoole 测试的 Event::wait() 警告报错 (imiphp#693) * 修复 Swoole 测试的 Event::wait() 警告报错 * 修复测试 * 修复测试 * 修复测试 * 修复测试 * 修复测试
xlstudio · May 2, 2024 · f358cfd · f358cfd
1 parent f687b08
commit f358cfd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -352,6 +352,10 @@ jobs:
         uses: shogo82148/actions-setup-redis@v1
         with:
           redis-version: "6.x"
+      # MacOS Arm64 下需要下面的修复，否则无法编译成功
+      - name: Fix include
+        run: |
+          sudo ln -s $(brew --prefix pcre2)/include/pcre2.h /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
       - name: Get Openssl Dir
         id: opecssl-dir
         run: echo "path=$(brew --prefix openssl@1.1)" >> $GITHUB_OUTPUT

diff --git a/src/Components/grpc/src/Middleware/ActionMiddleware.php b/src/Components/grpc/src/Middleware/ActionMiddleware.php
@@ -218,6 +218,10 @@ private function prepareActionParams(Request $request, RouteResult $routeResult)
                 $headers[$name] = implode(', ', $values);
             }
         }
+        else
+        {
+            $allData = [];
+        }
 
         /** @var ActionMethodItem[] $actionMethodCache */
         foreach ($actionMethodCache as $actionMethodCacheItem)

diff --git a/src/Components/swoole/tests/unit/Component/config/config.php b/src/Components/swoole/tests/unit/Component/config/config.php
@@ -16,8 +16,9 @@
         'Imi\Swoole\Test\Component\Async',
         'Imi\Swoole\Test\Component\Pool',
     ],
-    // 'ignoreNamespace'   => [
-    // ],
+    'ignorePaths' => [
+        \dirname(__DIR__) . \DIRECTORY_SEPARATOR . 'test.php',
+    ],
 
     // 组件命名空间
     'components'    => [

diff --git a/src/Server/Http/Middleware/ActionMiddleware.php b/src/Server/Http/Middleware/ActionMiddleware.php
@@ -204,6 +204,10 @@ private function prepareActionParams(Request $request, RouteResult $routeResult)
                 $headers[$name] = implode(', ', $values);
             }
         }
+        else
+        {
+            $allData = [];
+        }
 
         /** @var ActionMethodItem[] $actionMethodCache */
         foreach ($actionMethodCache as $actionMethodCacheItem)

diff --git a/src/Util/DocBlock.php b/src/Util/DocBlock.php
@@ -19,7 +19,8 @@ public static function getFactory(): DocBlockFactory
     {
         if (null === self::$factory)
         {
-            self::$factory = DocBlockFactory::createInstance();
+            // @phpstan-ignore-next-line
+            return self::$factory = DocBlockFactory::createInstance();
         }
 
         return self::$factory;