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

Fixed Thelia\Model\Base uses.

Browse Source
This commit is contained in:
Franck Allimant
2014-05-18 20:19:48 +02:00
parent cae0db00eb
commit ab060486d0
23 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Action/Cart.php
View File

@@ -17,11 +17,11 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\Cart\CartEvent;
use Thelia\Core\Event\Currency\CurrencyChangeEvent; use Thelia\Core\Event\Currency\CurrencyChangeEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\ProductSaleElementsQuery;
use Thelia\Model\Currency;
use Thelia\Model\CartItem; use Thelia\Model\CartItem;
use Thelia\Model\CartItemQuery; use Thelia\Model\CartItemQuery;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\Currency;
use Thelia\Model\ProductSaleElementsQuery;
use Thelia\Model\Tools\ProductPriceTools; use Thelia\Model\Tools\ProductPriceTools;
/** /**

5
core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php
View File

@@ -15,7 +15,8 @@ namespace Thelia\Condition\Implementation;
use Thelia\Condition\Operators; use Thelia\Condition\Operators;
use Thelia\Coupon\FacadeInterface; use Thelia\Coupon\FacadeInterface;
use Thelia\Exception\InvalidConditionValueException; use Thelia\Exception\InvalidConditionValueException;
use Thelia\Model\Base\CountryQuery; use Thelia\Model\Country;
use Thelia\Model\CountryQuery;
/** /**
* Check a Checkout against its Product number * Check a Checkout against its Product number
@@ -110,7 +111,7 @@ abstract class AbstractMatchCountries extends ConditionAbstract
if (null !== $cntryList = CountryQuery::create()->findPks($cntryIds)) { if (null !== $cntryList = CountryQuery::create()->findPks($cntryIds)) {
/** @var Category $cntry */ /** @var Country $cntry */
foreach ($cntryList as $cntry) { foreach ($cntryList as $cntry) {
$cntryStrList .= $cntry->getTitle() . ', '; $cntryStrList .= $cntry->getTitle() . ', ';
} }

2
core/lib/Thelia/Condition/Implementation/CartContainsProducts.php
View File

@@ -15,7 +15,7 @@ namespace Thelia\Condition\Implementation;
use Thelia\Condition\Operators; use Thelia\Condition\Operators;
use Thelia\Coupon\FacadeInterface; use Thelia\Coupon\FacadeInterface;
use Thelia\Exception\InvalidConditionValueException; use Thelia\Exception\InvalidConditionValueException;
use Thelia\Model\Base\ProductQuery; use Thelia\Model\ProductQuery;
use Thelia\Model\CartItem; use Thelia\Model\CartItem;
use Thelia\Model\Product; use Thelia\Model\Product;

2
core/lib/Thelia/Condition/Implementation/ConditionAbstract.php
View File

@@ -19,7 +19,7 @@ use Thelia\Core\Translation\Translator;
use Thelia\Coupon\FacadeInterface; use Thelia\Coupon\FacadeInterface;
use Thelia\Exception\InvalidConditionOperatorException; use Thelia\Exception\InvalidConditionOperatorException;
use Thelia\Exception\InvalidConditionValueException; use Thelia\Exception\InvalidConditionValueException;
use Thelia\Model\Base\CurrencyQuery; use Thelia\Model\CurrencyQuery;
use Thelia\Model\Currency; use Thelia\Model\Currency;
use Thelia\Type\FloatType; use Thelia\Type\FloatType;

2
core/lib/Thelia/Controller/Admin/OrderController.php
View File

@@ -19,7 +19,7 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Security\AccessManager; use Thelia\Core\Security\AccessManager;
use Thelia\Form\OrderUpdateAddress; use Thelia\Form\OrderUpdateAddress;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\Base\OrderAddressQuery; use Thelia\Model\OrderAddressQuery;
use Thelia\Model\OrderQuery; use Thelia\Model\OrderQuery;
use Thelia\Model\OrderStatusQuery; use Thelia\Model\OrderStatusQuery;
use Thelia\Tools\URL; use Thelia\Tools\URL;

2
core/lib/Thelia/Core/Template/Loop/Attribute.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\AttributeQuery; use Thelia\Model\AttributeQuery;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;
use Thelia\Model\ProductQuery; use Thelia\Model\ProductQuery;

2
core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\AttributeAvQuery; use Thelia\Model\AttributeAvQuery;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;

2
core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\AttributeCombinationQuery; use Thelia\Model\AttributeCombinationQuery;
use Thelia\Model\Map\AttributeAvTableMap; use Thelia\Model\Map\AttributeAvTableMap;
use Thelia\Model\Map\AttributeTableMap; use Thelia\Model\Map\AttributeTableMap;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;

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

@@ -23,7 +23,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\CouponInterface;
use Thelia\Model\Base\CouponModule; use Thelia\Model\CouponModule;
use Thelia\Model\Coupon as MCoupon; use Thelia\Model\Coupon as MCoupon;
use Thelia\Model\CouponCountry; use Thelia\Model\CouponCountry;
use Thelia\Model\CouponQuery; use Thelia\Model\CouponQuery;

2
core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\FeatureAvQuery; use Thelia\Model\FeatureAvQuery;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;

