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

Applied php-cs-fixer

Browse Source
This commit is contained in:
Franck Allimant
2014-05-17 10:24:22 +02:00
parent f8ccea1899
commit ef142ca077
23 changed files with 76 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Thelia/Core/Event/Coupon/CouponConsumeEvent.php
View File

@@ -37,9 +37,9 @@ class CouponConsumeEvent extends ActionEvent
/**
* Constructor
*
* @param string $code Coupon code
* @param float $discount Total discount given by this coupon
* @param bool $isValid If Coupon is valid or f Customer meets coupon conditions
* @param string $code Coupon code
* @param float $discount Total discount given by this coupon
* @param bool $isValid If Coupon is valid or f Customer meets coupon conditions
* @param bool $freeShipping true if coupon offers free shipping
*/
public function __construct($code, $discount = null, $isValid = null, $freeShipping = false)
@@ -57,6 +57,7 @@ class CouponConsumeEvent extends ActionEvent
public function setFreeShipping($freeShipping)
{
$this->freeShipping = $freeShipping;
return $this;
}

7
core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php
View File

@@ -134,6 +134,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
public function setPerCustomerUsageCount($perCustomerUsageCount)
{
$this->perCustomerUsageCount = $perCustomerUsageCount;
return $this;
}
@@ -146,12 +147,13 @@ class CouponCreateOrUpdateEvent extends ActionEvent
}
/**
* @param array $freeShippingForCountries
* @param array $freeShippingForCountries
* @return $this
*/
public function setFreeShippingForCountries($freeShippingForCountries)
{
$this->freeShippingForCountries = $freeShippingForCountries;
return $this;
}
@@ -164,12 +166,13 @@ class CouponCreateOrUpdateEvent extends ActionEvent
}
/**
* @param array $freeShippingForMethods
* @param array $freeShippingForMethods
* @return $this
*/
public function setFreeShippingForMethods($freeShippingForMethods)
{
$this->freeShippingForMethods = $freeShippingForMethods;
return $this;
}

4
core/lib/Thelia/Core/Template/Loop/Coupon.php
View File

@@ -198,13 +198,13 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface
$freeShippingForCountriesIds = [];
/** @var CouponCountry $couponCountry */
foreach($coupon->getFreeShippingForCountries() as $couponCountry) {
foreach ($coupon->getFreeShippingForCountries() as $couponCountry) {
$freeShippingForCountriesIds[] = $couponCountry->getCountryId();
}
$freeShippingForModulesIds = [];
/** @var CouponModule $couponModule */
foreach($coupon->getFreeShippingForModules() as $couponModule) {
foreach ($coupon->getFreeShippingForModules() as $couponModule) {
$freeShippingForModulesIds[] = $couponModule->getModuleId();
}

4
core/lib/Thelia/Core/Template/Loop/OrderCoupon.php
View File

@@ -82,13 +82,13 @@ class OrderCoupon extends BaseLoop implements PropelSearchLoopInterface
$freeShippingForCountriesIds = [];
/** @var OrderCouponCountry $couponCountry */
foreach($orderCoupon->getFreeShippingForCountries() as $couponCountry) {
foreach ($orderCoupon->getFreeShippingForCountries() as $couponCountry) {
$freeShippingForCountriesIds[] = $couponCountry->getCountryId();
}
$freeShippingForModulesIds = [];
/** @var OrderCouponModule $couponModule */
foreach($orderCoupon->getFreeShippingForModules() as $couponModule) {
foreach ($orderCoupon->getFreeShippingForModules() as $couponModule) {
$freeShippingForModulesIds[] = $couponModule->getModuleId();
}

5
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
View File

@@ -150,7 +150,7 @@ class SmartyAssetsManager
$files = $finder->files()->in($assetSource)->name($file);
if (! empty($files)) {
$url = $this->assetsManager->processAsset(
$assetSource . DS . $file,
$assetSource . DS . self::$assetsDirectory,
@@ -162,8 +162,7 @@ class SmartyAssetsManager
$filters,
$debug
);
}
else {
} else {
Tlog::getInstance()->addError("Asset $assetSource".DS."$file was not found.");
}