add explicit type declarations on class properties

swoole · Dec 9, 2023 · 1de2307 · 1de2307
1 parent 2c15750
commit 1de2307
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 31 deletions.
diff --git a/src/core/Coroutine/WaitGroup.php b/src/core/Coroutine/WaitGroup.php
@@ -13,11 +13,11 @@
 
 class WaitGroup
 {
-    protected $chan;
+    protected Channel $chan;
 
-    protected $count = 0;
+    protected int $count = 0;
 
-    protected $waiting = false;
+    protected bool $waiting = false;
 
     public function __construct(int $delta = 0)
     {

diff --git a/src/core/Database/RedisPool.php b/src/core/Database/RedisPool.php
@@ -20,12 +20,8 @@
  */
 class RedisPool extends ConnectionPool
 {
-    /** @var RedisConfig */
-    protected $config;
-
-    public function __construct(RedisConfig $config, int $size = self::DEFAULT_SIZE)
+    public function __construct(protected RedisConfig $config, int $size = self::DEFAULT_SIZE)
     {
-        $this->config = $config;
         parent::__construct(function () {
             $redis = new \Redis();
             /* Compatible with different versions of Redis extension as much as possible */

diff --git a/src/core/FastCGI/HttpRequest.php b/src/core/FastCGI/HttpRequest.php
@@ -13,7 +13,7 @@
 
 class HttpRequest extends Request
 {
-    protected $params = [
+    protected array $params = [
         'REQUEST_SCHEME'    => 'http',
         'REQUEST_METHOD'    => 'GET',
         'DOCUMENT_ROOT'     => '',

diff --git a/src/core/FastCGI/Message.php b/src/core/FastCGI/Message.php
@@ -13,14 +13,11 @@
 
 class Message
 {
-    /** @var array */
-    protected $params = [];
+    protected array $params = [];
 
-    /** @var string */
-    protected $body = '';
+    protected string $body = '';
 
-    /** @var string */
-    protected $error = '';
+    protected string $error = '';
 
     public function getParam(string $name): ?string
     {

diff --git a/src/core/FastCGI/Record.php b/src/core/FastCGI/Record.php
@@ -20,38 +20,28 @@ class Record implements \Stringable
 {
     /**
      * Identifies the FastCGI protocol version.
-     *
-     * @var int
      */
-    protected $version = FastCGI::VERSION_1;
+    protected int $version = FastCGI::VERSION_1;
 
     /**
      * Identifies the FastCGI record type, i.e. the general function that the record performs.
-     *
-     * @var int
      */
-    protected $type = FastCGI::UNKNOWN_TYPE;
+    protected int $type = FastCGI::UNKNOWN_TYPE;
 
     /**
      * Identifies the FastCGI request to which the record belongs.
-     *
-     * @var int
      */
-    protected $requestId = FastCGI::DEFAULT_REQUEST_ID;
+    protected int $requestId = FastCGI::DEFAULT_REQUEST_ID;
 
     /**
      * Reserved byte for future proposes
-     *
-     * @var int
      */
-    protected $reserved = 0;
+    protected int $reserved = 0;
 
     /**
      * The number of bytes in the contentData component of the record.
-     *
-     * @var int
      */
-    private $contentLength = 0;
+    private int $contentLength = 0;
 
     /**
      * The number of bytes in the paddingData component of the record.

diff --git a/src/core/FastCGI/Request.php b/src/core/FastCGI/Request.php
@@ -18,7 +18,7 @@
 
 class Request extends Message implements \Stringable
 {
-    protected $keepConn = false;
+    protected bool $keepConn = false;
 
     public function __toString(): string
     {