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

Refactor removing Manager notion

Browse Source
This commit is contained in:
gmorel
2013-11-23 20:18:04 +01:00
parent 8ce1030178
commit 90b5fbde05
34 changed files with 442 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Coupon/CouponFactory.php
View File

@@ -71,7 +71,7 @@ class CouponFactory
* @throws \Symfony\Component\Translation\Exception\NotFoundResourceException
* @return CouponInterface ready to be processed
*/
public function buildCouponFromCode($couponCode)
public function buildCouponManagerFromCode($couponCode)
{
/** @var Coupon $couponModel */
$couponModel = $this->facade->findOneCouponByCode($couponCode);
@@ -86,7 +86,7 @@ class CouponFactory
}
/** @var CouponInterface $couponInterface */
$couponInterface = $this->buildCouponInterfaceFromModel($couponModel);
$couponInterface = $this->buildCouponManagerFromModel($couponModel);
if ($couponInterface->getConditions()->isEmpty()) {
throw new InvalidConditionException(
get_class($couponInterface)
@@ -103,7 +103,7 @@ class CouponFactory
*
* @return CouponInterface ready to use CouponInterface object instance
*/
protected function buildCouponInterfaceFromModel(Coupon $model)
protected function buildCouponManagerFromModel(Coupon $model)
{
$isCumulative = ($model->getIsCumulative() == 1 ? true : false);
$isRemovingPostage = ($model->getIsRemovingPostage() == 1 ? true : false);

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

@@ -24,7 +24,7 @@
namespace Thelia\Coupon;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Thelia\Condition\ConditionManagerInterface;
use Thelia\Condition\ConditionInterface;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Model\Coupon;
@@ -213,9 +213,9 @@ class CouponManager
/**
* Add an available ConstraintManager (Services)
*
* @param ConditionManagerInterface $condition ConditionManagerInterface
* @param ConditionInterface $condition ConditionInterface
*/
public function addAvailableCondition(ConditionManagerInterface $condition)
public function addAvailableCondition(ConditionInterface $condition)
{
$this->availableConditions[] = $condition;
}

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

@@ -53,7 +53,7 @@ abstract class CouponAbstract implements CouponInterface
/** @var ConditionOrganizerInterface */
protected $organizer = null;
/** @var ConditionCollection Array of ConditionManagerInterface */
/** @var ConditionCollection Array of ConditionInterface */
protected $conditions = null;
/** @var ConditionEvaluator Condition validator */
@@ -214,7 +214,7 @@ abstract class CouponAbstract implements CouponInterface
* Replace the existing Conditions by those given in parameter
* If one Condition is badly implemented, no Condition will be added
*
* @param ConditionCollection $conditions ConditionManagerInterface to add
* @param ConditionCollection $conditions ConditionInterface to add
*
* @return $this
* @throws \Thelia\Exception\InvalidConditionException

4
core/lib/Thelia/Coupon/Type/CouponInterface.php
View File

@@ -140,7 +140,7 @@ interface CouponInterface
/**
* Return condition to validate the Coupon or not
*
* @return ConditionCollection A set of ConditionManagerInterface
* @return ConditionCollection A set of ConditionInterface
*/
public function getConditions();
@@ -148,7 +148,7 @@ interface CouponInterface
* Replace the existing Conditions by those given in parameter
* If one Condition is badly implemented, no Condition will be added
*
* @param ConditionCollection $conditions ConditionManagerInterface to add
* @param ConditionCollection $conditions ConditionInterface to add
*
* @return $this
* @throws \Thelia\Exception\InvalidConditionException

2
core/lib/Thelia/Coupon/Type/RemoveXAmountManager.php → core/lib/Thelia/Coupon/Type/RemoveXAmount.php
View File

@@ -37,7 +37,7 @@ use Thelia\Coupon\Type\CouponAbstract;
* @author Guillaume MOREL <gmorel@openstudio.fr>
*
*/
class RemoveXAmountManager extends CouponAbstract
class RemoveXAmount extends CouponAbstract
{
/** @var string Service Id */
protected $serviceId = 'thelia.coupon.type.remove_x_amount';

2
core/lib/Thelia/Coupon/Type/RemoveXPercentManager.php → core/lib/Thelia/Coupon/Type/RemoveXPercent.php
View File

@@ -36,7 +36,7 @@ use Thelia\Exception\MissingFacadeException;
* @author Guillaume MOREL <gmorel@openstudio.fr>
*
*/
class RemoveXPercentManager extends CouponAbstract
class RemoveXPercent extends CouponAbstract
{
/** @var string Service Id */
protected $serviceId = 'thelia.coupon.type.remove_x_percent';