Fix errors, add Movins

php-edifact · Aug 5, 2023 · d96ec82 · d96ec82
1 parent 79af925
commit d96ec82
Show file tree

Hide file tree

Showing 25 changed files with 517 additions and 51 deletions.
diff --git a/src/Generator/Aperak.php b/src/Generator/Aperak.php
@@ -72,7 +72,7 @@ public function addReference($qualifier, $data)
      *
      * @param $errorCode
      * @param $errorMessage
-     * @return \EDI\Generator\Coparn
+     * @return \EDI\Generator\Aperak
      */
     public function addError($errorCode, $errorMessage = null)
     {
@@ -115,6 +115,6 @@ public function compose(?string $sMessageFunctionCode = "5", ?string $sDocumentN
             $this->messageContent[] = $err;
         }
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Base.php b/src/Generator/Base.php
@@ -20,6 +20,7 @@ class Base
 
     /** @var string */
     protected $receiver;
+    protected $composeKeys;
 
     /** @var string */
 //    protected $managingOrganisation = '89';
@@ -197,7 +198,7 @@ protected static function maxChars($string, $length = 35)
      *
      * @param      $value
      * @param      $array
-     * @param null $errorMessage
+     *@param $errorMessage
      *
      * @throws EdifactException
      */

diff --git a/src/Generator/Calinf.php b/src/Generator/Calinf.php
@@ -151,6 +151,6 @@ public function compose(?string $sMessageFunctionCode = '5', ?string $sDocumentN
         $this->messageContent[] = $this->etd;
         $this->messageContent[] = $this->callsign;
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Codeco.php b/src/Generator/Codeco.php
@@ -113,6 +113,6 @@ public function compose(?string $sMessageFunctionCode = "5", ?string $sDocumentN
 
         $this->messageContent[] = ['CNT', [16, count($this->containers)]];
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Codeco/Container.php b/src/Generator/Codeco/Container.php
@@ -40,7 +40,7 @@ public function setContainer($number, $size, $statusCode, $fullEmptyIndicator)
 
     /**
      * @param $booking
-     * @param null $sequence
+     *@param $sequence
      * @return \EDI\Generator\Codeco\Container
      */
     public function setBooking($booking, $sequence = null)
@@ -77,7 +77,7 @@ public function setSeal($seal, $sealIssuer)
 
     /**
      * Date of the equipment event
-     * @param null $date
+     *@param $date
      * @return \EDI\Generator\Codeco\Container
      */
     public function setEffectiveDate($date = null)

diff --git a/src/Generator/Cohaor.php b/src/Generator/Cohaor.php
@@ -82,6 +82,6 @@ public function compose(?string $sMessageFunctionCode = null, ?string $sDocument
             }
         }
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Coparn.php b/src/Generator/Coparn.php
@@ -201,7 +201,7 @@ public function setFND($loc)
      * @param $size
      * @param $statusCode
      * @param $fullEmptyIndicator
-     * @return \EDI\Generator\Codeco\Container
+     * @return \EDI\Generator\Coparn
      */
     public function setContainer($number, $size, $statusCode = 2, $fullEmptyIndicator = 5)
     {
@@ -252,7 +252,7 @@ public function setGrossWeight($weight)
      * Weight information
      * $type = T (tare), AET (gross weight)
      * @param $weight
-     * @return \EDI\Generator\Coreor
+     * @return \EDI\Generator\Coparn
      */
     public function setTare($weight)
     {
@@ -289,8 +289,8 @@ public function setDangerous($hazardClass, $hazardCode)
     /**
      * @param $hazardClass
      * @param $hazardCode
-     * @param null $flashpoint
-     * @param null $packingGroup
+     *@param $flashpoint
+     *@param $packingGroup
      * @return $this
      */
     public function addDangerous($hazardClass, $hazardCode, $flashpoint = null, $packingGroup = null)
@@ -358,7 +358,7 @@ public function setHumidity($humidity)
      */
     public function setOverDimensions($front = '', $back = '', $right = '', $left = '', $height = '')
     {
-        $this->dim = [];
+        $this->dimensions = [];
         if ($front !== '') {
             $this->dimensions[] = ['DIM', '5', ['CMT', $front]];
         }
@@ -470,6 +470,6 @@ public function compose(?string $sMessageFunctionCode = "5", ?string $sDocumentN
         $this->messageContent[] = ['TDT', 1, '', 3];
         $this->messageContent[] = ['CNT', [16, 1]];
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Copino.php b/src/Generator/Copino.php
@@ -201,6 +201,6 @@ public function compose(?string $sMessageFunctionCode = "9", ?string $sDocumentN
         $this->messageContent[] = $this->destination;
         $this->messageContent[] = ['CNT', [16, 1]];
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Coprar.php b/src/Generator/Coprar.php
@@ -86,7 +86,6 @@ public function setCarrier($line)
     public function setVessel($extVoyage, $line, $vslName, $callsign)
     {
         $this->vessel = self::tdtSegment(20, $extVoyage, 1, '', [$line, 172, 20], '', '', [$callsign, 103, '', $vslName]);
-        $this->callsign = self::rffSegment('VM', $callsign);
 
         return $this;
     }
@@ -95,15 +94,15 @@ public function setVessel($extVoyage, $line, $vslName, $callsign)
      * $type = 9 (port of loading), 11 (port of discharge)
      * @param $type
      * @param $locode
-     * @param null $terminal
+     * @param $terminal
      * @return \EDI\Generator\Coprar
      */
     public function setPort($type, $locode, $terminal = null)
     {
         if ($terminal === null) {
             $this->port = self::locSegment($type, [$locode, 139, 6]);
         } else {
-            $this->port = self::locSegment($type, [$locode, 139, 6], [$terminal, TER, ZZZ]);
+            $this->port = self::locSegment($type, [$locode, 139, 6], [$terminal, "TER", "ZZZ"]);
         }
 
         return $this;
@@ -195,6 +194,6 @@ public function compose(?string $sMessageFunctionCode = "9", ?string $sDocumentN
 
         $this->messageContent[] = ['CNT', [16, count($this->containers)]];
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Coprar/Container.php b/src/Generator/Coprar/Container.php
@@ -48,7 +48,7 @@ public function setContainer($number, $size, $statusCode, $fullEmptyIndicator)
 
     /**
      * @param $booking
-     * @param null $sequence
+     *@param $sequence
      * @return \EDI\Generator\Coprar\Container
      */
     public function setBooking($booking, $sequence = null)
@@ -198,8 +198,8 @@ public function setDangerous($hazardClass, $hazardCode)
     /**
      * @param $hazardClass
      * @param $hazardCode
-     * @param null $flashpoint
-     * @param null $packingGroup
+     *@param $flashpoint
+     *@param $packingGroup
      * @return $this
      */
     public function addDangerous($hazardClass, $hazardCode, $flashpoint = null, $packingGroup = null)

diff --git a/src/Generator/Coreor.php b/src/Generator/Coreor.php
@@ -406,6 +406,6 @@ public function compose(?string $sMessageFunctionCode = "9", ?string $sDocumentN
         $this->messageContent[] = $this->freightPayer;
         $this->messageContent[] = ['CNT', [16, 1]];
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Desadv.php b/src/Generator/Desadv.php
@@ -50,7 +50,7 @@ class Desadv extends Message
 
     /**
      * Desadv constructor.
-     * @param null $messageId
+     *@param $messageId
      * @param string $identifier
      * @param string|null $version
      * @param string|null $release

diff --git a/src/Generator/Iftmbf.php b/src/Generator/Iftmbf.php
@@ -352,6 +352,6 @@ public function compose(?string $sMessageFunctionCode = "5", ?string $sDocumentN
             }
         }
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Iftmbf/Container.php b/src/Generator/Iftmbf/Container.php
@@ -116,8 +116,8 @@ public function setShipDate($date)
      * $comType: DE 3155
      * @param $cntType
      * @param $cntTitle
-     * @param null $comType
-     * @param null $comData
+     *@param $comType
+     *@param $comData
      * @return \EDI\Generator\Iftmbf\Container
      */
     public function setShipContact($cntType, $cntTitle, $comType = null, $comData = null)

diff --git a/src/Generator/Iftmin.php b/src/Generator/Iftmin.php
@@ -20,10 +20,14 @@ class Iftmin extends Message
     private $transportOrderNumber;
     private $booking;
     private $bookingSequence;
+    private $vessel;
+    private $weightKg;
+    private $containers;
+    private $forwarder;
 
     /**
      * Iftmin constructor.
-     * @param null $messageID
+     *@param $messageID
      * @param string $identifier
      * @param string $version
      * @param string $release
@@ -134,7 +138,7 @@ public function setTransportOrderNumber($adn)
     /**
      * @param $booking
      * @param string $bookingType
-     * @param null $sequence
+     *@param $sequence
      * @return $this
      */
     public function setBooking($booking, $bookingType = 'BN', $sequence = null)
@@ -215,6 +219,6 @@ public function compose(?string $sMessageFunctionCode = "5", ?string $sDocumentN
 
         $this->messageContent[] = $this->weightKg;
 
-        return parent::compose($sMessageFunctionCode, $sDocumentNameCode, $sDocumentIdentifier);
+        return parent::compose();
     }
 }
diff --git a/src/Generator/Invoic.php b/src/Generator/Invoic.php
@@ -75,7 +75,7 @@ class Invoic extends Message
 
     /**
      * Invoic constructor.
-     * @param null $messageId
+     *@param $messageId
      * @param string $identifier
      * @param string $version
      * @param string $release

diff --git a/src/Generator/Message.php b/src/Generator/Message.php
@@ -117,7 +117,7 @@ public static function rffSegment($functionCode, $identifier)
      * $secondaryLoc = preferred [locode, 139, 6] (if needed)
      * @param $qualifier
      * @param $firstLoc
-     * @param null $secondaryLoc
+     *@param $secondaryLoc
      * @return array
      */
     public static function locSegment($qualifier, $firstLoc, $secondaryLoc = null)
@@ -141,9 +141,9 @@ public static function locSegment($qualifier, $firstLoc, $secondaryLoc = null)
      * @param $eqpType
      * @param $eqpIdentification
      * @param $dimension
-     * @param null $supplier
-     * @param null $statusCode
-     * @param null $fullEmptyIndicatorCode
+     *@param $supplier
+     *@param $statusCode
+     *@param $fullEmptyIndicatorCode
      * @return array
      */
     public static function eqdSegment($eqpType, $eqpIdentification, $dimension, $supplier = null, $statusCode = null, $fullEmptyIndicatorCode = null)