Fix some issues identified by phpstan

senaranya · Sep 29, 2024 · 7aacc7b · 7aacc7b
1 parent 50ca9d5
commit 7aacc7b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/HL7/Segments/GT1.php b/src/HL7/Segments/GT1.php
@@ -5,6 +5,7 @@
 namespace Aranyasen\HL7\Segments;
 
 use Aranyasen\HL7\Segment;
+use InvalidArgumentException;
 
 /**
  * GT1 segment class

diff --git a/src/HL7/Segments/MSH.php b/src/HL7/Segments/MSH.php
@@ -79,13 +79,13 @@ public function __construct(array $fields = null, array $hl7Globals = null)
      * @param int $index Index of field
      * @param string $value
      */
-    public function setField(int $index, $value = ''): bool
+    public function setField(int $index, string|int|array|null $value = ''): bool
     {
-        if (($index === 1) && strlen($value) !== 1) {
+        if (($index === 1) && (!is_string($value) || strlen($value) !== 1)) {
             return false;
         }
 
-        if (($index === 2) && strlen($value) !== 4) {
+        if (($index === 2) && (!is_string($value) || strlen($value) !== 4)) {
             return false;
         }
 

diff --git a/tests/HL7Test.php b/tests/HL7Test.php
@@ -8,6 +8,7 @@
 use Aranyasen\HL7;
 use Aranyasen\HL7\Segments\PID;
 use DMS\PHPUnitExtensions\ArraySubset\Assert;
+use Exception;
 
 class HL7Test extends TestCase
 {

diff --git a/tests/Hl7ListenerTrait.php b/tests/Hl7ListenerTrait.php
@@ -67,22 +67,19 @@ public function createTcpServer(int $port, int $totalClientsToConnect): void
         }
 
         if (($ret = socket_bind($socket, "localhost", $port)) === false) {
-            throw new RuntimeException('socket_bind() failed: reason: ' . socket_strerror($ret) . "\n");
+            throw new RuntimeException('socket_bind() failed: reason: ' . socket_strerror(socket_last_error($socket)) . "\n");
         }
         if (($ret = socket_listen($socket, 5)) === false) {
-            throw new RuntimeException('socket_listen() failed: reason: ' . socket_strerror($ret) . "\n");
+            throw new RuntimeException('socket_listen() failed: reason: ' . socket_strerror(socket_last_error($socket)) . "\n");
         }
 
         $clientCount = 0;
         while (true) { // Loop over each client
             if (($clientSocket = socket_accept($socket)) === false) {
-                echo 'socket_accept() failed: reason: ' . socket_strerror(socket_last_error()) . "\n";
-                socket_close($clientSocket);
+                echo 'socket_accept() failed: reason: ' . socket_strerror(socket_last_error($socket)) . "\n";
+                socket_close($socket);
                 exit();
             }
-            if ($clientSocket === false) {
-                continue;
-            }
 
             $clientCount++;
             $clientName = 'Unknown';