From a6a0872195e300a7d246cc4a868a463d2f08917a Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Fri, 10 Nov 2017 08:57:37 -0500 Subject: [PATCH] Remove backup files, and update money-type getters/setters to make Doctrine happier --- src/CameraBundle/Entity/Camera.php~ | 475 ------------------ src/CameraBundle/Entity/CameraType.php~ | 34 -- src/CameraBundle/Entity/Flash.php | 6 +- src/CameraBundle/Entity/Flash.php~ | 111 ---- src/CameraBundle/Entity/Lenses.php | 6 +- src/CameraBundle/Entity/Lenses.php~ | 167 ------ .../Entity/PreviouslyOwnedCamera.php~ | 128 ----- .../Entity/PreviouslyOwnedLenses.php~ | 167 ------ 8 files changed, 6 insertions(+), 1088 deletions(-) delete mode 100644 src/CameraBundle/Entity/Camera.php~ delete mode 100644 src/CameraBundle/Entity/CameraType.php~ delete mode 100644 src/CameraBundle/Entity/Flash.php~ delete mode 100644 src/CameraBundle/Entity/Lenses.php~ delete mode 100644 src/CameraBundle/Entity/PreviouslyOwnedCamera.php~ delete mode 100644 src/CameraBundle/Entity/PreviouslyOwnedLenses.php~ diff --git a/src/CameraBundle/Entity/Camera.php~ b/src/CameraBundle/Entity/Camera.php~ deleted file mode 100644 index 7f4c08f..0000000 --- a/src/CameraBundle/Entity/Camera.php~ +++ /dev/null @@ -1,475 +0,0 @@ -id; - } - - /** - * Set brand - * - * @param string $brand - * - * @return Camera - */ - public function setBrand($brand) - { - $this->brand = $brand; - - return $this; - } - - /** - * Get brand - * - * @return string - */ - public function getBrand() - { - return $this->brand; - } - - /** - * Set mount - * - * @param string $mount - * - * @return Camera - */ - public function setMount($mount) - { - $this->mount = $mount; - - return $this; - } - - /** - * Get mount - * - * @return string - */ - public function getMount() - { - return $this->mount; - } - - /** - * Set model - * - * @param string $model - * - * @return Camera - */ - public function setModel($model) - { - $this->model = $model; - - return $this; - } - - /** - * Get model - * - * @return string - */ - public function getModel() - { - return $this->model; - } - - /** - * Set isDigital - * - * @param boolean $isDigital - * - * @return Camera - */ - public function setIsDigital($isDigital) - { - $this->isDigital = $isDigital; - - return $this; - } - - /** - * Get isDigital - * - * @return boolean - */ - public function getIsDigital() - { - return $this->isDigital; - } - - /** - * Set cropFactor - * - * @param string $cropFactor - * - * @return Camera - */ - public function setCropFactor($cropFactor) - { - $this->cropFactor = $cropFactor; - - return $this; - } - - /** - * Get cropFactor - * - * @return string - */ - public function getCropFactor() - { - return $this->cropFactor; - } - - /** - * Set isWorking - * - * @param boolean $isWorking - * - * @return Camera - */ - public function setIsWorking($isWorking) - { - $this->isWorking = $isWorking; - - return $this; - } - - /** - * Get isWorking - * - * @return boolean - */ - public function getIsWorking() - { - return $this->isWorking; - } - - /** - * Set notes - * - * @param string $notes - * - * @return Camera - */ - public function setNotes($notes) - { - $this->notes = $notes; - - return $this; - } - - /** - * Get notes - * - * @return string - */ - public function getNotes() - { - return $this->notes; - } - - /** - * Set serial - * - * @param string $serial - * - * @return Camera - */ - public function setSerial($serial) - { - $this->serial = $serial; - - return $this; - } - - /** - * Get serial - * - * @return string - */ - public function getSerial() - { - return $this->serial; - } - - /** - * Set formerlyOwned - * - * @param boolean $formerlyOwned - * - * @return Camera - */ - public function setFormerlyOwned($formerlyOwned) - { - $this->formerlyOwned = $formerlyOwned; - - return $this; - } - - /** - * Get formerlyOwned - * - * @return boolean - */ - public function getFormerlyOwned() - { - return $this->formerlyOwned; - } - - /** - * Set purchasePrice - * - * @param string $purchasePrice - * - * @return Camera - */ - public function setPurchasePrice($purchasePrice) - { - $this->purchasePrice = $purchasePrice; - - return $this; - } - - /** - * Get purchasePrice - * - * @return float - */ - public function getPurchasePrice() - { - return (float) str_replace('$', '', $this->purchasePrice); - } - - /** - * Set batteryType - * - * @param string $batteryType - * - * @return Camera - */ - public function setBatteryType($batteryType) - { - $this->batteryType = $batteryType; - - return $this; - } - - /** - * Get batteryType - * - * @return string - */ - public function getBatteryType() - { - return $this->batteryType; - } - - /** - * Set filmFormat - * - * @param string $filmFormat - * - * @return Camera - */ - public function setFilmFormat($filmFormat) - { - $this->filmFormat = $filmFormat; - - return $this; - } - - /** - * Get filmFormat - * - * @return string - */ - public function getFilmFormat() - { - return $this->filmFormat; - } - - /** - * Set received - * - * @param boolean $received - * - * @return Camera - */ - public function setReceived($received) - { - $this->received = $received; - - return $this; - } - - /** - * Get received - * - * @return boolean - */ - public function getReceived() - { - return $this->received; - } - - /** - * Set type - * - * @param \CameraBundle\Entity\CameraType $type - * - * @return Camera - */ - public function setType(\CameraBundle\Entity\CameraType $type = null) - { - $this->type = $type; - - return $this; - } - - /** - * Get type - * - * @return \CameraBundle\Entity\CameraType - */ - public function getType() - { - return $this->type; - } -} diff --git a/src/CameraBundle/Entity/CameraType.php~ b/src/CameraBundle/Entity/CameraType.php~ deleted file mode 100644 index 0cefabb..0000000 --- a/src/CameraBundle/Entity/CameraType.php~ +++ /dev/null @@ -1,34 +0,0 @@ -purchasePrice = $purchasePrice; + $this->purchasePrice = $purchasePrice ?? 0; return $this; } @@ -331,7 +331,7 @@ class Flash */ public function getPurchasePrice() { - return $this->purchasePrice; + return (double) str_replace('$', '', (string)$this->purchasePrice) ?? 0; } /** diff --git a/src/CameraBundle/Entity/Flash.php~ b/src/CameraBundle/Entity/Flash.php~ deleted file mode 100644 index c826f08..0000000 --- a/src/CameraBundle/Entity/Flash.php~ +++ /dev/null @@ -1,111 +0,0 @@ -purchasePrice = $purchasePrice; + $this->purchasePrice = $purchasePrice ?? 0; return $this; } @@ -411,7 +411,7 @@ class Lenses */ public function getPurchasePrice() { - return $this->purchasePrice; + return (double) str_replace('$', '', (string)$this->purchasePrice) ?? 0; } /** diff --git a/src/CameraBundle/Entity/Lenses.php~ b/src/CameraBundle/Entity/Lenses.php~ deleted file mode 100644 index 2578fc3..0000000 --- a/src/CameraBundle/Entity/Lenses.php~ +++ /dev/null @@ -1,167 +0,0 @@ -