From ab060486d0f941699050de6d3069b23da201fa4a Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Sun, 18 May 2014 20:19:48 +0200 Subject: [PATCH] Fixed Thelia\Model\Base uses. --- core/lib/Thelia/Action/Cart.php | 4 ++-- .../Condition/Implementation/AbstractMatchCountries.php | 5 +++-- .../Condition/Implementation/CartContainsProducts.php | 2 +- .../Thelia/Condition/Implementation/ConditionAbstract.php | 2 +- core/lib/Thelia/Controller/Admin/OrderController.php | 2 +- core/lib/Thelia/Core/Template/Loop/Attribute.php | 2 +- .../lib/Thelia/Core/Template/Loop/AttributeAvailability.php | 2 +- core/lib/Thelia/Core/Template/Loop/AttributeCombination.php | 2 +- core/lib/Thelia/Core/Template/Loop/Coupon.php | 2 +- core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php | 2 +- core/lib/Thelia/Core/Template/Loop/FeatureValue.php | 2 +- core/lib/Thelia/Core/Template/Loop/OrderProduct.php | 2 +- .../Core/Template/Loop/OrderProductAttributeCombination.php | 2 +- core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php | 2 +- core/lib/Thelia/Core/Template/Loop/ProductTemplate.php | 2 +- core/lib/Thelia/Core/Template/Loop/Tax.php | 2 +- core/lib/Thelia/Coupon/CouponManager.php | 2 +- core/lib/Thelia/Form/CouponCreationForm.php | 6 +++--- core/lib/Thelia/Form/CustomerLogin.php | 2 +- core/lib/Thelia/Model/Tools/ModelCriteriaTools.php | 2 +- core/lib/Thelia/Tests/Action/AddressTest.php | 2 +- core/lib/Thelia/Tests/Action/OrderTest.php | 6 +++--- local/modules/Front/Controller/FeedController.php | 2 +- 23 files changed, 30 insertions(+), 29 deletions(-) diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php index da4ff8706..f33a78a60 100644 --- a/core/lib/Thelia/Action/Cart.php +++ b/core/lib/Thelia/Action/Cart.php @@ -17,11 +17,11 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\Currency\CurrencyChangeEvent; use Thelia\Core\Event\TheliaEvents; -use Thelia\Model\Base\ProductSaleElementsQuery; -use Thelia\Model\Currency; use Thelia\Model\CartItem; use Thelia\Model\CartItemQuery; use Thelia\Model\ConfigQuery; +use Thelia\Model\Currency; +use Thelia\Model\ProductSaleElementsQuery; use Thelia\Model\Tools\ProductPriceTools; /** diff --git a/core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php b/core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php index b2d075db2..133c1d93e 100644 --- a/core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php +++ b/core/lib/Thelia/Condition/Implementation/AbstractMatchCountries.php @@ -15,7 +15,8 @@ namespace Thelia\Condition\Implementation; use Thelia\Condition\Operators; use Thelia\Coupon\FacadeInterface; use Thelia\Exception\InvalidConditionValueException; -use Thelia\Model\Base\CountryQuery; +use Thelia\Model\Country; +use Thelia\Model\CountryQuery; /** * Check a Checkout against its Product number @@ -110,7 +111,7 @@ abstract class AbstractMatchCountries extends ConditionAbstract if (null !== $cntryList = CountryQuery::create()->findPks($cntryIds)) { - /** @var Category $cntry */ + /** @var Country $cntry */ foreach ($cntryList as $cntry) { $cntryStrList .= $cntry->getTitle() . ', '; } diff --git a/core/lib/Thelia/Condition/Implementation/CartContainsProducts.php b/core/lib/Thelia/Condition/Implementation/CartContainsProducts.php index 39ce9963e..2d0f25ce6 100644 --- a/core/lib/Thelia/Condition/Implementation/CartContainsProducts.php +++ b/core/lib/Thelia/Condition/Implementation/CartContainsProducts.php @@ -15,7 +15,7 @@ namespace Thelia\Condition\Implementation; use Thelia\Condition\Operators; use Thelia\Coupon\FacadeInterface; use Thelia\Exception\InvalidConditionValueException; -use Thelia\Model\Base\ProductQuery; +use Thelia\Model\ProductQuery; use Thelia\Model\CartItem; use Thelia\Model\Product; diff --git a/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php b/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php index 4289cad3c..bce567ef2 100644 --- a/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php +++ b/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php @@ -19,7 +19,7 @@ use Thelia\Core\Translation\Translator; use Thelia\Coupon\FacadeInterface; use Thelia\Exception\InvalidConditionOperatorException; use Thelia\Exception\InvalidConditionValueException; -use Thelia\Model\Base\CurrencyQuery; +use Thelia\Model\CurrencyQuery; use Thelia\Model\Currency; use Thelia\Type\FloatType; diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php index 4c1c48b5b..9c912f46e 100644 --- a/core/lib/Thelia/Controller/Admin/OrderController.php +++ b/core/lib/Thelia/Controller/Admin/OrderController.php @@ -19,7 +19,7 @@ use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\AccessManager; use Thelia\Form\OrderUpdateAddress; use Thelia\Model\ConfigQuery; -use Thelia\Model\Base\OrderAddressQuery; +use Thelia\Model\OrderAddressQuery; use Thelia\Model\OrderQuery; use Thelia\Model\OrderStatusQuery; use Thelia\Tools\URL; diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php index 451993de0..3dd7ffe8f 100644 --- a/core/lib/Thelia/Core/Template/Loop/Attribute.php +++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\AttributeQuery; +use Thelia\Model\AttributeQuery; use Thelia\Type\TypeCollection; use Thelia\Type; use Thelia\Model\ProductQuery; diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php index 933ebcdce..0a6278c5e 100644 --- a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php +++ b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\AttributeAvQuery; +use Thelia\Model\AttributeAvQuery; use Thelia\Type\TypeCollection; use Thelia\Type; diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php index f39adb95b..bae58b38b 100644 --- a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php +++ b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; 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\AttributeTableMap; use Thelia\Type\TypeCollection; diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php index 4d3a3ba29..14444726d 100644 --- a/core/lib/Thelia/Core/Template/Loop/Coupon.php +++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php @@ -23,7 +23,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Coupon\Type\CouponInterface; -use Thelia\Model\Base\CouponModule; +use Thelia\Model\CouponModule; use Thelia\Model\Coupon as MCoupon; use Thelia\Model\CouponCountry; use Thelia\Model\CouponQuery; diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php index dbf7a97d7..2e0649658 100644 --- a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php +++ b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\FeatureAvQuery; +use Thelia\Model\FeatureAvQuery; use Thelia\Type\TypeCollection; use Thelia\Type; diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php index d8f25d04b..f558d61f5 100644 --- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php +++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\FeatureProductQuery; +use Thelia\Model\FeatureProductQuery; use Thelia\Model\Map\FeatureAvTableMap; use Thelia\Type\TypeCollection; use Thelia\Type; diff --git a/core/lib/Thelia/Core/Template/Loop/OrderProduct.php b/core/lib/Thelia/Core/Template/Loop/OrderProduct.php index 889f3704e..83397a9cb 100644 --- a/core/lib/Thelia/Core/Template/Loop/OrderProduct.php +++ b/core/lib/Thelia/Core/Template/Loop/OrderProduct.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\OrderProductQuery; +use Thelia\Model\OrderProductQuery; /** * diff --git a/core/lib/Thelia/Core/Template/Loop/OrderProductAttributeCombination.php b/core/lib/Thelia/Core/Template/Loop/OrderProductAttributeCombination.php index 881714553..6d961ee8f 100644 --- a/core/lib/Thelia/Core/Template/Loop/OrderProductAttributeCombination.php +++ b/core/lib/Thelia/Core/Template/Loop/OrderProductAttributeCombination.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\OrderProductAttributeCombinationQuery; +use Thelia\Model\OrderProductAttributeCombinationQuery; use Thelia\Type\TypeCollection; use Thelia\Type; diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index 78e740d61..aa4434100 100644 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -22,7 +22,7 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Exception\TaxEngineException; -use Thelia\Model\Base\ProductSaleElementsQuery; +use Thelia\Model\ProductSaleElementsQuery; use Thelia\Model\CurrencyQuery; use Thelia\Model\Map\ProductSaleElementsTableMap; diff --git a/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php b/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php index 362cbe284..7fe4b9508 100644 --- a/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\TemplateQuery; +use Thelia\Model\TemplateQuery; /** * diff --git a/core/lib/Thelia/Core/Template/Loop/Tax.php b/core/lib/Thelia/Core/Template/Loop/Tax.php index cbee32be0..ef3663b56 100644 --- a/core/lib/Thelia/Core/Template/Loop/Tax.php +++ b/core/lib/Thelia/Core/Template/Loop/Tax.php @@ -21,7 +21,7 @@ use Thelia\Core\Template\Element\PropelSearchLoopInterface; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Model\Base\TaxRuleCountryQuery; +use Thelia\Model\TaxRuleCountryQuery; use Thelia\Type\TypeCollection; use Thelia\Type; use Thelia\Model\TaxQuery; diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index 39695a2e6..ecb491673 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -17,7 +17,7 @@ use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Coupon\Type\CouponInterface; use Thelia\Log\Tlog; use Thelia\Model\AddressQuery; -use Thelia\Model\Base\CouponModule; +use Thelia\Model\CouponModule; use Thelia\Model\Coupon; use Thelia\Model\CouponCountry; use Thelia\Model\CouponCustomerCount; diff --git a/core/lib/Thelia/Form/CouponCreationForm.php b/core/lib/Thelia/Form/CouponCreationForm.php index 8bc50af1a..688e8a6ba 100644 --- a/core/lib/Thelia/Form/CouponCreationForm.php +++ b/core/lib/Thelia/Form/CouponCreationForm.php @@ -18,9 +18,9 @@ use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotEqualTo; use Symfony\Component\Validator\ExecutionContextInterface; use Thelia\Core\Translation\Translator; -use Thelia\Model\Base\CountryQuery; -use Thelia\Model\Base\LangQuery; -use Thelia\Model\Base\ModuleQuery; +use Thelia\Model\CountryQuery; +use Thelia\Model\LangQuery; +use Thelia\Model\ModuleQuery; use Thelia\Model\Module; use Thelia\Module\BaseModule; diff --git a/core/lib/Thelia/Form/CustomerLogin.php b/core/lib/Thelia/Form/CustomerLogin.php index 12ba68696..a32d58294 100644 --- a/core/lib/Thelia/Form/CustomerLogin.php +++ b/core/lib/Thelia/Form/CustomerLogin.php @@ -17,7 +17,7 @@ use Symfony\Component\Validator\Constraints; use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ExecutionContextInterface; use Thelia\Core\Translation\Translator; -use Thelia\Model\Base\CustomerQuery; +use Thelia\Model\CustomerQuery; /** * Class CustomerLogin diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php index 4e767a0a3..74ee3e40d 100644 --- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php +++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php @@ -14,7 +14,7 @@ namespace Thelia\Model\Tools; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Join; use Propel\Runtime\ActiveQuery\ModelCriteria; -use Thelia\Model\Base\LangQuery; +use Thelia\Model\LangQuery; use Thelia\Model\ConfigQuery; use Thelia\Model\Lang; diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php index 448c24af2..91101544c 100644 --- a/core/lib/Thelia/Tests/Action/AddressTest.php +++ b/core/lib/Thelia/Tests/Action/AddressTest.php @@ -14,7 +14,7 @@ namespace Thelia\Tests\Action; use Thelia\Action\Address; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; -use Thelia\Model\Base\CustomerQuery; +use Thelia\Model\CustomerQuery; /** * diff --git a/core/lib/Thelia/Tests/Action/OrderTest.php b/core/lib/Thelia/Tests/Action/OrderTest.php index 0963fafad..a37bd1409 100644 --- a/core/lib/Thelia/Tests/Action/OrderTest.php +++ b/core/lib/Thelia/Tests/Action/OrderTest.php @@ -24,9 +24,9 @@ use Thelia\Core\Template\ParserContext; use Thelia\Core\Template\Smarty\SmartyParser; use Thelia\Mailer\MailerFactory; use Thelia\Model\AddressQuery; -use Thelia\Model\Base\OrderAddressQuery; -use Thelia\Model\Base\OrderProductQuery; -use Thelia\Model\Base\OrderQuery; +use Thelia\Model\OrderAddressQuery; +use Thelia\Model\OrderProductQuery; +use Thelia\Model\OrderQuery; use Thelia\Model\Cart; use Thelia\Model\CartItem; use Thelia\Model\CurrencyQuery; diff --git a/local/modules/Front/Controller/FeedController.php b/local/modules/Front/Controller/FeedController.php index 7fc95ed77..4167871df 100644 --- a/local/modules/Front/Controller/FeedController.php +++ b/local/modules/Front/Controller/FeedController.php @@ -18,7 +18,7 @@ use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Response; use Thelia\Log\Tlog; -use Thelia\Model\Base\FolderQuery; +use Thelia\Model\FolderQuery; use Thelia\Model\CategoryQuery; use Thelia\Model\ConfigQuery; use Thelia\Model\Folder;