From c97755cce0b08472fdf2fe2df2679e3f2f27c71e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 20 Apr 2021 03:22:07 +0000 Subject: [PATCH] Allow setting of battery information to null. #551 --- src/Controller/WarrantyController.php | 6 +++--- src/Entity/Warranty.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index bca3290e..2208ecb1 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -194,7 +194,7 @@ class WarrantyController extends Controller $obj->setBatteryModel($model); } else - $obj->setBatteryModel(null); + $obj->setBatteryModel(NULL); // custom validation for battery size // check if battery size is blank @@ -210,7 +210,7 @@ class WarrantyController extends Controller $obj->setBatterySize($size); } else - $obj->setBatterySize(null); + $obj->setBatterySize(NULL); // custom validation for SAP battery // check if sap battery is blank @@ -226,7 +226,7 @@ class WarrantyController extends Controller $obj->setSAPBattery($sap); } else - $obj->setSAPBattery(null); + $obj->setSAPBattery(NULL); // validate $errors = $validator->validate($obj); diff --git a/src/Entity/Warranty.php b/src/Entity/Warranty.php index 9af986d3..36c4a781 100644 --- a/src/Entity/Warranty.php +++ b/src/Entity/Warranty.php @@ -73,14 +73,14 @@ class Warranty // battery model /** * @ORM\ManyToOne(targetEntity="BatteryModel", inversedBy="warranties") - * @ORM\JoinColumn(name="bty_model_id", referencedColumnName="id") + * @ORM\JoinColumn(name="bty_model_id", referencedColumnName="id", nullable=true) */ protected $bty_model; // battery size /** * @ORM\ManyToOne(targetEntity="BatterySize", inversedBy="warranties") - * @ORM\JoinColumn(name="bty_size_id", referencedColumnName="id") + * @ORM\JoinColumn(name="bty_size_id", referencedColumnName="id", nullable=true) */ protected $bty_size; @@ -371,7 +371,7 @@ class Warranty return $this->mobile_number; } - public function setBatteryModel(BatteryModel $model) + public function setBatteryModel(BatteryModel $model = null) { $this->bty_model = $model; return $this; @@ -382,7 +382,7 @@ class Warranty return $this->bty_model; } - public function setBatterySize(BatterySize $size) + public function setBatterySize(BatterySize $size = null) { $this->bty_size = $size; return $this; @@ -393,7 +393,7 @@ class Warranty return $this->bty_size; } - public function setSAPBattery(SAPBattery $sap_bty) + public function setSAPBattery(SAPBattery $sap_bty = null) { $this->sap_bty = $sap_bty; return $this;