Use segmentByTagAndSubId() when possible

Chemaclass · Sep 18, 2020 · d6d735f · d6d735f
1 parent 5caaad6
commit d6d735f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ EDI;
 
 $messages = EdifactParser::createWithDefaultSegments()->parse($fileContent);
 $firstMessage = reset($messages);
-$cnNadSegment = $firstMessage->segmentsByTag(NADNameAddress::class)['CN'];
+$cnNadSegment = $firstMessage->segmentByTagAndSubId(NADNameAddress::class, 'CN');
 $personName = $cnNadSegment->rawValues()[4]; // 'Person Name'
 ```
 
diff --git a/example/extracting-data.php b/example/extracting-data.php
@@ -13,6 +13,7 @@
 $firstMessage = reset($messages);
 
 /** @var SegmentInterface $cnNadSegment */
-$cnNadSegment = $firstMessage->segmentsByTag(NADNameAddress::class)['CN'];
+$cnNadSegment = $firstMessage->segmentByTagAndSubId(NADNameAddress::class, 'CN');
 $personName = $cnNadSegment->rawValues()[4];
 assert('Person Name' === $personName);
+echo $personName . PHP_EOL;
diff --git a/src/TransactionMessage.php b/src/TransactionMessage.php
@@ -53,7 +53,7 @@ public function __construct(array $groupedSegments)
         $this->groupedSegments = $groupedSegments;
     }
 
-    /** @return array<string, SegmentInterface>|array */
+    /** @return array|array<string, SegmentInterface> */
     public function segmentsByTag(string $tag): array
     {
         return $this->groupedSegments[$tag] ?? [];

diff --git a/tests/Functional/EdifactParserTest.php b/tests/Functional/EdifactParserTest.php
@@ -57,19 +57,19 @@ public function extractValuesFromMessage(): void
         $message = $transactionResult[0];
 
         /** @var UNHMessageHeader $unh */
-        $unh = $message->segmentsByTag(UNHMessageHeader::class)['1'];
+        $unh = $message->segmentByTagAndSubId(UNHMessageHeader::class, '1');
         self::assertEquals(['UNH', '1', ['IFTMIN', 'S', '93A', 'UN', 'PN001']], $unh->rawValues());
 
         /** @var CNTControl $cnt7 */
-        $cnt7 = $message->segmentsByTag(CNTControl::class)['7'];
+        $cnt7 = $message->segmentByTagAndSubId(CNTControl::class, '7');
         self::assertEquals(['CNT', ['7', '0.1', 'KGM']], $cnt7->rawValues());
 
         /** @var CNTControl $cnt11 */
-        $cnt11 = $message->segmentsByTag(CNTControl::class)['11'];
+        $cnt11 = $message->segmentByTagAndSubId(CNTControl::class, '11');
         self::assertEquals(['CNT', ['11', '1', 'PCE']], $cnt11->rawValues());
 
         /** @var UNTMessageFooter $unt */
-        $unt = $message->segmentsByTag(UNTMessageFooter::class)['19'];
+        $unt = $message->segmentByTagAndSubId(UNTMessageFooter::class, '19');
         self::assertEquals(['UNT', '19', '1'], $unt->rawValues());
     }
 
@@ -90,11 +90,11 @@ public function useACustomSegmentFactory(): void
         $message = $transactionResult[0];
 
         /** @var SegmentInterface $custom */
-        $custom = $message->segmentsByTag('CUSTOM')['anyKey'];
+        $custom = $message->segmentByTagAndSubId('CUSTOM', 'anyKey');
         self::assertEquals(['CUSTOM', 'anyKey', ['whatever', 'value', '9']], $custom->rawValues());
 
         /** @var CNTControl $cnt11 */
-        $cnt11 = $message->segmentsByTag(CNTControl::class)['11'];
+        $cnt11 = $message->segmentByTagAndSubId(CNTControl::class, '11');
         self::assertEquals(['CNT', ['11', '1', 'PCE']], $cnt11->rawValues());
     }
 }