From c3c7102f7bd4822410406c1cfc8e4fdfa0c9991b Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 27 Dec 2012 11:37:32 +0100 Subject: [PATCH] move Base model to Base directory --- core/lib/Thelia/Model/Accessory.php | 48 +++++++- core/lib/Thelia/Model/Address.php | 2 +- core/lib/Thelia/Model/Admin.php | 2 +- core/lib/Thelia/Model/AdminGroup.php | 2 +- core/lib/Thelia/Model/AdminLog.php | 2 +- core/lib/Thelia/Model/Area.php | 2 +- core/lib/Thelia/Model/Attribute.php | 2 +- core/lib/Thelia/Model/AttributeAv.php | 2 +- core/lib/Thelia/Model/AttributeAvDesc.php | 2 +- core/lib/Thelia/Model/AttributeCategory.php | 2 +- .../lib/Thelia/Model/AttributeCombination.php | 2 +- core/lib/Thelia/Model/AttributeDesc.php | 2 +- core/lib/Thelia/Model/Base.php | 48 -------- core/lib/Thelia/Model/Base/Base.php | 113 ++++++++++++++++++ core/lib/Thelia/Model/Category.php | 2 +- core/lib/Thelia/Model/CategoryDesc.php | 2 +- core/lib/Thelia/Model/Combination.php | 2 +- core/lib/Thelia/Model/Config.php | 2 +- core/lib/Thelia/Model/ConfigDesc.php | 2 +- core/lib/Thelia/Model/Content.php | 2 +- core/lib/Thelia/Model/ContentAssoc.php | 2 +- core/lib/Thelia/Model/ContentDesc.php | 2 +- core/lib/Thelia/Model/ContentFolder.php | 2 +- core/lib/Thelia/Model/Country.php | 2 +- core/lib/Thelia/Model/CountryDesc.php | 2 +- core/lib/Thelia/Model/Coupon.php | 2 +- core/lib/Thelia/Model/CouponOrder.php | 2 +- core/lib/Thelia/Model/CouponRule.php | 2 +- core/lib/Thelia/Model/Currency.php | 2 +- core/lib/Thelia/Model/Customer.php | 2 +- core/lib/Thelia/Model/CustomerTitle.php | 2 +- core/lib/Thelia/Model/CustomerTitleDesc.php | 2 +- core/lib/Thelia/Model/Delivzone.php | 2 +- core/lib/Thelia/Model/Document.php | 2 +- core/lib/Thelia/Model/DocumentDesc.php | 2 +- core/lib/Thelia/Model/Feature.php | 2 +- core/lib/Thelia/Model/FeatureAv.php | 2 +- core/lib/Thelia/Model/FeatureAvDesc.php | 2 +- core/lib/Thelia/Model/FeatureCategory.php | 2 +- core/lib/Thelia/Model/FeatureDesc.php | 2 +- core/lib/Thelia/Model/FeatureProd.php | 2 +- core/lib/Thelia/Model/Folder.php | 2 +- core/lib/Thelia/Model/FolderDesc.php | 2 +- core/lib/Thelia/Model/Group.php | 2 +- core/lib/Thelia/Model/GroupDesc.php | 2 +- core/lib/Thelia/Model/GroupModule.php | 2 +- core/lib/Thelia/Model/GroupResource.php | 2 +- core/lib/Thelia/Model/Image.php | 2 +- core/lib/Thelia/Model/ImageDesc.php | 2 +- core/lib/Thelia/Model/Lang.php | 2 +- core/lib/Thelia/Model/Message.php | 2 +- core/lib/Thelia/Model/MessageDesc.php | 2 +- core/lib/Thelia/Model/Module.php | 2 +- core/lib/Thelia/Model/ModuleDesc.php | 2 +- core/lib/Thelia/Model/Order.php | 2 +- core/lib/Thelia/Model/OrderAddress.php | 2 +- core/lib/Thelia/Model/OrderFeature.php | 2 +- core/lib/Thelia/Model/OrderProduct.php | 2 +- core/lib/Thelia/Model/OrderStatus.php | 2 +- core/lib/Thelia/Model/OrderStatusDesc.php | 2 +- core/lib/Thelia/Model/Product.php | 2 +- core/lib/Thelia/Model/ProductCategory.php | 2 +- core/lib/Thelia/Model/ProductDesc.php | 2 +- core/lib/Thelia/Model/Resource.php | 2 +- core/lib/Thelia/Model/ResourceDesc.php | 2 +- core/lib/Thelia/Model/Rewriting.php | 2 +- core/lib/Thelia/Model/Stock.php | 2 +- core/lib/Thelia/Model/Tax.php | 2 +- core/lib/Thelia/Model/TaxDesc.php | 2 +- core/lib/Thelia/Model/TaxQuery.php | 2 +- core/lib/Thelia/Model/TaxRule.php | 2 +- core/lib/Thelia/Model/TaxRuleCountry.php | 2 +- core/lib/Thelia/Model/TaxRuleDesc.php | 2 +- 73 files changed, 230 insertions(+), 119 deletions(-) delete mode 100644 core/lib/Thelia/Model/Base.php create mode 100644 core/lib/Thelia/Model/Base/Base.php diff --git a/core/lib/Thelia/Model/Accessory.php b/core/lib/Thelia/Model/Accessory.php index 73dc2034f..35fc19a75 100644 --- a/core/lib/Thelia/Model/Accessory.php +++ b/core/lib/Thelia/Model/Accessory.php @@ -2,8 +2,54 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Accessory extends Base { + protected $id; + protected $product_id; + protected $accessory; + protected $position; + + protected $properties = array( + "id", + "product_id", + "accessory", + "position" + ); + + public function getId() { + return $this->id; + } + + public function setId($id) { + $this->id = $id; + } + + public function getProductId() { + return $this->product_id; + } + + public function setProductId($product_id) { + $this->product_id = $product_id; + } + + public function getAccessory() { + return $this->accessory; + } + + public function setAccessory($accessory) { + $this->accessory = $accessory; + } + + public function getPosition() { + return $this->position; + } + + public function setPosition($position) { + $this->position = $position; + } + + + } diff --git a/core/lib/Thelia/Model/Address.php b/core/lib/Thelia/Model/Address.php index b39930d03..6ac5cf37b 100644 --- a/core/lib/Thelia/Model/Address.php +++ b/core/lib/Thelia/Model/Address.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Address extends Base { diff --git a/core/lib/Thelia/Model/Admin.php b/core/lib/Thelia/Model/Admin.php index 1e5aca138..d0d52fcc5 100644 --- a/core/lib/Thelia/Model/Admin.php +++ b/core/lib/Thelia/Model/Admin.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Admin extends Base { diff --git a/core/lib/Thelia/Model/AdminGroup.php b/core/lib/Thelia/Model/AdminGroup.php index 62e86f66d..570d49f70 100644 --- a/core/lib/Thelia/Model/AdminGroup.php +++ b/core/lib/Thelia/Model/AdminGroup.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AdminGroup extends Base { diff --git a/core/lib/Thelia/Model/AdminLog.php b/core/lib/Thelia/Model/AdminLog.php index c5f3ee815..f6d940753 100644 --- a/core/lib/Thelia/Model/AdminLog.php +++ b/core/lib/Thelia/Model/AdminLog.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AdminLog extends Base { diff --git a/core/lib/Thelia/Model/Area.php b/core/lib/Thelia/Model/Area.php index 45f1e0524..18d61ed48 100644 --- a/core/lib/Thelia/Model/Area.php +++ b/core/lib/Thelia/Model/Area.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Area extends Base { diff --git a/core/lib/Thelia/Model/Attribute.php b/core/lib/Thelia/Model/Attribute.php index a4c8c471e..f15ed756d 100644 --- a/core/lib/Thelia/Model/Attribute.php +++ b/core/lib/Thelia/Model/Attribute.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Attribute extends Base { diff --git a/core/lib/Thelia/Model/AttributeAv.php b/core/lib/Thelia/Model/AttributeAv.php index c9313368d..c1dbc3f74 100644 --- a/core/lib/Thelia/Model/AttributeAv.php +++ b/core/lib/Thelia/Model/AttributeAv.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AttributeAv extends Base { diff --git a/core/lib/Thelia/Model/AttributeAvDesc.php b/core/lib/Thelia/Model/AttributeAvDesc.php index 421d78833..5d01092f8 100644 --- a/core/lib/Thelia/Model/AttributeAvDesc.php +++ b/core/lib/Thelia/Model/AttributeAvDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AttributeAvDesc extends Base { diff --git a/core/lib/Thelia/Model/AttributeCategory.php b/core/lib/Thelia/Model/AttributeCategory.php index af9ec9bdc..c1217bc69 100644 --- a/core/lib/Thelia/Model/AttributeCategory.php +++ b/core/lib/Thelia/Model/AttributeCategory.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AttributeCategory extends Base { diff --git a/core/lib/Thelia/Model/AttributeCombination.php b/core/lib/Thelia/Model/AttributeCombination.php index bd1ffa52f..fee75cae7 100644 --- a/core/lib/Thelia/Model/AttributeCombination.php +++ b/core/lib/Thelia/Model/AttributeCombination.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AttributeCombination extends Base { diff --git a/core/lib/Thelia/Model/AttributeDesc.php b/core/lib/Thelia/Model/AttributeDesc.php index 2e3136f75..dc4df9f05 100644 --- a/core/lib/Thelia/Model/AttributeDesc.php +++ b/core/lib/Thelia/Model/AttributeDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class AttributeDesc extends Base { diff --git a/core/lib/Thelia/Model/Base.php b/core/lib/Thelia/Model/Base.php deleted file mode 100644 index 05613d385..000000000 --- a/core/lib/Thelia/Model/Base.php +++ /dev/null @@ -1,48 +0,0 @@ -db = $NotORM; - $this->table = $this->getTableName(); - } - - protected function getTableName() - { - return $this->underscore(__CLASS__); - } - - protected function underscore($camel_cased_word) - { - $tmp = $camel_cased_word; - $tmp = str_replace('::', '/', $tmp); - $tmp = self::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2', - '/([a-z\d])([A-Z])/' => '\\1_\\2')); - return strtolower($tmp); - } - - public static function pregtr($search, $replacePairs) - { - return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search); - } -} diff --git a/core/lib/Thelia/Model/Base/Base.php b/core/lib/Thelia/Model/Base/Base.php new file mode 100644 index 000000000..c4ae7307d --- /dev/null +++ b/core/lib/Thelia/Model/Base/Base.php @@ -0,0 +1,113 @@ +db = $NotORM; + $this->table = $this->getTableName(); + } + + public function getUpdatedAt() { + return $this->updated_at; + } + + public function setUpdatedAt($updated_at) { + $this->updated_at = $updated_at; + } + + public function getCreatedAt() { + return $this->created_at; + } + + public function setCreatedAt($created_at) { + $this->created_at = $created_at; + } + + /** + * + * @return \NotORM + */ + public function getDb() { + return $this->db; + } + + public function getTable() { + return $this->table; + } + + + public function save() + { + $this->updated_at = $this->created_at = date('Y-m-d H:i:s'); + } + + /** + * + * @return string name of the current table + */ + protected function getTableName() + { + return $this->underscore(__CLASS__); + } + + /** + * + * extract from symfony 1.4 + * + * change camelized wirnd into underscore word. + * + * ex : AttributeCategory => attribute_category + * + * @param string $camel_cased_word + * @return string + */ + protected function underscore($camel_cased_word) + { + $tmp = $camel_cased_word; + $tmp = str_replace('::', '/', $tmp); + $tmp = self::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2', + '/([a-z\d])([A-Z])/' => '\\1_\\2')); + return strtolower($tmp); + } + + public static function pregtr($search, $replacePairs) + { + return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search); + } +} diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index 599ba0bf8..7b3052924 100644 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Category extends Base { diff --git a/core/lib/Thelia/Model/CategoryDesc.php b/core/lib/Thelia/Model/CategoryDesc.php index f65ec13c6..7b57a63f8 100644 --- a/core/lib/Thelia/Model/CategoryDesc.php +++ b/core/lib/Thelia/Model/CategoryDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CategoryDesc extends Base { diff --git a/core/lib/Thelia/Model/Combination.php b/core/lib/Thelia/Model/Combination.php index d25a3bf59..c04ac603b 100644 --- a/core/lib/Thelia/Model/Combination.php +++ b/core/lib/Thelia/Model/Combination.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Combination extends Base { diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php index 275e1b5c9..56c064ce7 100644 --- a/core/lib/Thelia/Model/Config.php +++ b/core/lib/Thelia/Model/Config.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Config extends Base { diff --git a/core/lib/Thelia/Model/ConfigDesc.php b/core/lib/Thelia/Model/ConfigDesc.php index 11eae43c8..1bc53a128 100644 --- a/core/lib/Thelia/Model/ConfigDesc.php +++ b/core/lib/Thelia/Model/ConfigDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ConfigDesc extends Base { diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index 1a0a0dc27..30bd8f723 100644 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Content extends Base { diff --git a/core/lib/Thelia/Model/ContentAssoc.php b/core/lib/Thelia/Model/ContentAssoc.php index 104cff1a5..3d5df489d 100644 --- a/core/lib/Thelia/Model/ContentAssoc.php +++ b/core/lib/Thelia/Model/ContentAssoc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ContentAssoc extends Base { diff --git a/core/lib/Thelia/Model/ContentDesc.php b/core/lib/Thelia/Model/ContentDesc.php index 268c6cb1f..2ded1137e 100644 --- a/core/lib/Thelia/Model/ContentDesc.php +++ b/core/lib/Thelia/Model/ContentDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ContentDesc extends Base { diff --git a/core/lib/Thelia/Model/ContentFolder.php b/core/lib/Thelia/Model/ContentFolder.php index 17d8cfcaa..5df9ed17f 100644 --- a/core/lib/Thelia/Model/ContentFolder.php +++ b/core/lib/Thelia/Model/ContentFolder.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ContentFolder extends Base { diff --git a/core/lib/Thelia/Model/Country.php b/core/lib/Thelia/Model/Country.php index 88adf6587..35725e51e 100644 --- a/core/lib/Thelia/Model/Country.php +++ b/core/lib/Thelia/Model/Country.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Country extends Base { diff --git a/core/lib/Thelia/Model/CountryDesc.php b/core/lib/Thelia/Model/CountryDesc.php index 947cb913f..d57a6aca2 100644 --- a/core/lib/Thelia/Model/CountryDesc.php +++ b/core/lib/Thelia/Model/CountryDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CountryDesc extends Base { diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index bee102cca..95f4b14da 100644 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Coupon extends Base { diff --git a/core/lib/Thelia/Model/CouponOrder.php b/core/lib/Thelia/Model/CouponOrder.php index 61256dd42..35d407e65 100644 --- a/core/lib/Thelia/Model/CouponOrder.php +++ b/core/lib/Thelia/Model/CouponOrder.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CouponOrder extends Base { diff --git a/core/lib/Thelia/Model/CouponRule.php b/core/lib/Thelia/Model/CouponRule.php index a9417d063..8ae3b7cb4 100644 --- a/core/lib/Thelia/Model/CouponRule.php +++ b/core/lib/Thelia/Model/CouponRule.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CouponRule extends Base { diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php index 11e018367..e75de6de4 100644 --- a/core/lib/Thelia/Model/Currency.php +++ b/core/lib/Thelia/Model/Currency.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Currency extends Base { diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php index 264840226..e14bf9eeb 100644 --- a/core/lib/Thelia/Model/Customer.php +++ b/core/lib/Thelia/Model/Customer.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Customer extends Base { diff --git a/core/lib/Thelia/Model/CustomerTitle.php b/core/lib/Thelia/Model/CustomerTitle.php index affaaa060..69da9ef37 100644 --- a/core/lib/Thelia/Model/CustomerTitle.php +++ b/core/lib/Thelia/Model/CustomerTitle.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CustomerTitle extends Base { diff --git a/core/lib/Thelia/Model/CustomerTitleDesc.php b/core/lib/Thelia/Model/CustomerTitleDesc.php index 8cb979907..238e4d868 100644 --- a/core/lib/Thelia/Model/CustomerTitleDesc.php +++ b/core/lib/Thelia/Model/CustomerTitleDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class CustomerTitleDesc extends Base { diff --git a/core/lib/Thelia/Model/Delivzone.php b/core/lib/Thelia/Model/Delivzone.php index f256a62a5..c4027d8c4 100644 --- a/core/lib/Thelia/Model/Delivzone.php +++ b/core/lib/Thelia/Model/Delivzone.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Delivzone extends Base { diff --git a/core/lib/Thelia/Model/Document.php b/core/lib/Thelia/Model/Document.php index a168d1d29..73338b30a 100644 --- a/core/lib/Thelia/Model/Document.php +++ b/core/lib/Thelia/Model/Document.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Document extends Base { diff --git a/core/lib/Thelia/Model/DocumentDesc.php b/core/lib/Thelia/Model/DocumentDesc.php index 34f39cb69..6e1c3eca8 100644 --- a/core/lib/Thelia/Model/DocumentDesc.php +++ b/core/lib/Thelia/Model/DocumentDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class DocumentDesc extends Base { diff --git a/core/lib/Thelia/Model/Feature.php b/core/lib/Thelia/Model/Feature.php index dfe786af3..9f6cb5fc7 100644 --- a/core/lib/Thelia/Model/Feature.php +++ b/core/lib/Thelia/Model/Feature.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Feature extends Base { diff --git a/core/lib/Thelia/Model/FeatureAv.php b/core/lib/Thelia/Model/FeatureAv.php index 4e17e03a7..617ce0181 100644 --- a/core/lib/Thelia/Model/FeatureAv.php +++ b/core/lib/Thelia/Model/FeatureAv.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FeatureAv extends Base { diff --git a/core/lib/Thelia/Model/FeatureAvDesc.php b/core/lib/Thelia/Model/FeatureAvDesc.php index 351ece9a6..9bd51f288 100644 --- a/core/lib/Thelia/Model/FeatureAvDesc.php +++ b/core/lib/Thelia/Model/FeatureAvDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FeatureAvDesc extends Base { diff --git a/core/lib/Thelia/Model/FeatureCategory.php b/core/lib/Thelia/Model/FeatureCategory.php index 59a37cb45..03ea63097 100644 --- a/core/lib/Thelia/Model/FeatureCategory.php +++ b/core/lib/Thelia/Model/FeatureCategory.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FeatureCategory extends Base { diff --git a/core/lib/Thelia/Model/FeatureDesc.php b/core/lib/Thelia/Model/FeatureDesc.php index 84f7cbb0f..2c5d1af3d 100644 --- a/core/lib/Thelia/Model/FeatureDesc.php +++ b/core/lib/Thelia/Model/FeatureDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FeatureDesc extends Base { diff --git a/core/lib/Thelia/Model/FeatureProd.php b/core/lib/Thelia/Model/FeatureProd.php index 8fae9ff45..0c7e66aa5 100644 --- a/core/lib/Thelia/Model/FeatureProd.php +++ b/core/lib/Thelia/Model/FeatureProd.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FeatureProd extends Base { diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index 3ac64e7a7..f477e1fc0 100644 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Folder extends Base { diff --git a/core/lib/Thelia/Model/FolderDesc.php b/core/lib/Thelia/Model/FolderDesc.php index 61a1b40c0..2caf60afd 100644 --- a/core/lib/Thelia/Model/FolderDesc.php +++ b/core/lib/Thelia/Model/FolderDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class FolderDesc extends Base { diff --git a/core/lib/Thelia/Model/Group.php b/core/lib/Thelia/Model/Group.php index 0eed80c8d..5b4c63859 100644 --- a/core/lib/Thelia/Model/Group.php +++ b/core/lib/Thelia/Model/Group.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Group extends Base { diff --git a/core/lib/Thelia/Model/GroupDesc.php b/core/lib/Thelia/Model/GroupDesc.php index c2ac447b2..74e7aa68c 100644 --- a/core/lib/Thelia/Model/GroupDesc.php +++ b/core/lib/Thelia/Model/GroupDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class GroupDesc extends Base { diff --git a/core/lib/Thelia/Model/GroupModule.php b/core/lib/Thelia/Model/GroupModule.php index d78873472..ef2a55ba7 100644 --- a/core/lib/Thelia/Model/GroupModule.php +++ b/core/lib/Thelia/Model/GroupModule.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class GroupModule extends Base { diff --git a/core/lib/Thelia/Model/GroupResource.php b/core/lib/Thelia/Model/GroupResource.php index 94c86471a..0f3e08f74 100644 --- a/core/lib/Thelia/Model/GroupResource.php +++ b/core/lib/Thelia/Model/GroupResource.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class GroupResource extends Base { diff --git a/core/lib/Thelia/Model/Image.php b/core/lib/Thelia/Model/Image.php index 72ff7e36b..00be6b92f 100644 --- a/core/lib/Thelia/Model/Image.php +++ b/core/lib/Thelia/Model/Image.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Image extends Base { diff --git a/core/lib/Thelia/Model/ImageDesc.php b/core/lib/Thelia/Model/ImageDesc.php index 80d04d1db..a9ae56246 100644 --- a/core/lib/Thelia/Model/ImageDesc.php +++ b/core/lib/Thelia/Model/ImageDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ImageDesc extends Base { diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php index 1ec133aba..31b1e27bf 100644 --- a/core/lib/Thelia/Model/Lang.php +++ b/core/lib/Thelia/Model/Lang.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Lang extends Base { diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php index 5b62f9cdd..a15da114c 100644 --- a/core/lib/Thelia/Model/Message.php +++ b/core/lib/Thelia/Model/Message.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Message extends Base { diff --git a/core/lib/Thelia/Model/MessageDesc.php b/core/lib/Thelia/Model/MessageDesc.php index 09ec56e67..bae716dd3 100644 --- a/core/lib/Thelia/Model/MessageDesc.php +++ b/core/lib/Thelia/Model/MessageDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class MessageDesc extends Base { diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php index 8af9aa244..e55c1eebd 100644 --- a/core/lib/Thelia/Model/Module.php +++ b/core/lib/Thelia/Model/Module.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Module extends Base { diff --git a/core/lib/Thelia/Model/ModuleDesc.php b/core/lib/Thelia/Model/ModuleDesc.php index 4aa5097b6..2f66578bf 100644 --- a/core/lib/Thelia/Model/ModuleDesc.php +++ b/core/lib/Thelia/Model/ModuleDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ModuleDesc extends Base { diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 4d951eaef..0c2226cea 100644 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Order extends Base { diff --git a/core/lib/Thelia/Model/OrderAddress.php b/core/lib/Thelia/Model/OrderAddress.php index 1234a4b61..4cc719d40 100644 --- a/core/lib/Thelia/Model/OrderAddress.php +++ b/core/lib/Thelia/Model/OrderAddress.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class OrderAddress extends Base { diff --git a/core/lib/Thelia/Model/OrderFeature.php b/core/lib/Thelia/Model/OrderFeature.php index 292a0ddb4..abb50d1a8 100644 --- a/core/lib/Thelia/Model/OrderFeature.php +++ b/core/lib/Thelia/Model/OrderFeature.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class OrderFeature extends Base { diff --git a/core/lib/Thelia/Model/OrderProduct.php b/core/lib/Thelia/Model/OrderProduct.php index 8f33cfe33..f21a9d03e 100644 --- a/core/lib/Thelia/Model/OrderProduct.php +++ b/core/lib/Thelia/Model/OrderProduct.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class OrderProduct extends Base { diff --git a/core/lib/Thelia/Model/OrderStatus.php b/core/lib/Thelia/Model/OrderStatus.php index 1168f8e27..792911d35 100644 --- a/core/lib/Thelia/Model/OrderStatus.php +++ b/core/lib/Thelia/Model/OrderStatus.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class OrderStatus extends Base { diff --git a/core/lib/Thelia/Model/OrderStatusDesc.php b/core/lib/Thelia/Model/OrderStatusDesc.php index fa9fbf49a..4e6b7cccd 100644 --- a/core/lib/Thelia/Model/OrderStatusDesc.php +++ b/core/lib/Thelia/Model/OrderStatusDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class OrderStatusDesc extends Base { diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 6fe855d28..e5b03ca50 100644 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Product extends Base { diff --git a/core/lib/Thelia/Model/ProductCategory.php b/core/lib/Thelia/Model/ProductCategory.php index b983596f8..00af6dd2c 100644 --- a/core/lib/Thelia/Model/ProductCategory.php +++ b/core/lib/Thelia/Model/ProductCategory.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ProductCategory extends Base { diff --git a/core/lib/Thelia/Model/ProductDesc.php b/core/lib/Thelia/Model/ProductDesc.php index 982388e41..87b0ff014 100644 --- a/core/lib/Thelia/Model/ProductDesc.php +++ b/core/lib/Thelia/Model/ProductDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ProductDesc extends Base { diff --git a/core/lib/Thelia/Model/Resource.php b/core/lib/Thelia/Model/Resource.php index 8960046ab..79fa27c7b 100644 --- a/core/lib/Thelia/Model/Resource.php +++ b/core/lib/Thelia/Model/Resource.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Resource extends Base { diff --git a/core/lib/Thelia/Model/ResourceDesc.php b/core/lib/Thelia/Model/ResourceDesc.php index 76efedd30..4c04b7450 100644 --- a/core/lib/Thelia/Model/ResourceDesc.php +++ b/core/lib/Thelia/Model/ResourceDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class ResourceDesc extends Base { diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php index 1c4c7c192..e760fb543 100644 --- a/core/lib/Thelia/Model/Rewriting.php +++ b/core/lib/Thelia/Model/Rewriting.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Rewriting extends Base { diff --git a/core/lib/Thelia/Model/Stock.php b/core/lib/Thelia/Model/Stock.php index ec412b7ab..ac8a9a144 100644 --- a/core/lib/Thelia/Model/Stock.php +++ b/core/lib/Thelia/Model/Stock.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Stock extends Base { diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php index c974cdf74..1649feca2 100644 --- a/core/lib/Thelia/Model/Tax.php +++ b/core/lib/Thelia/Model/Tax.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class Tax extends Base { diff --git a/core/lib/Thelia/Model/TaxDesc.php b/core/lib/Thelia/Model/TaxDesc.php index d4b5aa13e..9126dcf97 100644 --- a/core/lib/Thelia/Model/TaxDesc.php +++ b/core/lib/Thelia/Model/TaxDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class TaxDesc extends Base { diff --git a/core/lib/Thelia/Model/TaxQuery.php b/core/lib/Thelia/Model/TaxQuery.php index 861d42957..3822236ae 100644 --- a/core/lib/Thelia/Model/TaxQuery.php +++ b/core/lib/Thelia/Model/TaxQuery.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class TaxQuery extends Base { diff --git a/core/lib/Thelia/Model/TaxRule.php b/core/lib/Thelia/Model/TaxRule.php index 230cd665a..fa7f2fd05 100644 --- a/core/lib/Thelia/Model/TaxRule.php +++ b/core/lib/Thelia/Model/TaxRule.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class TaxRule extends Base { diff --git a/core/lib/Thelia/Model/TaxRuleCountry.php b/core/lib/Thelia/Model/TaxRuleCountry.php index cbc9da241..898a9c69b 100644 --- a/core/lib/Thelia/Model/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/TaxRuleCountry.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class TaxRuleCountry extends Base { diff --git a/core/lib/Thelia/Model/TaxRuleDesc.php b/core/lib/Thelia/Model/TaxRuleDesc.php index 7cb971d5b..3190a5eec 100644 --- a/core/lib/Thelia/Model/TaxRuleDesc.php +++ b/core/lib/Thelia/Model/TaxRuleDesc.php @@ -2,7 +2,7 @@ namespace Thelia\Model; -use Thelia\Model\Base; +use Thelia\Model\Base\Base; class TaxRuleDesc extends Base {