Skip to content

Commit

Permalink
Fixed wrong phpdoc, and improved CS
Browse files Browse the repository at this point in the history
  • Loading branch information
roadster31 committed Dec 31, 2015
1 parent 673fafd commit 3c23ccd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions core/lib/Thelia/Action/Order.php
Expand Up @@ -382,6 +382,7 @@ protected function createOrder(

/**
* Create an order outside of the front-office context, e.g. manually from the back-office.
* @param OrderManualEvent $event
*/
public function createManual(OrderManualEvent $event)
{
Expand Down Expand Up @@ -524,9 +525,8 @@ public function updateStatus(OrderEvent $event)
}

/**
* @param ModelOrder $order
* @param $newStatus
* @param $canceledStatus
* @param ModelOrder $order
* @param $newStatus $newStatus the new status ID
* @throws \Thelia\Exception\TheliaProcessException
*/
public function updateQuantity(ModelOrder $order, $newStatus)
Expand Down
10 changes: 6 additions & 4 deletions core/lib/Thelia/Model/Order.php
Expand Up @@ -15,13 +15,15 @@ class Order extends BaseOrder
{
use ModelEventDispatcherTrait;

/** @var int|null */
protected $choosenDeliveryAddress = null;
/** @var int|null */
protected $choosenInvoiceAddress = null;

protected $disableVersioning = false;

/**
* @param Address $choosenDeliveryAddress
* @param int $choosenDeliveryAddress the choosen delivery address ID
* @return $this
*/
public function setChoosenDeliveryAddress($choosenDeliveryAddress)
Expand Down Expand Up @@ -57,15 +59,15 @@ public function isVersioningNecessary($con = null)
}

/**
* @return Address
* @return int|null the choosen delivery address ID
*/
public function getChoosenDeliveryAddress()
{
return $this->choosenDeliveryAddress;
}

/**
* @param Address $choosenInvoiceAddress
* @param int $choosenInvoiceAddress the choosen invoice address
* @return $this
*/
public function setChoosenInvoiceAddress($choosenInvoiceAddress)
Expand All @@ -76,7 +78,7 @@ public function setChoosenInvoiceAddress($choosenInvoiceAddress)
}

/**
* @return Address
* @return int|null the choosen invoice address ID
*/
public function getChoosenInvoiceAddress()
{
Expand Down

0 comments on commit 3c23ccd

Please sign in to comment.