Add type declarations

Author: odan

src/Rar4FileReader.php

@@ -30,20 +30,11 @@
  */
 final class Rar4FileReader
 {
-    /**
-     * @var BinaryFileReader
-     */
-    private $fileReader;
+    private BinaryFileReader $fileReader;
 
-    /**
-     * @var BitConverter
-     */
-    private $bit;
+    private BitConverter $bit;
 
-    /**
-     * @var DateTimeConverter
-     */
-    private $dateTime;
+    private DateTimeConverter $dateTime;
 
     /**
      * The constructor.

src/Struct/RarArchiveStruct.php

@@ -10,25 +10,25 @@ final class RarArchiveStruct
     /**
      * @var int The RAR version
      */
-    public $version = 4;
+    public int $version = 4;
 
     /**
      * @var string 7 bytes (0x52 0x61 0x72 0x21 0x1A 0x07 0x00)
      */
-    public $signature;
+    public string $signature = '';
 
     /**
-     * @var RarMainHeadStruct
+     * @var RarMainHeadStruct|null
      */
-    public $mainHead;
+    public ?RarMainHeadStruct $mainHead = null;
 
     /**
      * @var RarFileHeadStruct[]
      */
-    public $files = [];
+    public array $files = [];
 
     /**
      * @var RarVolumeHeaderStruct[] (Not supported)
      */
-    public $volumeHeaders = [];
+    public array $volumeHeaders = [];
 }

src/Struct/RarExtTimeStruct.php

@@ -12,40 +12,40 @@ final class RarExtTimeStruct
     /**
      * @var int
      */
-    public $size;
+    public int $size = 0;
 
     /**
      * @var int
      */
-    public $type;
+    public int $type = 0;
 
     /**
      * @var int
      */
-    public $flags;
+    public int $flags = 0;
 
     /**
      * @var DateTimeImmutable|null
      */
-    public $mtime;
+    public ?DateTimeImmutable $mtime = null;
 
     /**
      * @var DateTimeImmutable|null
      */
-    public $ctime;
+    public ?DateTimeImmutable $ctime = null;
 
     /**
      * @var DateTimeImmutable|null
      */
-    public $atime;
+    public ?DateTimeImmutable $atime = null;
 
     /**
      * @var DateTimeImmutable|null
      */
-    public $arctime;
+    public ?DateTimeImmutable $arctime = null;
 
     /**
      * @var bool
      */
-    public $isUnixFormat;
+    public bool $isUnixFormat = false;
 }

src/Struct/RarFileHeadStruct.php

@@ -12,86 +12,87 @@ final class RarFileHeadStruct
     /**
      * @var int 4 bytes
      */
-    public $packSize;
+    public int $packSize = 0;
 
     /**
      * @var int 4 bytes
      */
-    public $lowUnpackSize;
+    public int $lowUnpackSize = 0;
 
     /**
      * @var int 1 byte
      */
-    public $hostOS;
+    public int $hostOS = 0;
 
     /**
      * @var string 4 bytes
      */
-    public $fileCRC;
+    public string $fileCRC = '';
 
     /**
      * @var DateTimeImmutable 4 bytes
      */
-    public $fileTime;
+    public DateTimeImmutable $fileTime;
 
     /**
-     * @var int 1 bytes
+     * @var int 1 byte
      */
-    public $unpVer;
+    public int $unpVer = 0;
 
     /**
      * @var int 1 byte
+     *
      * 0 = Store (no compression)
      * 1 = Fastest
      * 2 = Fast
      * 3 = Normal (corresponds to m3)
      * 4 = Good
      * 5 = Best
      */
-    public $method;
+    public int $method = 0;
 
     /**
      * @var int 2 bytes
      */
-    public $nameSize;
+    public int $nameSize = 0;
 
     /**
      * @var int 4 bytes
      */
-    public $fileAttr;
+    public int $fileAttr = 0;
 
     /**
      * @var int 4 bytes (only present if LHD_LARGE is set)
      */
-    public $highPackSize = 0;
+    public int $highPackSize = 0;
 
     /**
      * @var int 4 bytes (only present if LHD_LARGE is set)
      */
-    public $highUnpackSize = 0;
+    public int $highUnpackSize = 0;
 
     /**
-     * @var string (NameSize) bytes
+     * @var string Filename
      */
-    public $fileName = '';
+    public string $fileName = '';
 
     /**
      * @var string 8 bytes (only present if LHD_SALT is set)
      */
-    public $salt;
+    public string $salt = '';
 
     /**
-     * @var RarExtTimeStruct Structure, See Description (only present if LHD_EXTTIME is set)
+     * @var RarExtTimeStruct|null Structure, See Description (only present if LHD_EXTTIME is set)
      */
-    public $extTime;
+    public ?RarExtTimeStruct $extTime = null;
 
     /**
      * @var int
      */
-    public $unpackSize;
+    public int $unpackSize = 0;
 
     /**
      * @var bool
      */
-    public $isDirectory = false;
+    public bool $isDirectory = false;
 }

src/Struct/RarMainHeadStruct.php

@@ -10,15 +10,15 @@ final class RarMainHeadStruct
     /**
      * @var int 2 bytes
      */
-    public $highPosAv;
+    public int $highPosAv = 0;
 
     /**
      * @var int 4 bytes
      */
-    public $posAv;
+    public int $posAv = 0;
 
     /**
      * @var int 1 byte Value 0x0200 (512). Indicates whether encryption is present in the archive volume.
      */
-    public $encryptVer;
+    public int $encryptVer = 0;
 }

src/Struct/RarVolumeHeaderStruct.php

@@ -10,45 +10,45 @@ final class RarVolumeHeaderStruct
     /**
      * @var string 2 bytes
      */
-    public $crc = '';
+    public string $crc = '';
 
     /**
-     * @var int 1 bytes
+     * @var int 1 byte
      */
-    public $type = 0;
+    public int $type = 0;
 
     /**
      * @var int 2 byte
      */
-    public $flags = 0;
+    public int $flags = 0;
 
     /**
      * @var int 2 byte
      */
-    public $size = 0;
+    public int $size = 0;
 
     /**
      * @var int 4 byte
      */
-    public $addSize = 0;
+    public int $addSize = 0;
 
     /**
      * @var int
      */
-    public $blockSize = 0;
+    public int $blockSize = 0;
 
     /**
      * @var bool
      */
-    public $hasAdd;
+    public bool $hasAdd = false;
 
     /**
      * @var int
      */
-    public $headerSize;
+    public int $headerSize = 0;
 
     /**
      * @var int
      */
-    public $bodySize;
+    public int $bodySize = 0;
 }