From b026342f86fae233e3f4699df9edfd7addec9e6d Mon Sep 17 00:00:00 2001
From: Yurun <admin@yurunsoft.com>
Date: Mon, 16 Oct 2023 16:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml                                    | 6 ++----
 phpstan-components.neon                                     | 2 +-
 src/Components/fpm/src/Http/Message/FpmResponse.php         | 2 +-
 src/Components/phar/src/PharBuildCommand.php                | 1 +
 .../roadrunner/src/Http/Message/RoadRunnerRequest.php       | 2 +-
 .../roadrunner/src/Http/Message/RoadRunnerResponse.php      | 2 +-
 src/Components/swoole/src/Http/Message/SwooleResponse.php   | 2 +-
 .../workerman/src/Http/Message/WorkermanResponse.php        | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f9a57d757..05567140d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,6 @@ jobs:
             postgresql_version: ""
           - version: 5.0-php8.1
             postgresql_version: ""
-          - version: 5.0-php8.0
-            postgresql_version: ""
         roadrunner: [2.7.*]
     env:
       ENV_SERVICE: swoole
@@ -275,7 +273,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.0", "8.1", "8.2"]
+        php: ["8.1", "8.2"]
         swoole: [v5.0.3]
         roadrunner: [2.7.*]
     env:
@@ -396,7 +394,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.0", "8.1"] # 部分扩展还未在 pecl 发布 PHP 8.2 Windows 版扩展，所以无法测试
+        php: ["8.1"] # 部分扩展还未在 pecl 发布 PHP 8.2 Windows 版扩展，所以无法测试
         roadrunner: [2.7.*]
         extensions:
           [
diff --git a/phpstan-components.neon b/phpstan-components.neon
index 8b812be6d2..7b21c70404 100644
--- a/phpstan-components.neon
+++ b/phpstan-components.neon
@@ -11,7 +11,7 @@ parameters:
         - src/Components/grpc/example/grpc
         - src/Components/smarty/src/smarty-plugins
         - src/Components/swoole/src/Process/Process.php
-        - src/Components/pgsql/src/Db/Drivers/SwooleNew
+        - src/Components/pgsql/src/Db/Drivers/Swoole
         - src/Components/phar/src/Ignore
 
     bootstrapFiles:
diff --git a/src/Components/fpm/src/Http/Message/FpmResponse.php b/src/Components/fpm/src/Http/Message/FpmResponse.php
index 40bace3e2c..2733698edd 100644
--- a/src/Components/fpm/src/Http/Message/FpmResponse.php
+++ b/src/Components/fpm/src/Http/Message/FpmResponse.php
@@ -66,7 +66,7 @@ private function sendHeaders(): void
     /**
      * {@inheritDoc}
      */
-    public function send(): self
+    public function send(): static
     {
         if ($this->responseBodyEmitter)
         {
diff --git a/src/Components/phar/src/PharBuildCommand.php b/src/Components/phar/src/PharBuildCommand.php
index cbaa2e7836..ebb858113f 100644
--- a/src/Components/phar/src/PharBuildCommand.php
+++ b/src/Components/phar/src/PharBuildCommand.php
@@ -43,6 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         {
             if (file_exists($configFile))
             {
+                /** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */
                 $helper = $this->getHelper('question');
                 $question = new ConfirmationQuestion('The configuration file already exists, whether to overwrite it? (y or n)', false);
 
diff --git a/src/Components/roadrunner/src/Http/Message/RoadRunnerRequest.php b/src/Components/roadrunner/src/Http/Message/RoadRunnerRequest.php
index d57313dd1b..cf0a0d3ae4 100644
--- a/src/Components/roadrunner/src/Http/Message/RoadRunnerRequest.php
+++ b/src/Components/roadrunner/src/Http/Message/RoadRunnerRequest.php
@@ -45,7 +45,7 @@ protected function initUri(): void
     /**
      * {@inheritDoc}
      */
-    public function withParsedBody($data)
+    public function withParsedBody($data): static
     {
         $result = parent::withParsedBody($data);
         $contentType = $_SERVER['CONTENT_TYPE'] ?? '';
diff --git a/src/Components/roadrunner/src/Http/Message/RoadRunnerResponse.php b/src/Components/roadrunner/src/Http/Message/RoadRunnerResponse.php
index a6efc7423b..3e6f55875c 100644
--- a/src/Components/roadrunner/src/Http/Message/RoadRunnerResponse.php
+++ b/src/Components/roadrunner/src/Http/Message/RoadRunnerResponse.php
@@ -44,7 +44,7 @@ public function isBodyWritable(): bool
     /**
      * {@inheritDoc}
      */
-    public function send(): self
+    public function send(): static
     {
         if ($this->isWritable)
         {
diff --git a/src/Components/swoole/src/Http/Message/SwooleResponse.php b/src/Components/swoole/src/Http/Message/SwooleResponse.php
index 2a063d4244..74ae6fa82f 100644
--- a/src/Components/swoole/src/Http/Message/SwooleResponse.php
+++ b/src/Components/swoole/src/Http/Message/SwooleResponse.php
@@ -91,7 +91,7 @@ private function sendHeaders(): void
     /**
      * {@inheritDoc}
      */
-    public function send(): self
+    public function send(): static
     {
         if ($this->responseBodyEmitter)
         {
diff --git a/src/Components/workerman/src/Http/Message/WorkermanResponse.php b/src/Components/workerman/src/Http/Message/WorkermanResponse.php
index f2a47afe24..a4afe0b610 100644
--- a/src/Components/workerman/src/Http/Message/WorkermanResponse.php
+++ b/src/Components/workerman/src/Http/Message/WorkermanResponse.php
@@ -111,7 +111,7 @@ private function sendHeaders(): void
     /**
      * {@inheritDoc}
      */
-    public function send(): self
+    public function send(): static
     {
         if ($this->responseBodyEmitter)
         {