TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php-cs pass

Browse Source
This commit is contained in:
Franck Allimant
2014-06-17 00:43:10 +02:00
parent 63f00d82b9
commit 8b74eae911
5 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Core/Event/Cart/CartEvent.php
View File

@@ -32,7 +32,7 @@ class CartEvent extends ActionEvent
}
/**
* @param bool $append
* @param bool $append
* @return CartEvent
*/
public function setAppend($append)
@@ -51,7 +51,7 @@ class CartEvent extends ActionEvent
}
/**
* @param CartItem $cartItem
* @param CartItem $cartItem
* @return CartEvent
*/
public function setCartItem($cartItem)
@@ -70,7 +70,7 @@ class CartEvent extends ActionEvent
}
/**
* @param bool $newness
* @param bool $newness
* @return CartEvent
*/
public function setNewness($newness)
@@ -89,7 +89,7 @@ class CartEvent extends ActionEvent
}
/**
* @param int $product the product ID
* @param int $product the product ID
* @return CartEvent
*/
public function setProduct($product)
@@ -108,7 +108,7 @@ class CartEvent extends ActionEvent
}
/**
* @param int $productSaleElementsId
* @param int $productSaleElementsId
* @return CartEvent
*/
public function setProductSaleElementsId($productSaleElementsId)
@@ -127,7 +127,7 @@ class CartEvent extends ActionEvent
}
/**
* @param int $quantity
* @param int $quantity
* @return CartEvent
*/
public function setQuantity($quantity)

1
core/lib/Thelia/Coupon/BaseFacade.php
View File

@@ -150,7 +150,6 @@ class BaseFacade implements FacadeInterface
return $total;
}
/**
* @return Country the delivery country
*/

4
core/lib/Thelia/Coupon/CouponManager.php
View File

@@ -274,8 +274,8 @@ class CouponManager
/**
* Clear all data kept by coupons
*/
public function clear() {
public function clear()
{
$coupons = $this->facade->getCurrentCoupons();
/** @var CouponInterface $coupon */

3
core/lib/Thelia/Coupon/Type/CouponAbstract.php
View File

@@ -503,7 +503,8 @@ abstract class CouponAbstract implements CouponInterface
/**
* @inheritdoc
*/
public function clear() {
public function clear()
{
// Does nothing. Override this function as needed.
}
}

38
core/lib/Thelia/Coupon/Type/FreeProduct.php
View File

@@ -15,13 +15,11 @@ namespace Thelia\Coupon\Type;
use Thelia\Core\Event\Cart\CartEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Translation\Translator;
use Thelia\Coupon\FacadeInterface;
use Thelia\Model\CartItem;
use Thelia\Model\CartItemQuery;
use Thelia\Model\Product;
use Thelia\Model\ProductQuery;
/**
* Allow to remove an amount from the checkout total
*
@@ -66,7 +64,8 @@ class FreeProduct extends AbstractRemoveOnProducts
/**
* @return string The session variable where the cart item IDs for the free products are stored
*/
protected function getSessionVarName() {
protected function getSessionVarName()
{
return "coupon.free_product.cart_items." . $this->getCode();
}
/**
@@ -76,8 +75,8 @@ class FreeProduct extends AbstractRemoveOnProducts
*
* @return bool|int|CartItem the cart item which contains the free product, or false if the product is no longer in the cart, or ADD_TO_CART_IN_PROCESS if the adding process is not finished
*/
protected function getRelatedCartItem($product) {
protected function getRelatedCartItem($product)
{
$cartItemIdList = $this->facade->getRequest()->getSession()->get(
$this->getSessionVarName(),
array()
@@ -89,12 +88,10 @@ class FreeProduct extends AbstractRemoveOnProducts
if ($cartItemId == self::ADD_TO_CART_IN_PROCESS) {
return self::ADD_TO_CART_IN_PROCESS;
}
else if (null !== $cartItem = CartItemQuery::create()->findPk($cartItemId)) {
} elseif (null !== $cartItem = CartItemQuery::create()->findPk($cartItemId)) {
return $cartItem;
}
}
else {
} else {
// Maybe the product we're offering is already in the cart ? Search it.
$cartItems = $this->facade->getCart()->getCartItems();
@@ -117,11 +114,11 @@ class FreeProduct extends AbstractRemoveOnProducts
/**
* Set the cart item id which contains the free product related to a given product
*
* @param Product $product the product in the cart which triggered the discount
* @param bool|int $cartItemId the cart item ID which contains the free product, or just true if the free product is not yet added.
* @param Product $product the product in the cart which triggered the discount
* @param bool|int $cartItemId the cart item ID which contains the free product, or just true if the free product is not yet added.
*/
protected function setRelatedCartItem($product, $cartItemId) {
protected function setRelatedCartItem($product, $cartItemId)
{
$cartItemIdList = $this->facade->getRequest()->getSession()->get(
$this->getSessionVarName(),
array()
@@ -142,7 +139,8 @@ class FreeProduct extends AbstractRemoveOnProducts
*
* @return array an array where the free product ID is the key, and the related cart item id the value.
*/
protected function getFreeProductsCartItemIds() {
protected function getFreeProductsCartItemIds()
{
return $this->facade->getRequest()->getSession()->get(
$this->getSessionVarName(),
array()
@@ -152,7 +150,8 @@ class FreeProduct extends AbstractRemoveOnProducts
/**
* Clear the session variable.
*/
protected function clearFreeProductsCartItemIds() {
protected function clearFreeProductsCartItemIds()
{
return $this->facade->getRequest()->getSession()->remove($this->getSessionVarName());
}
@@ -162,7 +161,8 @@ class FreeProduct extends AbstractRemoveOnProducts
*
* @inheritdoc
*/
public function isMatching() {
public function isMatching()
{
$match = parent::isMatching();
if (! $match) {
@@ -279,8 +279,7 @@ class FreeProduct extends AbstractRemoveOnProducts
)
);
}
}
else if ($fieldName === self::OFFERED_CATEGORY_ID) {
} elseif ($fieldName === self::OFFERED_CATEGORY_ID) {
if (empty($fieldValue)) {
throw new \InvalidArgumentException(
Translator::getInstance()->trans(
@@ -293,7 +292,6 @@ class FreeProduct extends AbstractRemoveOnProducts
return $fieldValue;
}
/**
* Get I18n name
*
@@ -344,4 +342,4 @@ class FreeProduct extends AbstractRemoveOnProducts
// Clear the session variable when the coupon is cleared.
$this->clearFreeProductsCartItemIds();
}
}
}