From 96128112ca436237bd76ee372e6f274da6219be2 Mon Sep 17 00:00:00 2001
From: Aranya Sen <sen.aranya@gmail.com>
Date: Sat, 31 Dec 2022 17:42:17 +0530
Subject: [PATCH] Upgrade minimum php version to 8.0 (#90)

* #89 Update minimum php version to 8.0

* Code refactor and cleanup
* Declare strict
* Remove redundant phpdocs
---
 .github/workflows/main_ci.yml   |   2 +-
 README.md                       |   6 +-
 composer.json                   |   2 +-
 src/HL7.php                     |  31 ++++------
 src/HL7/Connection.php          |  13 +---
 src/HL7/Message.php             |  78 ++++++++----------------
 src/HL7/MessageHelpersTrait.php |  44 ++------------
 src/HL7/Messages/ACK.php        |   6 +-
 src/HL7/Segment.php             |  10 +---
 src/HL7/Segments/AIG.php        |   3 +-
 src/HL7/Segments/AIL.php        |   3 +-
 src/HL7/Segments/AIP.php        |   3 +-
 src/HL7/Segments/DG1.php        |   6 +-
 src/HL7/Segments/EQU.php        |   3 +-
 src/HL7/Segments/FHS.php        |   2 +
 src/HL7/Segments/FTS.php        |   2 +
 src/HL7/Segments/GT1.php        |   4 +-
 src/HL7/Segments/IN1.php        |   3 +-
 src/HL7/Segments/IN3.php        |   3 +-
 src/HL7/Segments/MRG.php        |   2 +
 src/HL7/Segments/MSA.php        |   2 +
 src/HL7/Segments/MSH.php        |  11 +---
 src/HL7/Segments/NK1.php        |   1 -
 src/HL7/Segments/NTE.php        |   3 +-
 src/HL7/Segments/OBR.php        |   5 +-
 src/HL7/Segments/OBX.php        |   6 +-
 src/HL7/Segments/ORC.php        |   2 +
 src/HL7/Segments/PID.php        |   9 +--
 src/HL7/Segments/PV1.php        | 101 +-------------------------------
 src/HL7/Segments/PV2.php        |  96 +-----------------------------
 src/HL7/Segments/RGS.php        |   6 +-
 src/HL7/Segments/SAC.php        |   5 +-
 src/HL7/Segments/SCH.php        |   2 +
 src/HL7/Segments/TQ1.php        |   2 +
 tests/Segments/OBXTest.php      |  22 +++++++
 tests/Segments/PIDTest.php      |   2 +
 36 files changed, 132 insertions(+), 369 deletions(-)
 create mode 100644 tests/Segments/OBXTest.php

diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
index ed46e8a..da91338 100644
--- a/.github/workflows/main_ci.yml
+++ b/.github/workflows/main_ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.3', '7.4', '8.0', '8.1' ]
+        php-versions: [ '8.0', '8.1', '8.2' ]
     name: PHP ${{ matrix.php-versions }} Test on ubuntu-latest
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index 81a05f3..d54a765 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,11 @@
 <a href="https://packagist.org/packages/aranyasen/hl7"><img src="https://poser.pugx.org/aranyasen/hl7/license" alt="License"></a>
 </p>
 
-**Important: Supported PHP version has been updated to 7.3+. Last supported versions: for PHP 7.2 => [2.0.2](https://github.com/senaranya/HL7/tree/2.0.2), for PHP 7.0 or 7.1 => [1.5.4](https://github.com/senaranya/HL7/tree/1.5.4)**
+**Important: Minimum supported PHP version has been updated to 8.0 <br>
+Last supported versions: <br>
+-> PHP 7.0 or 7.1 => [1.5.4](https://github.com/senaranya/HL7/tree/1.5.4)<br>
+-> PHP 7.2 => [2.0.2](https://github.com/senaranya/HL7/tree/2.0.2)<br>
+-> PHP 7.4 => [2.1.7](https://github.com/senaranya/HL7/tree/2.1.7)**
 
 ## Introduction
 
diff --git a/composer.json b/composer.json
index d45c475..d3719f1 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "minimum-stability": "dev",
     "prefer-stable" : true,
     "require": {
-        "php": ">=7.3",
+        "php": "^8.0",
         "ext-mbstring": "*"
     },
     "require-dev": {
diff --git a/src/HL7.php b/src/HL7.php
index 5e18277..559d4a6 100644
--- a/src/HL7.php
+++ b/src/HL7.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen;
 
 use InvalidArgumentException;
@@ -40,8 +42,7 @@ public function __construct()
     /**
      * Create a new Message, using the global HL7 variables as defaults.
      *
-     * @param string|null Text representation of an HL7 message
-     * @return Message
+     * @param string|null  $msgStr  Text representation of an HL7 message
      * @throws \Exception
      * @throws \InvalidArgumentException
      */
@@ -52,8 +53,7 @@ public function createMessage(string $msgStr = null): Message
 
     /**
      * Create a new MSH segment, using the global HL7 variables as defaults.
-     * @return MSH
-     * @throws \InvalidArgumentException
+     * @throws \Exception
      */
     public function createMSH(): MSH
     {
@@ -64,7 +64,7 @@ public function createMSH(): MSH
      * Set the component separator to be used by the factory. Should be a single character. Default ^
      *
      * @param string $value Component separator char.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setComponentSeparator(string $value): bool
@@ -81,7 +81,7 @@ public function setComponentSeparator(string $value): bool
      * Set the subcomponent separator to be used by the factory. Should be a single character. Default: &
      *
      * @param string $value Subcomponent separator char.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setSubcomponentSeparator(string $value): bool
@@ -98,7 +98,7 @@ public function setSubcomponentSeparator(string $value): bool
      * Set the repetition separator to be used by the factory. Should be a single character. Default: ~
      *
      * @param string $value Repetition separator char.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setRepetitionSeparator(string $value): bool
@@ -115,7 +115,7 @@ public function setRepetitionSeparator(string $value): bool
      * Set the field separator to be used by the factory. Should be a single character. Default: |
      *
      * @param string $value Field separator char.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setFieldSeparator(string $value): bool
@@ -132,7 +132,7 @@ public function setFieldSeparator(string $value): bool
      * Set the segment separator to be used by the factory. Should be a single character. Default: \015
      *
      * @param string $value separator char.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setSegmentSeparator(string $value): bool
@@ -148,7 +148,7 @@ public function setSegmentSeparator(string $value): bool
      * Set the escape character to be used by the factory. Should be a single character. Default: \
      *
      * @param string $value Escape character.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      * @throws \InvalidArgumentException
      */
     public function setEscapeCharacter(string $value): bool
@@ -164,7 +164,7 @@ public function setEscapeCharacter(string $value): bool
      * Set the HL7 version to be used by the factory. Default 2.3
      *
      * @param string HL7 version character.
-     * @return boolean true if value has been set.
+     * @return bool true if value has been set.
      */
     public function setHL7Version(string $value): bool
     {
@@ -174,8 +174,8 @@ public function setHL7Version(string $value): bool
     /**
      * Set the NULL string to be used by the factory.
      *
-     * @param string NULL string.
-     * @return boolean true if value has been set.
+     * @param string  $value  NULL string.
+     * @return bool true if value has been set.
      */
     public function setNull($value): bool
     {
@@ -194,11 +194,6 @@ public function getNull()
 
     /**
      * Set the HL7 global variable
-     *
-     * @access protected
-     * @param string $name
-     * @param string $value
-     * @return bool
      */
     protected function setGlobal(string $name, string $value): bool
     {
diff --git a/src/HL7/Connection.php b/src/HL7/Connection.php
index 2d627d8..ae1a0be 100644
--- a/src/HL7/Connection.php
+++ b/src/HL7/Connection.php
@@ -64,8 +64,6 @@ public function __construct(string $host, int $port, int $timeout = 10)
     /**
      * Create a client-side TCP socket
      *
-     * @param string $host
-     * @param int $port
      * @param int $timeout Connection timeout
      * @throws HL7ConnectionException
      */
@@ -96,7 +94,7 @@ protected function setSocket(string $host, int $port, int $timeout = 10): void
         $result = null;
         try {
             $result = socket_connect($socket, $host, $port);
-        } catch (Exception $exception) {
+        } catch (Exception) {
             $this->throwSocketError("Failed to connect to server ($host:$port)");
         }
         if (!$result) {
@@ -107,7 +105,6 @@ protected function setSocket(string $host, int $port, int $timeout = 10): void
     }
 
     /**
-     * @param string $message
      * @throws HL7ConnectionException
      */
     protected function throwSocketError(string $message): void
@@ -118,14 +115,10 @@ protected function throwSocketError(string $message): void
     /**
      * Sends a Message object over this connection.
      *
-     * @param Message $msg
-     * @param string $responseCharEncoding The expected character encoding of the response.
-     * @param bool $noWait Do no wait for ACK. Helpful for building load testing tools...
-     * @return Message|null
+     * @param  string  $responseCharEncoding  The expected character encoding of the response.
+     * @param  bool  $noWait  Do no wait for ACK. Helpful for building load testing tools...
      * @throws HL7ConnectionException
      * @throws HL7Exception
-     * @throws ReflectionException
-     * @access public
      */
     public function send(Message $msg, string $responseCharEncoding = 'UTF-8', bool $noWait = false): ?Message
     {
diff --git a/src/HL7/Message.php b/src/HL7/Message.php
index 2b8ec70..90cc146 100644
--- a/src/HL7/Message.php
+++ b/src/HL7/Message.php
@@ -22,10 +22,9 @@ class Message
 {
     use MessageHelpersTrait;
 
-    /**
-     * Array holding all segments of this message.
-     */
-    protected $segments;
+
+    /** @var array Array holding all segments of this message */
+    protected array $segments = [];
 
     /**
      * local value for segment separator
@@ -76,9 +75,6 @@ public function __construct(
         bool $autoIncrementIndices = true,
         bool $doNotSplitRepetition = null
     ) {
-        // Array holding the segments
-        $this->segments = [];
-
         // Control characters and other HL7 properties
         $this->segmentSeparator = $hl7Globals['SEGMENT_SEPARATOR'] ?? '\n';
         $this->segmentEndingBar = $hl7Globals['SEGMENT_ENDING_BAR'] ?? true; // '|' at end of each segment
@@ -109,7 +105,7 @@ public function __construct(
             $segmentName = array_shift($fields);
 
             foreach ($fields as $j => $field) {
-                // Skip control field
+                // Skip control field (i.e. first field in MSH segment)
                 if ($index === 0 && $j === 0) {
                     continue;
                 }
@@ -117,24 +113,7 @@ public function __construct(
                 $fields[$j] = $this->extractComponentsFromField($field, $keepEmptySubFields);
             }
 
-            $segment = null;
-
-            // If a class exists for the segment under segments/, (e.g., MSH)
-            $className = "Aranyasen\\HL7\\Segments\\$segmentName";
-            if (class_exists($className)) {
-                if ($segmentName === 'MSH') {
-                    array_unshift($fields, $this->fieldSeparator); # First field for MSH is '|'
-                    $segment = new $className($fields);
-                } else {
-                    $segment = new $className($fields, $autoIncrementIndices);
-                }
-            } else {
-                $segment = new Segment($segmentName, $fields);
-            }
-
-            if (!$segment) {
-                trigger_error('Segment not created', E_USER_WARNING);
-            }
+            $segment = $this->getSegmentClass($segmentName, $fields, $autoIncrementIndices);
 
             $this->addSegment($segment);
         }
@@ -142,10 +121,6 @@ public function __construct(
 
     /**
      * Append a segment to the end of the message
-     *
-     * @param Segment $segment
-     * @return bool
-     * @access public
      */
     public function addSegment(Segment $segment): bool
     {
@@ -161,9 +136,8 @@ public function addSegment(Segment $segment): bool
     /**
      * Insert a segment.
      *
-     * @param Segment $segment
      * @param null|int $index Index where segment is inserted
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function insertSegment(Segment $segment, int $index = null): void
     {
@@ -193,7 +167,6 @@ public function insertSegment(Segment $segment, int $index = null): void
      * Note: Segment count within the message starts at 0.
      *
      * @param int $index Index where segment is inserted
-     * @return Segment
      */
     public function getSegmentByIndex(int $index): ?Segment
     {
@@ -204,10 +177,6 @@ public function getSegmentByIndex(int $index): ?Segment
         return $this->segments[$index];
     }
 
-    /**
-     * @param Segment $segment
-     * @return int|null
-     */
     public function getSegmentIndex(Segment $segment): ?int
     {
         foreach ($this->segments as $ii => $value) {
@@ -244,8 +213,6 @@ public function getSegmentsByName(string $name): array
      * after this one will be moved one index up.
      *
      * @param int $index Index where segment is removed
-     * @return boolean
-     * @access public
      */
     public function removeSegmentByIndex(int $index): bool
     {
@@ -259,7 +226,6 @@ public function removeSegmentByIndex(int $index): bool
     /**
      * Remove given segment
      *
-     * @param string $segmentName
      * @return int Count of segments removed
      */
     public function removeSegmentsByName(string $segmentName): int
@@ -278,9 +244,7 @@ public function removeSegmentsByName(string $segmentName): int
      * If index is out of range, or not provided, do nothing. Setting MSH on index 0 will re-validate field separator,
      * control characters and hl7 version, based on MSH(1), MSH(2) and MSH(12).
      *
-     * @param Segment $segment
      * @param int $index Index where segment is set
-     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function setSegment(Segment $segment, int $index): bool
@@ -300,10 +264,6 @@ public function setSegment(Segment $segment, int $index): bool
 
     /**
      * After change of MSH, reset control fields
-     *
-     * @param Segment $segment
-     * @return bool
-     * @access protected
      */
     protected function resetCtrl(Segment $segment): bool
     {
@@ -372,8 +332,6 @@ public function toString(bool $pretty = false)
 
     /**
      * Convert Segment object to string
-     * @param  Segment  $seg
-     * @return string
      */
     public function segmentToString(Segment $seg): string
     {
@@ -404,8 +362,6 @@ public function segmentToString(Segment $seg): string
 
     /**
      * Reset index attribute of each given segment, so when those are added the indices start from 1
-     *
-     * @return void
      */
     public function resetSegmentIndices(): void
     {
@@ -422,8 +378,6 @@ public function resetSegmentIndices(): void
     }
 
     /**
-     * @param string $field
-     * @param bool $keepEmptySubFields
      * @return array|string
      */
     private function extractComponentsFromField(string $field, bool $keepEmptySubFields)
@@ -432,7 +386,7 @@ private function extractComponentsFromField(string $field, bool $keepEmptySubFie
             ? 0
             : PREG_SPLIT_NO_EMPTY;
 
-        if ((strpos($field, $this->repetitionSeparator) !== false) && (! $this->doNotSplitRepetition)) {
+        if ((str_contains($field, $this->repetitionSeparator)) && (! $this->doNotSplitRepetition)) {
             $components = preg_split("/\\" . $this->repetitionSeparator . '/', $field, -1, $pregFlags);
             $fields = [];
             foreach ($components as $index => $component) {
@@ -459,8 +413,6 @@ private function extractComponentsFromField(string $field, bool $keepEmptySubFie
     /**
      * Set various separators - segment, field etc.
      *
-     * @param  string  $msh
-     * @return void
      * @throws HL7Exception
      */
     private function setSeparators(string $msh): void
@@ -485,4 +437,20 @@ private function setSeparators(string $msh): void
         $this->escapeChar = $esc;
         $this->repetitionSeparator = $repSep;
     }
+
+    private function getSegmentClass(string $segmentName, array $fields, bool $autoIncrementIndices): Segment
+    {
+        // If a class exists for the segment under segments/, (e.g., MSH)
+        $className = "Aranyasen\\HL7\\Segments\\$segmentName";
+        if (!class_exists($className)) {
+            return new Segment($segmentName, $fields);
+        }
+
+        if ($segmentName === 'MSH') {
+            array_unshift($fields, $this->fieldSeparator); # First field for MSH is '|'
+            return new $className($fields);
+        }
+
+        return new $className($fields, $autoIncrementIndices);
+    }
 }
diff --git a/src/HL7/MessageHelpersTrait.php b/src/HL7/MessageHelpersTrait.php
index a80a6a3..7d5da55 100644
--- a/src/HL7/MessageHelpersTrait.php
+++ b/src/HL7/MessageHelpersTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7;
 
 use Aranyasen\Exceptions\HL7Exception;
@@ -32,7 +34,6 @@ public function getSegmentAsString(int $index): ?string
      * @param int $segmentIndex Index for segment to get
      * @param int $fieldIndex Index for field to get
      * @return null|string String representation of field
-     * @access public
      */
     public function getSegmentFieldAsString(int $segmentIndex, int $fieldIndex): ?string
     {
@@ -70,7 +71,6 @@ public function getSegmentFieldAsString(int $segmentIndex, int $fieldIndex): ?st
     /**
      * Write HL7 to a file
      *
-     * @param string $filename
      * @throws HL7Exception
      */
     public function toFile(string $filename): void
@@ -81,59 +81,36 @@ public function toFile(string $filename): void
         }
     }
 
-    /**
-     * Check if given message is an ORM
-     *
-     * @return bool
-     */
     public function isOrm(): bool
     {
         /** @var MSH $msh */
         $msh = $this->getFirstSegmentInstance('MSH');
-        return false !== strpos($msh->getMessageType(), 'ORM');
+        return str_contains($msh->getMessageType(), 'ORM');
     }
 
-    /**
-     * Check if given message is an ORU
-     *
-     * @return bool
-     */
     public function isOru(): bool
     {
         /** @var MSH $msh */
         $msh = $this->getFirstSegmentInstance('MSH');
-        return false !== strpos($msh->getMessageType(), 'ORU');
+        return str_contains($msh->getMessageType(), 'ORU');
     }
 
-    /**
-     * Check if given message is an ADT
-     *
-     * @return bool
-     */
     public function isAdt(): bool
     {
         /** @var MSH $msh */
         $msh = $this->getFirstSegmentInstance('MSH');
-        return false !== strpos($msh->getMessageType(), 'ADT');
+        return str_contains($msh->getMessageType(), 'ADT');
     }
 
-    /**
-     * Check if given message is a SIU
-     *
-     * @return bool
-     */
     public function isSiu(): bool
     {
         /** @var MSH $msh */
         $msh = $this->getFirstSegmentInstance('MSH');
-        return false !== strpos($msh->getMessageType(), 'SIU');
+        return str_contains($msh->getMessageType(), 'SIU');
     }
 
     /**
      * Check if given segment is present in the message object
-     *
-     * @param string $segment
-     * @return bool
      */
     public function hasSegment(string $segment): bool
     {
@@ -143,7 +120,6 @@ public function hasSegment(string $segment): bool
     /**
      * Return the first segment with given name in the message
      *
-     * @param string $segment name of the segment to return
      * @return mixed|null
      */
     public function getFirstSegmentInstance(string $segment)
@@ -155,9 +131,6 @@ public function getFirstSegmentInstance(string $segment)
     }
 
     /**
-     * Remove a segment from the message
-     *
-     * @param Segment $segment
      * @param bool $reIndex After deleting, re-index remaining segments of same name
      */
     public function removeSegment(Segment $segment, bool $reIndex = false): void
@@ -178,11 +151,6 @@ public function removeSegment(Segment $segment, bool $reIndex = false): void
         }
     }
 
-    /**
-     * Check if the message has any data
-     *
-     * @return bool
-     */
     public function isEmpty(): bool
     {
         return empty($this->getSegments());
diff --git a/src/HL7/Messages/ACK.php b/src/HL7/Messages/ACK.php
index bf638ca..6f8ed06 100644
--- a/src/HL7/Messages/ACK.php
+++ b/src/HL7/Messages/ACK.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Messages;
 
 use Aranyasen\HL7\Message;
-use Aranyasen\HL7\Segment;
 use Aranyasen\HL7\Segments\MSA;
 use Aranyasen\HL7\Segments\MSH;
 
@@ -78,8 +79,6 @@ public function __construct(Message $req = null, MSH $reqMsh = null, array $hl7G
      *
      * @param  string  $code  Code to use in acknowledgement
      * @param  string|null  $msg  Acknowledgement message
-     * @return boolean
-     * @access public
      */
     public function setAckCode(string $code, string $msg = null): bool
     {
@@ -112,7 +111,6 @@ public function setAckCode(string $code, string $msg = null): bool
      * This will also set the error code to either AE or CE, depending on the mode of the incoming message.
      *
      * @param string $msg Error message
-     * @access public
      */
     public function setErrorMessage(string $msg): void
     {
diff --git a/src/HL7/Segment.php b/src/HL7/Segment.php
index 5d1d386..4d353c3 100644
--- a/src/HL7/Segment.php
+++ b/src/HL7/Segment.php
@@ -8,7 +8,7 @@
 
 class Segment
 {
-    protected $fields;
+    protected array $fields = [];
 
     /**
      * Create a segment.
@@ -39,8 +39,6 @@ public function __construct(string $name, array $fields = null)
             throw new InvalidArgumentException("Segment name '$name' should be 3 characters and in uppercase");
         }
 
-        $this->fields = [];
-
         $this->fields[0] = $name;
 
         if (\is_array($fields)) {
@@ -69,7 +67,6 @@ public function __construct(string $name, array $fields = null)
      *
      * @param int $index Index to set
      * @param string|array $value Value for field
-     * @return boolean
      */
     public function setField(int $index, $value = ''): bool
     {
@@ -108,7 +105,6 @@ private function isValueEmpty($value): bool
      * Remove any existing value from the field
      *
      * @param int $index Field index
-     * @return void
      */
     public function clearField(int $index): void
     {
@@ -136,7 +132,6 @@ public function getField(int $index)
      * Get the number of fields for this segment, not including the name
      *
      * @return int number of fields
-     * @access public
      */
     public function size(): int
     {
@@ -164,8 +159,7 @@ public function getFields(int $from = 0, int $to = null): array
     /**
      * Get the name of the segment. This is basically the value at index 0
      *
-     * @return mixed Name of segment
-     * @access public
+     * @return string Name of segment
      */
     public function getName(): string
     {
diff --git a/src/HL7/Segments/AIG.php b/src/HL7/Segments/AIG.php
index 9f9768e..e789340 100644
--- a/src/HL7/Segments/AIG.php
+++ b/src/HL7/Segments/AIG.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -37,7 +39,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/AIL.php b/src/HL7/Segments/AIL.php
index 0be0185..bb5907d 100644
--- a/src/HL7/Segments/AIL.php
+++ b/src/HL7/Segments/AIL.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -38,7 +40,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/AIP.php b/src/HL7/Segments/AIP.php
index 947d9a0..facc15d 100644
--- a/src/HL7/Segments/AIP.php
+++ b/src/HL7/Segments/AIP.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -38,7 +40,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/DG1.php b/src/HL7/Segments/DG1.php
index bbc6bb2..66b78b0 100644
--- a/src/HL7/Segments/DG1.php
+++ b/src/HL7/Segments/DG1.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -12,9 +14,8 @@ class DG1 extends Segment
 {
     /**
      * Index of this segment. Incremented for every new segment of this class created
-     * @var int
      */
-    protected static $setId = 1;
+    protected static int $setId = 1;
 
     public function __construct(array $fields = null, bool $autoIncrementIndices = true)
     {
@@ -31,7 +32,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/EQU.php b/src/HL7/Segments/EQU.php
index 2b7a4f8..816c02b 100644
--- a/src/HL7/Segments/EQU.php
+++ b/src/HL7/Segments/EQU.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -23,7 +25,6 @@ public function __construct(array $fields = null)
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/FHS.php b/src/HL7/Segments/FHS.php
index 85c78ce..6b119a1 100644
--- a/src/HL7/Segments/FHS.php
+++ b/src/HL7/Segments/FHS.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/FTS.php b/src/HL7/Segments/FTS.php
index 56c22e2..f4a01c0 100644
--- a/src/HL7/Segments/FTS.php
+++ b/src/HL7/Segments/FTS.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/GT1.php b/src/HL7/Segments/GT1.php
index 5cf0168..5eb06e2 100644
--- a/src/HL7/Segments/GT1.php
+++ b/src/HL7/Segments/GT1.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -32,8 +34,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     *
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/IN1.php b/src/HL7/Segments/IN1.php
index c7c171a..7785db5 100644
--- a/src/HL7/Segments/IN1.php
+++ b/src/HL7/Segments/IN1.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -31,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/IN3.php b/src/HL7/Segments/IN3.php
index 610f369..7dea517 100644
--- a/src/HL7/Segments/IN3.php
+++ b/src/HL7/Segments/IN3.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -31,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/MRG.php b/src/HL7/Segments/MRG.php
index 11a432a..c709bb8 100644
--- a/src/HL7/Segments/MRG.php
+++ b/src/HL7/Segments/MRG.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/MSA.php b/src/HL7/Segments/MSA.php
index 256c5f5..45a3b55 100644
--- a/src/HL7/Segments/MSA.php
+++ b/src/HL7/Segments/MSA.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/MSH.php b/src/HL7/Segments/MSH.php
index 6cab8ca..66a3f22 100644
--- a/src/HL7/Segments/MSH.php
+++ b/src/HL7/Segments/MSH.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -75,8 +77,6 @@ public function __construct(array $fields = null, array $hl7Globals = null)
      *
      * @param int $index Index of field
      * @param string $value
-     * @return bool
-     * @access public
      */
     public function setField(int $index, $value = ''): bool
     {
@@ -141,8 +141,6 @@ public function setSecurity($value, int $position = 8)
      * If it was empty then the new value will be just ORM.
      *
      * @param string $value
-     * @param int $position
-     * @return bool
      */
     public function setMessageType($value, int $position = 9): bool
     {
@@ -171,8 +169,6 @@ public function setMessageType($value, int $position = 9): bool
      * If trigger event was not set then it will set the new value.
      *
      * @param string $value
-     * @param int $position
-     * @return bool
      */
     public function setTriggerEvent($value, int $position = 9): bool
     {
@@ -264,8 +260,6 @@ public function getDateTimeOfMessage(int $position = 7)
 
     /**
      * ORM / ORU etc.
-     * @param int $position
-     * @return string
      */
     public function getMessageType(int $position = 9): string
     {
@@ -297,7 +291,6 @@ public function getProcessingId(int $position = 11)
 
     /**
      * Get HL7 version, e.g. 2.1, 2.3, 3.0 etc.
-     * @param int $position
      * @return array|null|string
      */
     public function getVersionId(int $position = 12)
diff --git a/src/HL7/Segments/NK1.php b/src/HL7/Segments/NK1.php
index be7c9d8..06afb5b 100644
--- a/src/HL7/Segments/NK1.php
+++ b/src/HL7/Segments/NK1.php
@@ -36,7 +36,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/NTE.php b/src/HL7/Segments/NTE.php
index 6276de4..68cd2e0 100644
--- a/src/HL7/Segments/NTE.php
+++ b/src/HL7/Segments/NTE.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -31,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/OBR.php b/src/HL7/Segments/OBR.php
index d05dc20..2f296b3 100644
--- a/src/HL7/Segments/OBR.php
+++ b/src/HL7/Segments/OBR.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -31,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
@@ -152,8 +153,6 @@ public function setFillerField2($value, int $position = 21)
      * ordering service would want only those results for which the reporting date/time is greater than the date/time
      * the inquiring application last received results.
      *
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setResultsRptStatusChngDateTime($value, int $position = 22)
diff --git a/src/HL7/Segments/OBX.php b/src/HL7/Segments/OBX.php
index 7b967c6..dc3ea59 100644
--- a/src/HL7/Segments/OBX.php
+++ b/src/HL7/Segments/OBX.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -12,9 +14,8 @@ class OBX extends Segment
 {
     /**
      * Index of this segment. Incremented for every new segment of this class created
-     * @var int
      */
-    protected static $setId = 1;
+    protected static int $setId = 1;
 
     public function __construct(array $fields = null, bool $autoIncrementIndices = true)
     {
@@ -31,7 +32,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/ORC.php b/src/HL7/Segments/ORC.php
index a0a2720..e604316 100644
--- a/src/HL7/Segments/ORC.php
+++ b/src/HL7/Segments/ORC.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/PID.php b/src/HL7/Segments/PID.php
index d9c5aea..03cfec7 100644
--- a/src/HL7/Segments/PID.php
+++ b/src/HL7/Segments/PID.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -13,9 +15,8 @@ class PID extends Segment
 {
     /**
      * Index of this segment. Incremented for every new segment of this class created
-     * @var int
      */
-    protected static $setId = 1;
+    protected static int $setId = 1;
 
     public function __construct(array $fields = null, bool $autoIncrementIndices = true)
     {
@@ -32,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
@@ -52,8 +52,6 @@ public function setPatientID($value, int $position = 2)
     /**
      * Patient ID (Internal ID)
      * @param string $value
-     * @param int $position
-     * @return bool
      */
     public function setPatientIdentifierList($value, int $position = 3): bool
     {
@@ -215,7 +213,6 @@ public function getPatientID(int $position = 2)
 
     /**
      * Patient ID (Internal ID)
-     * @param int $position
      * @return array|null|string
      */
     public function getPatientIdentifierList(int $position = 3)
diff --git a/src/HL7/Segments/PV1.php b/src/HL7/Segments/PV1.php
index 995b544..598b2e5 100644
--- a/src/HL7/Segments/PV1.php
+++ b/src/HL7/Segments/PV1.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -31,7 +33,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
@@ -54,8 +55,6 @@ public function setAssignedPatientLocation($value, int $position = 3)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmissionType($value, int $position = 4)
@@ -64,8 +63,6 @@ public function setAdmissionType($value, int $position = 4)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPreAdmitNumber($value, int $position = 5)
@@ -74,8 +71,6 @@ public function setPreAdmitNumber($value, int $position = 5)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPriorPatientLocation($value, int $position = 6)
@@ -84,8 +79,6 @@ public function setPriorPatientLocation($value, int $position = 6)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAttendingDoctor($value, int $position = 7)
@@ -94,8 +87,6 @@ public function setAttendingDoctor($value, int $position = 7)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setReferringDoctor($value, int $position = 8)
@@ -104,8 +95,6 @@ public function setReferringDoctor($value, int $position = 8)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setConsultingDoctor($value, int $position = 9)
@@ -114,8 +103,6 @@ public function setConsultingDoctor($value, int $position = 9)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setHospitalService($value, int $position = 10)
@@ -124,8 +111,6 @@ public function setHospitalService($value, int $position = 10)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTemporaryLocation($value, int $position = 11)
@@ -134,8 +119,6 @@ public function setTemporaryLocation($value, int $position = 11)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPreAdmitTestIndicator($value, int $position = 12)
@@ -144,8 +127,6 @@ public function setPreAdmitTestIndicator($value, int $position = 12)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setReAdmissionIndicator($value, int $position = 13)
@@ -154,8 +135,6 @@ public function setReAdmissionIndicator($value, int $position = 13)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmitSource($value, int $position = 14)
@@ -164,8 +143,6 @@ public function setAdmitSource($value, int $position = 14)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAmbulatoryStatus($value, int $position = 15)
@@ -174,8 +151,6 @@ public function setAmbulatoryStatus($value, int $position = 15)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVipIndicator($value, int $position = 16)
@@ -184,8 +159,6 @@ public function setVipIndicator($value, int $position = 16)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmittingDoctor($value, int $position = 17)
@@ -194,8 +167,6 @@ public function setAdmittingDoctor($value, int $position = 17)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientType($value, int $position = 18)
@@ -204,8 +175,6 @@ public function setPatientType($value, int $position = 18)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitNumber($value, int $position = 19)
@@ -214,8 +183,6 @@ public function setVisitNumber($value, int $position = 19)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setFinancialClass($value, int $position = 20)
@@ -224,8 +191,6 @@ public function setFinancialClass($value, int $position = 20)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setChargePriceIndicator($value, int $position = 21)
@@ -234,8 +199,6 @@ public function setChargePriceIndicator($value, int $position = 21)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setCourtesyCode($value, int $position = 22)
@@ -244,8 +207,6 @@ public function setCourtesyCode($value, int $position = 22)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setCreditRating($value, int $position = 23)
@@ -254,8 +215,6 @@ public function setCreditRating($value, int $position = 23)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setContractCode($value, int $position = 24)
@@ -264,8 +223,6 @@ public function setContractCode($value, int $position = 24)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setContractEffectiveDate($value, int $position = 25)
@@ -274,8 +231,6 @@ public function setContractEffectiveDate($value, int $position = 25)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setContractAmount($value, int $position = 26)
@@ -284,8 +239,6 @@ public function setContractAmount($value, int $position = 26)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setContractPeriod($value, int $position = 27)
@@ -294,8 +247,6 @@ public function setContractPeriod($value, int $position = 27)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setInterestCode($value, int $position = 28)
@@ -304,8 +255,6 @@ public function setInterestCode($value, int $position = 28)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTransferToBadDebtCode($value, int $position = 29)
@@ -314,8 +263,6 @@ public function setTransferToBadDebtCode($value, int $position = 29)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTransferToBadDebtDate($value, int $position = 30)
@@ -324,8 +271,6 @@ public function setTransferToBadDebtDate($value, int $position = 30)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBadDebtAgencyCode($value, int $position = 31)
@@ -334,8 +279,6 @@ public function setBadDebtAgencyCode($value, int $position = 31)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBadDebtTransferAmount($value, int $position = 32)
@@ -344,8 +287,6 @@ public function setBadDebtTransferAmount($value, int $position = 32)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBadDebtRecoveryAmount($value, int $position = 33)
@@ -354,8 +295,6 @@ public function setBadDebtRecoveryAmount($value, int $position = 33)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDeleteAccountIndicator($value, int $position = 34)
@@ -364,8 +303,6 @@ public function setDeleteAccountIndicator($value, int $position = 34)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDeleteAccountDate($value, int $position = 35)
@@ -374,8 +311,6 @@ public function setDeleteAccountDate($value, int $position = 35)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDischargeDisposition($value, int $position = 36)
@@ -384,8 +319,6 @@ public function setDischargeDisposition($value, int $position = 36)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDischargedToLocation($value, int $position = 37)
@@ -394,8 +327,6 @@ public function setDischargedToLocation($value, int $position = 37)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDietType($value, int $position = 38)
@@ -404,8 +335,6 @@ public function setDietType($value, int $position = 38)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setServicingFacility($value, int $position = 39)
@@ -414,8 +343,6 @@ public function setServicingFacility($value, int $position = 39)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBedStatus($value, int $position = 40)
@@ -424,8 +351,6 @@ public function setBedStatus($value, int $position = 40)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAccountStatus($value, int $position = 41)
@@ -434,8 +359,6 @@ public function setAccountStatus($value, int $position = 41)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPendingLocation($value, int $position = 42)
@@ -444,8 +367,6 @@ public function setPendingLocation($value, int $position = 42)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPriorTemporaryLocation($value, int $position = 43)
@@ -454,8 +375,6 @@ public function setPriorTemporaryLocation($value, int $position = 43)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmitDateTime($value, int $position = 44)
@@ -464,8 +383,6 @@ public function setAdmitDateTime($value, int $position = 44)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setDischargeDateTime($value, int $position = 45)
@@ -474,8 +391,6 @@ public function setDischargeDateTime($value, int $position = 45)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setCurrentPatientBalance($value, int $position = 46)
@@ -484,8 +399,6 @@ public function setCurrentPatientBalance($value, int $position = 46)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTotalCharges($value, int $position = 47)
@@ -494,8 +407,6 @@ public function setTotalCharges($value, int $position = 47)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTotalAdjustments($value, int $position = 48)
@@ -504,8 +415,6 @@ public function setTotalAdjustments($value, int $position = 48)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTotalPayments($value, int $position = 49)
@@ -514,8 +423,6 @@ public function setTotalPayments($value, int $position = 49)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAlternateVisitID($value, int $position = 50)
@@ -524,8 +431,6 @@ public function setAlternateVisitID($value, int $position = 50)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitIndicator($value, int $position = 51)
@@ -534,8 +439,6 @@ public function setVisitIndicator($value, int $position = 51)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setOtherHealthcareProvider($value, int $position = 52)
diff --git a/src/HL7/Segments/PV2.php b/src/HL7/Segments/PV2.php
index fc4d04b..cc2b55c 100644
--- a/src/HL7/Segments/PV2.php
+++ b/src/HL7/Segments/PV2.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -19,8 +21,6 @@ public function __construct(array $fields = null)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPriorPendingLocation($value, int $position = 1)
@@ -29,8 +29,6 @@ public function setPriorPendingLocation($value, int $position = 1)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAccommodationCode($value, int $position = 2)
@@ -39,8 +37,6 @@ public function setAccommodationCode($value, int $position = 2)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmitReason($value, int $position = 3)
@@ -49,8 +45,6 @@ public function setAdmitReason($value, int $position = 3)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setTransferReason($value, int $position = 4)
@@ -59,8 +53,6 @@ public function setTransferReason($value, int $position = 4)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientValuables($value, int $position = 5)
@@ -69,8 +61,6 @@ public function setPatientValuables($value, int $position = 5)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientValuablesLocation($value, int $position = 6)
@@ -79,8 +69,6 @@ public function setPatientValuablesLocation($value, int $position = 6)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitUserCode($value, int $position = 7)
@@ -89,8 +77,6 @@ public function setVisitUserCode($value, int $position = 7)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedAdmitDateTime($value, int $position = 8)
@@ -99,8 +85,6 @@ public function setExpectedAdmitDateTime($value, int $position = 8)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedDischargeDateTime($value, int $position = 9)
@@ -109,8 +93,6 @@ public function setExpectedDischargeDateTime($value, int $position = 9)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setEstimatedLengthofInpatientStay($value, int $position = 10)
@@ -119,8 +101,6 @@ public function setEstimatedLengthofInpatientStay($value, int $position = 10)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setActualLengthOfInpatientStay($value, int $position = 11)
@@ -129,8 +109,6 @@ public function setActualLengthOfInpatientStay($value, int $position = 11)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitDescription($value, int $position = 12)
@@ -139,8 +117,6 @@ public function setVisitDescription($value, int $position = 12)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setReferralSourceCode($value, int $position = 13)
@@ -149,8 +125,6 @@ public function setReferralSourceCode($value, int $position = 13)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPreviousServiceDate($value, int $position = 14)
@@ -159,8 +133,6 @@ public function setPreviousServiceDate($value, int $position = 14)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setEmploymentIllnessRelatedIndicator($value, int $position = 15)
@@ -169,8 +141,6 @@ public function setEmploymentIllnessRelatedIndicator($value, int $position = 15)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPurgeStatusCode($value, int $position = 16)
@@ -179,8 +149,6 @@ public function setPurgeStatusCode($value, int $position = 16)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPurgeStatusDate($value, int $position = 17)
@@ -189,8 +157,6 @@ public function setPurgeStatusDate($value, int $position = 17)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setSpecialProgramCode($value, int $position = 18)
@@ -199,8 +165,6 @@ public function setSpecialProgramCode($value, int $position = 18)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setRetentionIndicator($value, int $position = 19)
@@ -209,8 +173,6 @@ public function setRetentionIndicator($value, int $position = 19)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedNumberOfInsurancePlans($value, int $position = 20)
@@ -219,8 +181,6 @@ public function setExpectedNumberOfInsurancePlans($value, int $position = 20)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitPublicityCode($value, int $position = 21)
@@ -229,8 +189,6 @@ public function setVisitPublicityCode($value, int $position = 21)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitProtectionIndicator($value, int $position = 22)
@@ -239,8 +197,6 @@ public function setVisitProtectionIndicator($value, int $position = 22)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setClinicOrganizationName($value, int $position = 23)
@@ -249,8 +205,6 @@ public function setClinicOrganizationName($value, int $position = 23)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientStatusCode($value, int $position = 24)
@@ -259,8 +213,6 @@ public function setPatientStatusCode($value, int $position = 24)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setVisitPriorityCode($value, int $position = 25)
@@ -269,8 +221,6 @@ public function setVisitPriorityCode($value, int $position = 25)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPreviousTreatmentDate($value, int $position = 26)
@@ -279,8 +229,6 @@ public function setPreviousTreatmentDate($value, int $position = 26)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedDischargeDisposition($value, int $position = 27)
@@ -289,8 +237,6 @@ public function setExpectedDischargeDisposition($value, int $position = 27)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setSignatureOnFileDate($value, int $position = 28)
@@ -299,8 +245,6 @@ public function setSignatureOnFileDate($value, int $position = 28)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setFirstSimilarIllnessDate($value, int $position = 29)
@@ -309,8 +253,6 @@ public function setFirstSimilarIllnessDate($value, int $position = 29)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientChargeAdjustmentCode($value, int $position = 30)
@@ -319,8 +261,6 @@ public function setPatientChargeAdjustmentCode($value, int $position = 30)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setRecurringServiceCode($value, int $position = 31)
@@ -329,8 +269,6 @@ public function setRecurringServiceCode($value, int $position = 31)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBillingMediaCode($value, int $position = 32)
@@ -339,8 +277,6 @@ public function setBillingMediaCode($value, int $position = 32)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedSurgeryDateAndTime($value, int $position = 33)
@@ -349,8 +285,6 @@ public function setExpectedSurgeryDateAndTime($value, int $position = 33)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setMilitaryPartnershipCode($value, int $position = 34)
@@ -359,8 +293,6 @@ public function setMilitaryPartnershipCode($value, int $position = 34)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setMilitaryNonAvailabilityCode($value, int $position = 35)
@@ -369,8 +301,6 @@ public function setMilitaryNonAvailabilityCode($value, int $position = 35)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setNewbornBabyIndicator($value, int $position = 36)
@@ -379,8 +309,6 @@ public function setNewbornBabyIndicator($value, int $position = 36)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setBabyDetainedIndicator($value, int $position = 37)
@@ -389,8 +317,6 @@ public function setBabyDetainedIndicator($value, int $position = 37)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setModeOfArrivalCode($value, int $position = 38)
@@ -399,8 +325,6 @@ public function setModeOfArrivalCode($value, int $position = 38)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setRecreationalDrugUseCode($value, int $position = 39)
@@ -409,8 +333,6 @@ public function setRecreationalDrugUseCode($value, int $position = 39)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdmissionLevelOfCareCode($value, int $position = 40)
@@ -419,8 +341,6 @@ public function setAdmissionLevelOfCareCode($value, int $position = 40)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPrecautionCode($value, int $position = 41)
@@ -429,8 +349,6 @@ public function setPrecautionCode($value, int $position = 41)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientConditionCode($value, int $position = 42)
@@ -439,8 +357,6 @@ public function setPatientConditionCode($value, int $position = 42)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setLivingWillCode($value, int $position = 43)
@@ -449,8 +365,6 @@ public function setLivingWillCode($value, int $position = 43)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setOrganDonorCode($value, int $position = 44)
@@ -459,8 +373,6 @@ public function setOrganDonorCode($value, int $position = 44)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setAdvanceDirectiveCode($value, int $position = 45)
@@ -469,8 +381,6 @@ public function setAdvanceDirectiveCode($value, int $position = 45)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setPatientStatusEffectiveDate($value, int $position = 46)
@@ -479,8 +389,6 @@ public function setPatientStatusEffectiveDate($value, int $position = 46)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      */
     public function setExpectedLOAReturnDateTime($value, int $position = 47)
diff --git a/src/HL7/Segments/RGS.php b/src/HL7/Segments/RGS.php
index 8d655a0..112194e 100644
--- a/src/HL7/Segments/RGS.php
+++ b/src/HL7/Segments/RGS.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -12,9 +14,8 @@ class RGS extends Segment
 {
     /**
      * Index of this segment. Incremented for every new segment of this class created
-     * @var int
      */
-    protected static $setId = 1;
+    protected static int $setId = 1;
 
     public function __construct(array $fields = null, bool $autoIncrementIndices = true)
     {
@@ -31,7 +32,6 @@ public function __destruct()
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
diff --git a/src/HL7/Segments/SAC.php b/src/HL7/Segments/SAC.php
index da57356..2e5d475 100644
--- a/src/HL7/Segments/SAC.php
+++ b/src/HL7/Segments/SAC.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
@@ -23,7 +25,6 @@ public function __construct(array $fields = null)
 
     /**
      * Reset index of this segment
-     * @param int $index
      */
     public static function resetIndex(int $index = 1): void
     {
@@ -66,8 +67,6 @@ public function setRegistrationDateTime($value, int $position = 7)
     }
 
     /**
-     * @param $value
-     * @param int $position
      * @return bool
      *
      * value:
diff --git a/src/HL7/Segments/SCH.php b/src/HL7/Segments/SCH.php
index b1c13a8..c4e52e1 100644
--- a/src/HL7/Segments/SCH.php
+++ b/src/HL7/Segments/SCH.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/src/HL7/Segments/TQ1.php b/src/HL7/Segments/TQ1.php
index 095cc21..567a2cd 100644
--- a/src/HL7/Segments/TQ1.php
+++ b/src/HL7/Segments/TQ1.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
diff --git a/tests/Segments/OBXTest.php b/tests/Segments/OBXTest.php
new file mode 100644
index 0000000..98348f4
--- /dev/null
+++ b/tests/Segments/OBXTest.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Aranyasen\HL7\Tests\Segments;
+
+use Aranyasen\HL7\Segments\OBX;
+use Aranyasen\HL7\Tests\TestCase;
+
+class OBXTest extends TestCase
+{
+    /** @test */
+    public function segment_id_automatically_increments_when_a_new_instance_is_created(): void
+    {
+        OBX::resetIndex(); // Previous tests would have incremented the static $index variable
+
+        $obx = new OBX();
+        $this->assertSame(1, $obx->getID());
+        $obx = new OBX();
+        $this->assertSame(2, $obx->getID());
+    }
+}
diff --git a/tests/Segments/PIDTest.php b/tests/Segments/PIDTest.php
index 777678e..8234dbb 100644
--- a/tests/Segments/PIDTest.php
+++ b/tests/Segments/PIDTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Aranyasen\HL7\Tests\Segments;
 
 use Aranyasen\Exceptions\HL7Exception;