Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some issues identified by phpstan #123

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some issues identified by phpstan #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/HL7/Segments/GT1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Aranyasen\HL7\Segments;

use Aranyasen\HL7\Segment;
use InvalidArgumentException;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exception is thrown in this class, but was not used.


/**
* GT1 segment class
Expand Down
6 changes: 3 additions & 3 deletions src/HL7/Segments/MSH.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Comment on lines -82 to +88
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MSH::setTriggerEvent() calls $this->setField($position, $value), and $value is an array. This changes this function to take the same types as Segment::setField(), and ensures that index 1 or 2 must be a string. It could be better to throw an exception instead of returning false if a non-string value is given for MSH.1 or MSH.2.

return false;
}

Expand Down
1 change: 1 addition & 0 deletions tests/HL7Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Aranyasen\HL7;
use Aranyasen\HL7\Segments\PID;
use DMS\PHPUnitExtensions\ArraySubset\Assert;
use Exception;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docblock for empty_subfields_can_be_retained_if_needed() says it throws Exception. This uses that class to avoid ambiguity.


class HL7Test extends TestCase
{
Expand Down
15 changes: 8 additions & 7 deletions tests/Hl7ListenerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,23 @@ 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;
}
Comment on lines -83 to -85
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above block exits if $clientSocket is false, so at this point $clientSocket will always be a Socket object, and so this block will never run.


$clientCount++;
$clientName = 'Unknown';
Expand Down
Loading