Merge branch 'hotfix/3.0.5'

Naugrimm · Jun 4, 2024 · ed0cb5e · ed0cb5e
2 parents e61debe + 1761fb6
commit ed0cb5e
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "jms/serializer": "^3.30.0",
-        "naugrim/bmecat": "^5.0.0"
+        "naugrim/bmecat": "^5.0.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Nodes/Address.php b/src/Nodes/Address.php
@@ -46,8 +46,8 @@
  * @method \Naugrim\BMEcat\Nodes\Phone[]|array getPhone()
  * @method self setFax(\Naugrim\BMEcat\Nodes\Fax[]|array $fax)
  * @method \Naugrim\BMEcat\Nodes\Fax[]|array getFax()
- * @method self setEmails(string $emails)
- * @method string getEmails()
+ * @method self setEmails(array $emails)
+ * @method string[] getEmails()
  * @method self setPublicKey(\Naugrim\BMEcat\Nodes\Crypto\PublicKey[]|array $publicKey)
  * @method \Naugrim\BMEcat\Nodes\Crypto\PublicKey[]|array getPublicKey()
  * @method self setUrl(string|null $url)

diff --git a/src/Nodes/Agreement.php b/src/Nodes/Agreement.php
@@ -24,8 +24,8 @@
  * @method \Naugrim\BMEcat\Nodes\SupplierIdRef getSupplierIdRef()
  * @method self setAgreementDescr(\Naugrim\OpenTrans\Nodes\AgreementDescr[]|array $agreementDescr)
  * @method \Naugrim\OpenTrans\Nodes\AgreementDescr[]|array getAgreementDescr()
