解决 php 8.1 兼容问题 (#206)

imiphp · Nov 14, 2021 · d8c7ee8 · d8c7ee8
1 parent 559177c
commit d8c7ee8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Db/Drivers/Swoole/Statement.php b/src/Db/Drivers/Swoole/Statement.php
@@ -335,6 +335,7 @@ public function getInstance()
     /**
      * @return mixed|false
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->result);
@@ -343,6 +344,7 @@ public function current()
     /**
      * @return int|string|null
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->result);
@@ -367,6 +369,7 @@ public function rewind(): void
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return false !== $this->current();

diff --git a/tests/config/config.php b/tests/config/config.php
@@ -62,7 +62,7 @@
             'resource'    => [
                 'dbClass'     => 'PdoPgsqlDriver',
                 'host'        => imiGetEnv('PGSQL_SERVER_HOST', '127.0.0.1'),
-                'port'        => imiGetEnv('PGSQL_SERVER_PORT', 5432),
+                'port'        => (int) imiGetEnv('PGSQL_SERVER_PORT', 5432),
                 'username'    => imiGetEnv('PGSQL_SERVER_USERNAME', 'root'),
                 'password'    => imiGetEnv('PGSQL_SERVER_PASSWORD', 'root'),
                 'database'    => 'db_imi_test',
@@ -84,7 +84,7 @@
             'resource'    => [
                 'dbClass'     => 'PdoPgsqlDriver',
                 'host'        => imiGetEnv('PGSQL_SERVER_HOST', '127.0.0.1'),
-                'port'        => imiGetEnv('PGSQL_SERVER_PORT', 5432),
+                'port'        => (int) imiGetEnv('PGSQL_SERVER_PORT', 5432),
                 'username'    => imiGetEnv('PGSQL_SERVER_USERNAME', 'root'),
                 'password'    => imiGetEnv('PGSQL_SERVER_PASSWORD', 'root'),
                 'database'    => 'db_imi_test',
@@ -105,7 +105,7 @@
             'resource'    => [
                 'dbClass'     => 'SwoolePgsqlDriver',
                 'host'        => imiGetEnv('PGSQL_SERVER_HOST', '127.0.0.1'),
-                'port'        => imiGetEnv('PGSQL_SERVER_PORT', 5432),
+                'port'        => (int) imiGetEnv('PGSQL_SERVER_PORT', 5432),
                 'username'    => imiGetEnv('PGSQL_SERVER_USERNAME', 'root'),
                 'password'    => imiGetEnv('PGSQL_SERVER_PASSWORD', 'root'),
                 'database'    => 'db_imi_test',
@@ -120,7 +120,7 @@
             'maindb' => [
                 'dbClass'     => 'PdoPgsqlDriver',
                 'host'        => imiGetEnv('PGSQL_SERVER_HOST', '127.0.0.1'),
-                'port'        => imiGetEnv('PGSQL_SERVER_PORT', 5432),
+                'port'        => (int) imiGetEnv('PGSQL_SERVER_PORT', 5432),
                 'username'    => imiGetEnv('PGSQL_SERVER_USERNAME', 'root'),
                 'password'    => imiGetEnv('PGSQL_SERVER_PASSWORD', 'root'),
                 'database'    => 'db_imi_test',