Merge pull request #119 from Alltricks/master

`voku\arrayy` in dev requirement

Author: sabas

composer.json

@@ -26,14 +26,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": "~8",
         "ext-json": "*",
-        "ext-simplexml": "*",
-        "voku/arrayy": "~7.1"
+        "ext-simplexml": "*"
     },
     "require-dev": {
         "php-edifact/edifact-mapping": "dev-master",
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "~9.0",
+        "voku/arrayy": "~7.1"
     },
     "autoload": {
         "psr-4": {

src/EDI/Interpreter.php

@@ -4,8 +4,6 @@
 
 namespace EDI;
 
-use Arrayy\Arrayy;
-
 /**
  * EDIFACT Messages Interpreter
  * (c) 2018 Stefano Sabatini
@@ -264,13 +262,13 @@ public function getJson(bool $pretty = false)
     }
 
     /**
-     * Get result as Arrayy Object.
+     * Get EDI groups.
      *
-     * @return Arrayy<mixed,mixed>
+     * @return array
      */
-    public function getArrayy()
+    public function getEdiGroups()
     {
-        return new Arrayy($this->ediGroups);
+        return $this->ediGroups;
     }
 
     /**
@@ -319,16 +317,6 @@ public function getJsonServiceSegments(bool $pretty = false)
         return \json_encode($this->serviceSeg);
     }
 
-    /**
-     * Get service segments as Arrayy Object.
-     *
-     * @return Arrayy<mixed,mixed>
-     */
-    public function getArrayyServiceSegments()
-    {
-        return new Arrayy($this->serviceSeg);
-    }
-
     /**
      * Split multiple messages
      *

tests/EDITest/AnalyserTest.php

@@ -22,7 +22,7 @@ final class AnalyserTest extends TestCase
      */
     protected $mapping;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->analyser = new Analyser();
         $this->mapping = new MappingProvider('D07A');

tests/EDITest/InterpreterTest.php

@@ -2,9 +2,10 @@
 
 namespace EDITest;
 
+use EDI\Parser;
 use EDI\Analyser;
+use Arrayy\Arrayy;
 use EDI\Interpreter;
-use EDI\Parser;
 
 /**
  * @internal
@@ -146,16 +147,16 @@ public function testOrderError()
 
         static::assertCount(2, $interpreter->getMessages());
 
-        static::assertContains('"messageHeader"', $interpreter->getJson(true));
-        static::assertContains('"interchangeHeader"', $interpreter->getJsonServiceSegments(true));
+        $this->assertStringContainsString('"messageHeader"', $interpreter->getJson(true));
+        static::assertStringContainsString('"interchangeHeader"', $interpreter->getJsonServiceSegments(true));
 
-        $arrayy = $interpreter->getArrayy();
+        $arrayy = new Arrayy($interpreter->getEdiGroups());
         static::assertSame(
             'Butter 40x250g Alu',
             $arrayy->get('0.SG25.0.itemDescription.itemDescription.itemDescription')
         );
 
-        $arrayy = $interpreter->getArrayyServiceSegments();
+        $arrayy =  new Arrayy($interpreter->getServiceSegments());
         static::assertCount(
             14,
             $arrayy->get('interchangeHeader')
@@ -181,16 +182,16 @@ public function testOrderOk()
 
         static::assertCount(2, $interpreter->getMessages());
 
-        static::assertContains('"messageHeader"', $interpreter->getJson(true));
-        static::assertContains('"interchangeHeader"', $interpreter->getJsonServiceSegments(true));
+        static::assertStringContainsString('"messageHeader"', $interpreter->getJson(true));
+        static::assertStringContainsString('"interchangeHeader"', $interpreter->getJsonServiceSegments(true));
 
-        $arrayy = $interpreter->getArrayy();
+        $arrayy = new Arrayy($interpreter->getEdiGroups());
         static::assertSame(
             'Butter 40x250g Alu',
             $arrayy->get('0.SG25.0.itemDescription.itemDescription.itemDescription')
         );
 
-        $arrayy = $interpreter->getArrayyServiceSegments();
+        $arrayy =  new Arrayy($interpreter->getServiceSegments());
         static::assertCount(
             14,
             $arrayy->get('interchangeHeader')

tests/EDITest/ParserTest.php

@@ -104,9 +104,9 @@ public function testFileOk()
         static::assertSame([], $errors);
 
         $data = \json_encode((new Parser($string))->get());
-        static::assertContains('Sup 1:10', $data);
-        static::assertNotContains('Konzentrat:o', $data);
-        static::assertContains('"Rindfleischsuppe Konzentrat","o', $data);
+        static::assertStringContainsString('Sup 1:10', $data);
+        static::assertStringNotContainsString('Konzentrat:o', $data);
+        static::assertStringContainsString('"Rindfleischsuppe Konzentrat","o', $data);
     }
 
     public function testFileError()