- * @method self setMimeInfo(\Naugrim\OpenTrans\Nodes\Mime[]|array $mimeInfo)
- * @method \Naugrim\OpenTrans\Nodes\Mime[]|array getMimeInfo()
+ * @method self setMimeInfo(\Naugrim\OpenTrans\Nodes\Mime|array $mimeInfo)
+ * @method Naugrim\OpenTrans\Nodes\Mime[] getMimeInfo()
  */
 class Agreement implements NodeInterface
 {

diff --git a/src/Nodes/Emails.php b/src/Nodes/Emails.php
@@ -10,8 +10,8 @@
 
 /**
  * @implements NodeInterface<self>
- * @method self setEmail(string $email)
- * @method string getEmail()
+ * @method self setEmail(array $email)
+ * @method string[] getEmail()
  * @method self setPublicKeys(\Naugrim\BMEcat\Nodes\Crypto\PublicKey[]|array $publicKeys)
  * @method \Naugrim\BMEcat\Nodes\Crypto\PublicKey[]|array getPublicKeys()
  */

diff --git a/src/Nodes/Invoice.php b/src/Nodes/Invoice.php
@@ -15,8 +15,8 @@
  * @implements NodeInterface<Invoice>
  * @method self setHeader(array|\Naugrim\OpenTrans\Nodes\Invoice\Header $header)
  * @method \Naugrim\OpenTrans\Nodes\Invoice\Header getHeader()
- * @method self setItems(\Naugrim\OpenTrans\Nodes\Invoice\Item[]|array $items)
- * @method \Naugrim\OpenTrans\Nodes\Invoice\Item[]|array getItems()
+ * @method self setItems(\Naugrim\OpenTrans\Nodes\Invoice\Item|array $items)
+ * @method Naugrim\OpenTrans\Nodes\Invoice\Item[] getItems()
  * @method self setSummary(array|\Naugrim\OpenTrans\Nodes\Invoice\Summary $summary)
  * @method \Naugrim\OpenTrans\Nodes\Invoice\Summary getSummary()
  */

diff --git a/src/Nodes/Invoice/Info.php b/src/Nodes/Invoice/Info.php
@@ -23,8 +23,8 @@
  * @method \Naugrim\OpenTrans\Nodes\DeliveryDate getDeliveryDate()
  * @method self setLanguage(\Naugrim\BMEcat\Nodes\Language[]|array $language)
  * @method \Naugrim\BMEcat\Nodes\Language[]|array getLanguage()
- * @method self setParties(\Naugrim\OpenTrans\Nodes\Party[]|array $parties)
- * @method \Naugrim\OpenTrans\Nodes\Party[]|array getParties()
+ * @method self setParties(\Naugrim\OpenTrans\Nodes\Party|array $parties)
+ * @method Naugrim\OpenTrans\Nodes\Party[] getParties()
  * @method self setIssuerIdRef(array|\Naugrim\OpenTrans\Nodes\Invoice\IssuerIdRef $issuerIdRef)
  * @method \Naugrim\OpenTrans\Nodes\Invoice\IssuerIdRef getIssuerIdRef()
  * @method self setRcptIdRef(array|\Naugrim\OpenTrans\Nodes\InvoiceRcptIdRef $rcptIdRef)

diff --git a/src/Nodes/Invoice/Summary.php b/src/Nodes/Invoice/Summary.php
@@ -14,8 +14,8 @@
  * @implements NodeInterface<Summary>
  * @method self setNetValueGoods(float $netValueGoods)
  * @method float getNetValueGoods()
- * @method self setTotalTax(\Naugrim\OpenTrans\Nodes\Tax\DetailsFix[]|array $totalTax)
- * @method \Naugrim\OpenTrans\Nodes\Tax\DetailsFix[]|array getTotalTax()
+ * @method self setTotalTax(\Naugrim\OpenTrans\Nodes\Tax\DetailsFix|array $totalTax)
+ * @method Naugrim\OpenTrans\Nodes\Tax\DetailsFix[] getTotalTax()
  * @method self setAllowOrChargesFix(array|\Naugrim\OpenTrans\Nodes\AllowOrChargesFix $allowOrChargesFix)
  * @method \Naugrim\OpenTrans\Nodes\AllowOrChargesFix getAllowOrChargesFix()
  */

diff --git a/src/Nodes/Mime.php b/src/Nodes/Mime.php
@@ -15,8 +15,8 @@
  * @method string getType()
  * @method self setSource(string $source)
  * @method string getSource()
- * @method self setFileHashValue(\Naugrim\OpenTrans\Nodes\File\HashValue[]|array $fileHashValue)
- * @method \Naugrim\OpenTrans\Nodes\File\HashValue[]|array getFileHashValue()
+ * @method self setFileHashValue(\Naugrim\OpenTrans\Nodes\File\HashValue|array $fileHashValue)
+ * @method Naugrim\OpenTrans\Nodes\File\HashValue[] getFileHashValue()
  * @method self setEmbedded(\Naugrim\OpenTrans\Nodes\Mime\Embedded[]|array $embedded)
  * @method \Naugrim\OpenTrans\Nodes\Mime\Embedded[]|array getEmbedded()
  * @method self setDescription(string $description)

diff --git a/src/Nodes/Order.php b/src/Nodes/Order.php
@@ -17,8 +17,8 @@
  * @method string getType()
  * @method self setHeader(array|\Naugrim\OpenTrans\Nodes\Order\Header $header)
  * @method \Naugrim\OpenTrans\Nodes\Order\Header getHeader()
- * @method self setItems(\Naugrim\OpenTrans\Nodes\Order\Item[]|array $items)
- * @method \Naugrim\OpenTrans\Nodes\Order\Item[]|array getItems()
+ * @method self setItems(\Naugrim\OpenTrans\Nodes\Order\Item|array $items)
+ * @method Naugrim\OpenTrans\Nodes\Order\Item[] getItems()
  * @method self setSummary(array|\Naugrim\OpenTrans\Nodes\Order\Summary $summary)
  * @method \Naugrim\OpenTrans\Nodes\Order\Summary getSummary()
  */

diff --git a/src/Nodes/Order/Info.php b/src/Nodes/Order/Info.php
@@ -27,8 +27,8 @@
  * @method \Naugrim\BMEcat\Nodes\Language[]|array getLanguage()
  * @method self setDeliveryDate(array|\Naugrim\OpenTrans\Nodes\DeliveryDate $deliveryDate)
  * @method \Naugrim\OpenTrans\Nodes\DeliveryDate getDeliveryDate()
- * @method self setParties(\Naugrim\OpenTrans\Nodes\Party[]|array $parties)
- * @method \Naugrim\OpenTrans\Nodes\Party[]|array getParties()
+ * @method self setParties(\Naugrim\OpenTrans\Nodes\Party|array $parties)
+ * @method Naugrim\OpenTrans\Nodes\Party[] getParties()
  * @method self setCustomerOrderReference(null|array|\Naugrim\OpenTrans\Nodes\Order\CustomerOrderReference $customerOrderReference)
  * @method \Naugrim\OpenTrans\Nodes\Order\CustomerOrderReference|null getCustomerOrderReference()
  * @method self setPartiesReference(array|\Naugrim\OpenTrans\Nodes\Order\PartiesReference $partiesReference)

diff --git a/src/Nodes/OrderChange.php b/src/Nodes/OrderChange.php
@@ -15,8 +15,8 @@
  * @implements NodeInterface<OrderChange>
  * @method self setHeader(array|\Naugrim\OpenTrans\Nodes\OrderChange\Header $header)
  * @method \Naugrim\OpenTrans\Nodes\OrderChange\Header getHeader()
- * @method self setItems(\Naugrim\OpenTrans\Nodes\Order\Item[]|array $items)
- * @method \Naugrim\OpenTrans\Nodes\Order\Item[]|array getItems()
+ * @method self setItems(\Naugrim\OpenTrans\Nodes\Order\Item|array $items)
+ * @method Naugrim\OpenTrans\Nodes\Order\Item[] getItems()
  * @method self setSummary(array|\Naugrim\OpenTrans\Nodes\Order\Summary $summary)
  * @method \Naugrim\OpenTrans\Nodes\Order\Summary getSummary()
  */

diff --git a/src/Nodes/OrderChange/Info.php b/src/Nodes/OrderChange/Info.php
@@ -16,8 +16,8 @@
  * @method string getDate()
  * @method self setSequenceId(int $sequenceId)
  * @method int getSequenceId()
- * @method self setParties(\Naugrim\OpenTrans\Nodes\Party[]|array $parties)
- * @method \Naugrim\OpenTrans\Nodes\Party[]|array getParties()
+ * @method self setParties(\Naugrim\OpenTrans\Nodes\Party|array $parties)
+ * @method Naugrim\OpenTrans\Nodes\Party[] getParties()
  * @method self setPartiesReference(array|\Naugrim\OpenTrans\Nodes\Order\PartiesReference $partiesReference)
  * @method \Naugrim\OpenTrans\Nodes\Order\PartiesReference getPartiesReference()
  */

diff --git a/src/Nodes/OrderResponse.php b/src/Nodes/OrderResponse.php
@@ -15,8 +15,8 @@
  * @implements NodeInterface<OrderResponse>
  * @method self setHeader(array|\Naugrim\OpenTrans\Nodes\OrderResponse\Header $header)
  * @method \Naugrim\OpenTrans\Nodes\OrderResponse\Header getHeader()
- * @method self setItems(\Naugrim\OpenTrans\Nodes\OrderResponse\Item[]|array $items)
- * @method \Naugrim\OpenTrans\Nodes\OrderResponse\Item[]|array getItems()
+ * @method self setItems(\Naugrim\OpenTrans\Nodes\OrderResponse\Item|array $items)
+ * @method Naugrim\OpenTrans\Nodes\OrderResponse\Item[] getItems()
  * @method self setSummary(array|\Naugrim\OpenTrans\Nodes\OrderResponse\Summary $summary)
  * @method \Naugrim\OpenTrans\Nodes\OrderResponse\Summary getSummary()
  */

diff --git a/src/Nodes/OrderResponse/Info.php b/src/Nodes/OrderResponse/Info.php
@@ -21,8 +21,8 @@
  * @method \Naugrim\OpenTrans\Nodes\DeliveryDate getDeliveryDate()
  * @method self setSequenceId(int $sequenceId)
  * @method int getSequenceId()
- * @method self setParties(\Naugrim\OpenTrans\Nodes\Party[]|array $parties)
- * @method \Naugrim\OpenTrans\Nodes\Party[]|array getParties()
+ * @method self setParties(\Naugrim\OpenTrans\Nodes\Party|array $parties)
+ * @method Naugrim\OpenTrans\Nodes\Party[] getParties()
  * @method self setPartiesReference(array|\Naugrim\OpenTrans\Nodes\Order\PartiesReference $partiesReference)
  * @method \Naugrim\OpenTrans\Nodes\Order\PartiesReference getPartiesReference()
  */

diff --git a/src/Nodes/Payment/Payment.php b/src/Nodes/Payment/Payment.php
@@ -15,8 +15,8 @@
  * @implements NodeInterface<Payment>
  * @method self setCard(null|array|\Naugrim\OpenTrans\Nodes\Payment\Card $card)
  * @method \Naugrim\OpenTrans\Nodes\Payment\Card|null getCard()
- * @method self setAccounts(\Naugrim\OpenTrans\Nodes\Account[]|array $accounts)
- * @method \Naugrim\OpenTrans\Nodes\Account[]|array getAccounts()
+ * @method self setAccounts(\Naugrim\OpenTrans\Nodes\Account|array $accounts)
+ * @method Naugrim\OpenTrans\Nodes\Account[] getAccounts()
  * @method self setCash(bool|null $cash)
  * @method bool|null getCash()
  * @method self setDebit(bool|null $debit)

diff --git a/src/Nodes/ProductId.php b/src/Nodes/ProductId.php
@@ -13,28 +13,28 @@
 
 /**
  * @implements NodeInterface<ProductId>
- * @method self setSupplierPid(array|\Naugrim\BMEcat\Nodes\SupplierPid $supplierPid)
- * @method \Naugrim\BMEcat\Nodes\SupplierPid getSupplierPid()
- * @method self setSupplierIdRef(array|\Naugrim\BMEcat\Nodes\SupplierIdRef $supplierIdRef)
- * @method \Naugrim\BMEcat\Nodes\SupplierIdRef getSupplierIdRef()
- * @method self setConfigCodeFix(string $configCodeFix)
- * @method string getConfigCodeFix()
- * @method self setLotNumber(string $lotNumber)
- * @method string getLotNumber()
- * @method self setSerialNumber(string $serialNumber)
- * @method string getSerialNumber()
+ * @method self setSupplierPid(null|array|\Naugrim\BMEcat\Nodes\SupplierPid $supplierPid)
+ * @method \Naugrim\BMEcat\Nodes\SupplierPid|null getSupplierPid()
+ * @method self setSupplierIdRef(null|array|\Naugrim\BMEcat\Nodes\SupplierIdRef $supplierIdRef)
+ * @method \Naugrim\BMEcat\Nodes\SupplierIdRef|null getSupplierIdRef()
+ * @method self setConfigCodeFix(string|null $configCodeFix)
+ * @method string|null getConfigCodeFix()
+ * @method self setLotNumber(array $lotNumber)
+ * @method string[] getLotNumber()
+ * @method self setSerialNumber(array $serialNumber)
+ * @method string[] getSerialNumber()
  * @method self setInternationalPid(\Naugrim\BMEcat\Nodes\InternationalPid[]|array $internationalPid)
  * @method \Naugrim\BMEcat\Nodes\InternationalPid[]|array getInternationalPid()
  * @method self setBuyerPid(\Naugrim\BMEcat\Nodes\BuyerPid[]|array $buyerPid)
  * @method \Naugrim\BMEcat\Nodes\BuyerPid[]|array getBuyerPid()
- * @method self setDescriptionShort(string $descriptionShort)
- * @method string getDescriptionShort()
- * @method self setDescriptionLong(string $descriptionLong)
- * @method string getDescriptionLong()
+ * @method self setDescriptionShort(string|null $descriptionShort)
+ * @method string|null getDescriptionShort()
+ * @method self setDescriptionLong(string|null $descriptionLong)
+ * @method string|null getDescriptionLong()
  * @method self setManufacturerInfo(null|array|\Naugrim\OpenTrans\Nodes\ManufacturerInfo $manufacturerInfo)
  * @method \Naugrim\OpenTrans\Nodes\ManufacturerInfo|null getManufacturerInfo()
- * @method self setProductType(string $productType)
- * @method string getProductType()
+ * @method self setProductType(string|null $productType)
+ * @method string|null getProductType()
  */
 class ProductId implements NodeInterface
 {
@@ -44,23 +44,26 @@ class ProductId implements NodeInterface
     #[Serializer\Type(SupplierPid::class)]
     #[Serializer\SerializedName('SUPPLIER_PID')]
     #[\JMS\Serializer\Annotation\XmlElement(namespace: \Naugrim\OpenTrans\OpenTrans::BMECAT_NAMESPACE)]
-    protected SupplierPid $supplierPid;
+    protected ?SupplierPid $supplierPid = null;
 
     #[Serializer\Expose]
     #[Serializer\Type(SupplierIdRef::class)]
     #[Serializer\SerializedName('SUPPLIER_IDREF')]
     #[\JMS\Serializer\Annotation\XmlElement(namespace: \Naugrim\OpenTrans\OpenTrans::BMECAT_NAMESPACE)]
-    protected SupplierIdRef $supplierIdRef;
+    protected ?SupplierIdRef $supplierIdRef = null;
 
     #[Serializer\Expose]
     #[Serializer\Type('string')]
     #[Serializer\SerializedName('CONFIG_CODE_FIX')]
-    protected string $configCodeFix;
+    protected ?string $configCodeFix = null;
 
+    /**
+     * @var string[]
+     */
     #[Serializer\Expose]
-    #[Serializer\Type('string')]
-    #[Serializer\SerializedName('LOT_NUMBER')]
-    protected string $lotNumber;
+    #[Serializer\Type('array<string>')]
+    #[Serializer\XmlList(entry: 'LOT_NUMBER', inline: true)]
+    protected array $lotNumber = [];
 
     /**
      * @var string[]
@@ -90,13 +93,13 @@ class ProductId implements NodeInterface
     #[Serializer\Type('string')]
     #[Serializer\SerializedName('DESCRIPTION_SHORT')]
     #[\JMS\Serializer\Annotation\XmlElement(namespace: \Naugrim\OpenTrans\OpenTrans::BMECAT_NAMESPACE)]
-    protected string $descriptionShort;
+    protected ?string $descriptionShort = null;
 
     #[Serializer\Expose]
     #[Serializer\Type('string')]
     #[Serializer\SerializedName('DESCRIPTION_LONG')]
     #[\JMS\Serializer\Annotation\XmlElement(namespace: \Naugrim\OpenTrans\OpenTrans::BMECAT_NAMESPACE)]
-    protected string $descriptionLong;
+    protected ?string $descriptionLong = null;
 
     #[Serializer\Expose]
     #[Serializer\Type(ManufacturerInfo::class)]
@@ -107,5 +110,5 @@ class ProductId implements NodeInterface
     #[Serializer\Type('string')]
     #[Serializer\SerializedName('PRODUCT_TYPE')]
     #[\JMS\Serializer\Annotation\XmlElement(namespace: \Naugrim\OpenTrans\OpenTrans::BMECAT_NAMESPACE)]
-    protected string $productType;
+    protected ?string $productType = null;
 }