Merge branch 'apply-psalm-immutable'

Chemaclass · May 31, 2020 · 298debd · 298debd
2 parents 6a73f4b + a223f81
commit 298debd
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 5 deletions.
diff --git a/src/Exception/MissingSubSegmentKey.php b/src/Exception/MissingSubSegmentKey.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace EdifactParser\Exception;
+
+final class MissingSubSegmentKey extends \Exception
+{
+    public function __construct(string $missingKey, array $rawValues)
+    {
+        parent::__construct("Key '$missingKey' not found in " . json_encode($rawValues));
+    }
+}
diff --git a/src/Segments/CNTControl.php b/src/Segments/CNTControl.php
@@ -6,6 +6,8 @@
 
 namespace EdifactParser\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
+
 /** @psalm-immutable */
 final class CNTControl implements SegmentInterface
 {
@@ -24,10 +26,10 @@ public function name(): string
     public function subSegmentKey(): string
     {
         if (!isset($this->rawValues[1][0])) {
-            throw new \Exception('missing sub segment key');
+            throw new MissingSubSegmentKey('[1][0]', $this->rawValues);
         }
 
-        return (string) $this->rawValues[1][0];
+        return (string)$this->rawValues[1][0];
     }
 
     public function rawValues(): array

diff --git a/src/Segments/DTMDateTimePeriod.php b/src/Segments/DTMDateTimePeriod.php
@@ -4,6 +4,8 @@
 
 namespace EdifactParser\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
+
 /** @psalm-immutable */
 final class DTMDateTimePeriod implements SegmentInterface
 {
@@ -22,7 +24,7 @@ public function name(): string
     public function subSegmentKey(): string
     {
         if (!isset($this->rawValues[1][0])) {
-            throw new \Exception('missing sub segment key');
+            throw new MissingSubSegmentKey('[1][0]', $this->rawValues);
         }
 
         return (string) $this->rawValues[1][0];

diff --git a/src/Segments/UNHMessageHeader.php b/src/Segments/UNHMessageHeader.php
@@ -4,6 +4,8 @@
 
 namespace EdifactParser\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
+
 /** @psalm-immutable */
 final class UNHMessageHeader implements SegmentInterface
 {
@@ -22,7 +24,7 @@ public function name(): string
     public function subSegmentKey(): string
     {
         if (!isset($this->rawValues[1][0])) {
-            throw new \Exception('missing sub segment key');
+            throw new MissingSubSegmentKey('[1][0]', $this->rawValues);
         }
 
         return (string) $this->rawValues[1][0];

diff --git a/src/TransactionMessage.php b/src/TransactionMessage.php
@@ -26,7 +26,7 @@ public static function groupSegmentsByMessage(SegmentInterface...$segments): arr
         $groupedSegments = [];
 
         foreach ($segments as $segment) {
-            if ($segment instanceof UNHMessageHeader && $groupedSegments) {
+            if ($segment instanceof UNHMessageHeader && !empty($groupedSegments)) {
                 $messages[] = self::groupSegmentsByName(...$groupedSegments);
                 $groupedSegments = [];
             }

diff --git a/tests/Unit/Segments/CNTControlTest.php b/tests/Unit/Segments/CNTControlTest.php
@@ -4,6 +4,7 @@
 
 namespace EdifactParser\Tests\Unit\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
 use EdifactParser\Segments\CNTControl;
 use PHPUnit\Framework\TestCase;
 
@@ -19,4 +20,12 @@ public function segmentValues(): void
         self::assertEquals('7', $segment->subSegmentKey());
         self::assertEquals($rawValues, $segment->rawValues());
     }
+
+    /** @test */
+    public function missingSubSegmentKey(): void
+    {
+        $segment = new CNTControl(['CNT']);
+        self::expectException(MissingSubSegmentKey::class);
+        $segment->subSegmentKey();
+    }
 }
diff --git a/tests/Unit/Segments/DTMDateTimePeriodTest.php b/tests/Unit/Segments/DTMDateTimePeriodTest.php
@@ -4,6 +4,8 @@
 
 namespace EdifactParser\Tests\Unit\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
+use EdifactParser\Segments\CNTControl;
 use EdifactParser\Segments\DTMDateTimePeriod;
 use PHPUnit\Framework\TestCase;
 
@@ -19,4 +21,12 @@ public function segmentValues(): void
         self::assertEquals('10', $segment->subSegmentKey());
         self::assertEquals($rawValues, $segment->rawValues());
     }
+
+    /** @test */
+    public function missingSubSegmentKey(): void
+    {
+        $segment = new DTMDateTimePeriod(['DTM']);
+        self::expectException(MissingSubSegmentKey::class);
+        $segment->subSegmentKey();
+    }
 }
diff --git a/tests/Unit/Segments/UNHMessageHeaderTest.php b/tests/Unit/Segments/UNHMessageHeaderTest.php
@@ -4,6 +4,7 @@
 
 namespace EdifactParser\Tests\Unit\Segments;
 
+use EdifactParser\Exception\MissingSubSegmentKey;
 use EdifactParser\Segments\UNHMessageHeader;
 use PHPUnit\Framework\TestCase;
 
@@ -19,4 +20,12 @@ public function segmentValues(): void
         self::assertEquals('1', $segment->subSegmentKey());
         self::assertEquals($rawValues, $segment->rawValues());
     }
+
+    /** @test */
+    public function missingSubSegmentKey(): void
+    {
+        $segment = new UNHMessageHeader(['UNH']);
+        self::expectException(MissingSubSegmentKey::class);
+        $segment->subSegmentKey();
+    }
 }