2
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\FeatureProductQuery; use Thelia\Model\FeatureProductQuery;
use Thelia\Model\Map\FeatureAvTableMap; use Thelia\Model\Map\FeatureAvTableMap;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;

2
core/lib/Thelia/Core/Template/Loop/OrderProduct.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\OrderProductQuery; use Thelia\Model\OrderProductQuery;
/** /**
* *

2
core/lib/Thelia/Core/Template/Loop/OrderProductAttributeCombination.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\OrderProductAttributeCombinationQuery; use Thelia\Model\OrderProductAttributeCombinationQuery;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;

2
core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
View File

@@ -22,7 +22,7 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Exception\TaxEngineException; use Thelia\Exception\TaxEngineException;
use Thelia\Model\Base\ProductSaleElementsQuery; use Thelia\Model\ProductSaleElementsQuery;
use Thelia\Model\CurrencyQuery; use Thelia\Model\CurrencyQuery;
use Thelia\Model\Map\ProductSaleElementsTableMap; use Thelia\Model\Map\ProductSaleElementsTableMap;

2
core/lib/Thelia/Core/Template/Loop/ProductTemplate.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\TemplateQuery; use Thelia\Model\TemplateQuery;
/** /**
* *

2
core/lib/Thelia/Core/Template/Loop/Tax.php
View File

@@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\TaxRuleCountryQuery; use Thelia\Model\TaxRuleCountryQuery;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;
use Thelia\Type; use Thelia\Type;
use Thelia\Model\TaxQuery; use Thelia\Model\TaxQuery;

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

@@ -17,7 +17,7 @@ use Thelia\Condition\Implementation\ConditionInterface;
use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\CouponInterface;
use Thelia\Log\Tlog; use Thelia\Log\Tlog;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Model\Base\CouponModule; use Thelia\Model\CouponModule;
use Thelia\Model\Coupon; use Thelia\Model\Coupon;
use Thelia\Model\CouponCountry; use Thelia\Model\CouponCountry;
use Thelia\Model\CouponCustomerCount; use Thelia\Model\CouponCustomerCount;

6
core/lib/Thelia/Form/CouponCreationForm.php
View File

@@ -18,9 +18,9 @@ use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\NotEqualTo; use Symfony\Component\Validator\Constraints\NotEqualTo;
use Symfony\Component\Validator\ExecutionContextInterface; use Symfony\Component\Validator\ExecutionContextInterface;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Model\Base\CountryQuery; use Thelia\Model\CountryQuery;
use Thelia\Model\Base\LangQuery; use Thelia\Model\LangQuery;
use Thelia\Model\Base\ModuleQuery; use Thelia\Model\ModuleQuery;
use Thelia\Model\Module; use Thelia\Model\Module;
use Thelia\Module\BaseModule; use Thelia\Module\BaseModule;

2
core/lib/Thelia/Form/CustomerLogin.php
View File

@@ -17,7 +17,7 @@ use Symfony\Component\Validator\Constraints;
use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ExecutionContextInterface; use Symfony\Component\Validator\ExecutionContextInterface;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Model\Base\CustomerQuery; use Thelia\Model\CustomerQuery;
/** /**
* Class CustomerLogin * Class CustomerLogin

2
core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
View File

@@ -14,7 +14,7 @@ namespace Thelia\Model\Tools;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join; use Propel\Runtime\ActiveQuery\Join;
use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveQuery\ModelCriteria;
use Thelia\Model\Base\LangQuery; use Thelia\Model\LangQuery;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\Lang; use Thelia\Model\Lang;

2
core/lib/Thelia/Tests/Action/AddressTest.php
View File

@@ -14,7 +14,7 @@ namespace Thelia\Tests\Action;
use Thelia\Action\Address; use Thelia\Action\Address;
use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
use Thelia\Model\Base\CustomerQuery; use Thelia\Model\CustomerQuery;
/** /**
* *

6
core/lib/Thelia/Tests/Action/OrderTest.php
View File

@@ -24,9 +24,9 @@ use Thelia\Core\Template\ParserContext;
use Thelia\Core\Template\Smarty\SmartyParser; use Thelia\Core\Template\Smarty\SmartyParser;
use Thelia\Mailer\MailerFactory; use Thelia\Mailer\MailerFactory;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Model\Base\OrderAddressQuery; use Thelia\Model\OrderAddressQuery;
use Thelia\Model\Base\OrderProductQuery; use Thelia\Model\OrderProductQuery;
use Thelia\Model\Base\OrderQuery; use Thelia\Model\OrderQuery;
use Thelia\Model\Cart; use Thelia\Model\Cart;
use Thelia\Model\CartItem; use Thelia\Model\CartItem;
use Thelia\Model\CurrencyQuery; use Thelia\Model\CurrencyQuery;

2
local/modules/Front/Controller/FeedController.php
View File

@@ -18,7 +18,7 @@ use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\HttpFoundation\Response; use Thelia\Core\HttpFoundation\Response;
use Thelia\Log\Tlog; use Thelia\Log\Tlog;
use Thelia\Model\Base\FolderQuery; use Thelia\Model\FolderQuery;
use Thelia\Model\CategoryQuery; use Thelia\Model\CategoryQuery;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\Folder; use Thelia\Model\Folder;