From d597d235a7a21d3f9f01cc0ce62c4b7b4cdba3e7 Mon Sep 17 00:00:00 2001
From: Andy Summers <andrew.summers@wisc.edu>
Date: Thu, 24 Aug 2017 09:48:21 -0500
Subject: [PATCH] Allow `null` for optional parameters
---
.../services/cbs/order/header/OrderHeader.php | 24 +++----
.../services/cbs/order/line/OrderLine.php | 66 +++++++++----------
.../cbs/order/payment/OrderPayment.php | 8 +--
3 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/main/edu/wisc/services/cbs/order/header/OrderHeader.php b/src/main/edu/wisc/services/cbs/order/header/OrderHeader.php
index 4bd791d..b4c0f45 100644
--- a/src/main/edu/wisc/services/cbs/order/header/OrderHeader.php
+++ b/src/main/edu/wisc/services/cbs/order/header/OrderHeader.php
@@ -187,9 +187,9 @@ class OrderHeader extends MagentoOrder
}
/**
- * @return string
+ * @return string|null
*/
- public function getCustomerReferenceField(): string
+ public function getCustomerReferenceField()
{
return $this->customerReferenceField;
}
@@ -198,7 +198,7 @@ class OrderHeader extends MagentoOrder
* @param string $customerReferenceField
* @return OrderHeader
*/
- public function setCustomerReferenceField(string $customerReferenceField): OrderHeader
+ public function setCustomerReferenceField(string $customerReferenceField = null): OrderHeader
{
$this->customerReferenceField = $customerReferenceField;
return $this;
@@ -223,9 +223,9 @@ class OrderHeader extends MagentoOrder
}
/**
- * @return string
+ * @return string|null
*/
- public function getInterfaceTypeFlag(): string
+ public function getInterfaceTypeFlag()
{
return $this->interfaceTypeFlag;
}
@@ -234,16 +234,16 @@ class OrderHeader extends MagentoOrder
* @param string $interfaceTypeFlag
* @return OrderHeader
*/
- public function setInterfaceTypeFlag(string $interfaceTypeFlag): OrderHeader
+ public function setInterfaceTypeFlag(string $interfaceTypeFlag = null): OrderHeader
{
$this->interfaceTypeFlag = $interfaceTypeFlag;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getDefaultSet(): string
+ public function getDefaultSet()
{
return $this->defaultSet;
}
@@ -252,16 +252,16 @@ class OrderHeader extends MagentoOrder
* @param string $defaultSet
* @return OrderHeader
*/
- public function setDefaultSet(string $defaultSet): OrderHeader
+ public function setDefaultSet(string $defaultSet = null): OrderHeader
{
$this->defaultSet = $defaultSet;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getTestMode(): string
+ public function getTestMode()
{
return $this->testMode;
}
@@ -270,7 +270,7 @@ class OrderHeader extends MagentoOrder
* @param string $testMode
* @return OrderHeader
*/
- public function setTestMode(string $testMode): OrderHeader
+ public function setTestMode(string $testMode = null): OrderHeader
{
$this->testMode = $testMode;
return $this;
diff --git a/src/main/edu/wisc/services/cbs/order/line/OrderLine.php b/src/main/edu/wisc/services/cbs/order/line/OrderLine.php
index bef1a78..4326310 100644
--- a/src/main/edu/wisc/services/cbs/order/line/OrderLine.php
+++ b/src/main/edu/wisc/services/cbs/order/line/OrderLine.php
@@ -257,9 +257,9 @@ class OrderLine extends MagentoOrder
}
/**
- * @return float
+ * @return float|null
*/
- public function getBundleId(): float
+ public function getBundleId()
{
return $this->bundleId;
}
@@ -268,16 +268,16 @@ class OrderLine extends MagentoOrder
* @param float $bundleId
* @return OrderLine
*/
- public function setBundleId(float $bundleId): OrderLine
+ public function setBundleId(float $bundleId = null): OrderLine
{
$this->bundleId = $bundleId;
return $this;
}
/**
- * @return float
+ * @return float|null
*/
- public function getBundleLineId(): float
+ public function getBundleLineId()
{
return $this->bundleLineId;
}
@@ -286,7 +286,7 @@ class OrderLine extends MagentoOrder
* @param float $bundleLineId
* @return OrderLine
*/
- public function setBundleLineId(float $bundleLineId): OrderLine
+ public function setBundleLineId(float $bundleLineId = null): OrderLine
{
$this->bundleLineId = $bundleLineId;
return $this;
@@ -383,9 +383,9 @@ class OrderLine extends MagentoOrder
}
/**
- * @return string
+ * @return string|null
*/
- public function getShipToAddress2(): string
+ public function getShipToAddress2()
{
return $this->shipToAddress2;
}
@@ -394,16 +394,16 @@ class OrderLine extends MagentoOrder
* @param string $shipToAddress2
* @return OrderLine
*/
- public function setShipToAddress2(string $shipToAddress2): OrderLine
+ public function setShipToAddress2(string $shipToAddress2 = null): OrderLine
{
$this->shipToAddress2 = $shipToAddress2;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getShipToAddress3(): string
+ public function getShipToAddress3()
{
return $this->shipToAddress3;
}
@@ -412,16 +412,16 @@ class OrderLine extends MagentoOrder
* @param string $shipToAddress3
* @return OrderLine
*/
- public function setShipToAddress3(string $shipToAddress3): OrderLine
+ public function setShipToAddress3(string $shipToAddress3 = null): OrderLine
{
$this->shipToAddress3 = $shipToAddress3;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getShipToAddress4(): string
+ public function getShipToAddress4()
{
return $this->shipToAddress4;
}
@@ -430,7 +430,7 @@ class OrderLine extends MagentoOrder
* @param string $shipToAddress4
* @return OrderLine
*/
- public function setShipToAddress4(string $shipToAddress4): OrderLine
+ public function setShipToAddress4(string $shipToAddress4 = null): OrderLine
{
$this->shipToAddress4 = $shipToAddress4;
return $this;
@@ -491,9 +491,9 @@ class OrderLine extends MagentoOrder
}
/**
- * @return string
+ * @return string|null
*/
- public function getShippingInstructions(): string
+ public function getShippingInstructions()
{
return $this->shippingInstructions;
}
@@ -502,16 +502,16 @@ class OrderLine extends MagentoOrder
* @param string $shippingInstructions
* @return OrderLine
*/
- public function setShippingInstructions(string $shippingInstructions): OrderLine
+ public function setShippingInstructions(string $shippingInstructions = null): OrderLine
{
$this->shippingInstructions = $shippingInstructions;
return $this;
}
/**
- * @return float
+ * @return float|null
*/
- public function getShipSetId(): float
+ public function getShipSetId()
{
return $this->shipSetId;
}
@@ -520,16 +520,16 @@ class OrderLine extends MagentoOrder
* @param float $shipSetId
* @return OrderLine
*/
- public function setShipSetId(float $shipSetId): OrderLine
+ public function setShipSetId(float $shipSetId = null): OrderLine
{
$this->shipSetId = $shipSetId;
return $this;
}
/**
- * @return float
+ * @return float|null
*/
- public function getUserId(): float
+ public function getUserId()
{
return $this->userId;
}
@@ -538,16 +538,16 @@ class OrderLine extends MagentoOrder
* @param float $userId
* @return OrderLine
*/
- public function setUserId(float $userId): OrderLine
+ public function setUserId(float $userId = null): OrderLine
{
$this->userId = $userId;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getTestMode(): string
+ public function getTestMode()
{
return $this->testMode;
}
@@ -556,16 +556,16 @@ class OrderLine extends MagentoOrder
* @param string $testMode
* @return OrderLine
*/
- public function setTestMode(string $testMode): OrderLine
+ public function setTestMode(string $testMode = null): OrderLine
{
$this->testMode = $testMode;
return $this;
}
/**
- * @return Money
+ * @return Money|null
*/
- public function getUnitPromoPrice(): Money
+ public function getUnitPromoPrice()
{
return $this->unitPromoPrice;
}
@@ -574,16 +574,16 @@ class OrderLine extends MagentoOrder
* @param Money $unitPromoPrice
* @return OrderLine
*/
- public function setUnitPromoPrice(Money $unitPromoPrice): OrderLine
+ public function setUnitPromoPrice(Money $unitPromoPrice = null): OrderLine
{
$this->unitPromoPrice = $unitPromoPrice;
return $this;
}
/**
- * @return string
+ * @return string|null
*/
- public function getPromoDiscountName(): string
+ public function getPromoDiscountName()
{
return $this->promoDiscountName;
}
@@ -592,7 +592,7 @@ class OrderLine extends MagentoOrder
* @param string $promoDiscountName
* @return OrderLine
*/
- public function setPromoDiscountName(string $promoDiscountName): OrderLine
+ public function setPromoDiscountName(string $promoDiscountName = null): OrderLine
{
$this->promoDiscountName = $promoDiscountName;
return $this;
diff --git a/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php b/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
index ed6d9f0..56cb12d 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
@@ -267,18 +267,18 @@ class OrderPayment extends MagentoOrder
}
/**
- * @return string
+ * @return string|null
*/
- public function getTestMode(): string
+ public function getTestMode()
{
return $this->testMode;
}
/**
- * @param string $testMode
+ * @param string|null $testMode
* @return OrderPayment
*/
- public function setTestMode(string $testMode): OrderPayment
+ public function setTestMode(string $testMode = null): OrderPayment
{
$this->testMode = $testMode;
return $this;
--
GitLab