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

migrte propel to propel 2

Browse Source
This commit is contained in:
Manuel Raynaud
2013-07-04 19:31:09 +02:00
parent dcb3baaf4c
commit 5fda702b8d
531 changed files with 516 additions and 287452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -10,7 +10,7 @@
"php": ">=5.3",
"ezyang/htmlpurifier": "dev-master",
"ircmaxell/password-compat": "dev-master",
"propel/propel1" : "1.6.*",
"propel/propel": "2.0.0-alpha1",
"psr/log" : "1.0",
"symfony/class-loader": "2.2.*",
"symfony/config" : "2.2.*",

18
core/lib/Thelia/Config/DefinePropel.php
View File

@@ -41,20 +41,10 @@ class DefinePropel {
{
$connection = $this->processorConfig["connection"];
return $conf = array(
"datasources" =>
array(
"thelia" =>
array(
"adapter" => $connection["driver"],
"connection" =>
array(
"dsn" => $connection["dsn"],
"user" => $connection["user"],
"password" => $connection["password"],
"classname" => $connection["classname"]
)
)
)
"dsn" => $connection["dsn"],
"user" => $connection["user"],
"password" => $connection["password"],
//"classname" => $connection["classname"]
);
}
}

7
core/lib/Thelia/Core/Template/Element/BaseLoop.php
View File

@@ -26,6 +26,7 @@ namespace Thelia\Core\Template\Element;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Thelia\Core\Template\Loop\Argument\Argument;
use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
*
@@ -78,7 +79,7 @@ abstract class BaseLoop
*
* @return array|mixed|\PropelModelPager|\PropelObjectCollection
*/
public function search(\ModelCriteria $search, &$pagination = null)
public function search(ModelCriteria $search, &$pagination = null)
{
if($this->page !== null) {
return $this->searchWithPagination($search, $pagination);
@@ -92,7 +93,7 @@ abstract class BaseLoop
*
* @return array|mixed|\PropelObjectCollection
*/
public function searchWithOffset(\ModelCriteria $search)
public function searchWithOffset(ModelCriteria $search)
{
if($this->limit >= 0) {
$search->limit($this->limit);
@@ -108,7 +109,7 @@ abstract class BaseLoop
*
* @return array|\PropelModelPager
*/
public function searchWithPagination(\ModelCriteria $search, &$pagination)
public function searchWithPagination(ModelCriteria $search, &$pagination)
{
$pagination = $search->paginate($this->page, $this->limit);

9
core/lib/Thelia/Core/Template/Loop/Category.php
View File

@@ -23,6 +23,7 @@
namespace Thelia\Core\Template\Loop;
use Propel\Runtime\ActiveQuery\ModelCriteria;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
@@ -108,7 +109,7 @@ class Category extends BaseLoop
$search = CategoryQuery::create();
if (!is_null($this->id)) {
$search->filterById(explode(',', $this->id), \Criteria::IN);
$search->filterById(explode(',', $this->id), ModelCriteria::IN);
}
if (!is_null($this->parent)) {
@@ -118,11 +119,11 @@ class Category extends BaseLoop
if ($this->current == 1) {
$search->filterById($this->request->get("category_id"));
} elseif (null !== $this->current && $this->current == 0) {
$search->filterById($this->request->get("category_id"), \Criteria::NOT_IN);
$search->filterById($this->request->get("category_id"), ModelCriteria::NOT_IN);
}
if (!is_null($this->exclude)) {
$search->filterById(explode(",", $this->exclude), \Criteria::NOT_IN);
$search->filterById(explode(",", $this->exclude), ModelCriteria::NOT_IN);
}
if (!is_null($this->link)) {
@@ -156,7 +157,7 @@ class Category extends BaseLoop
*
* @todo : verify here if we want results for row without translations.
*/
$search->joinWithI18n($this->request->getSession()->get('locale', 'en_US'), \Criteria::INNER_JOIN);
$search->joinWithI18n('en_US');
$categories = $this->search($search, $pagination);

17
core/lib/Thelia/Core/Thelia.php
View File

@@ -46,8 +46,8 @@ use Thelia\Core\TheliaContainerBuilder;
use Thelia\Core\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\Config\FileLocator;
use Propel;
use PropelConfiguration;
use Propel\Runtime\Propel;
use Propel\Runtime\Connection\ConnectionManagerSingle;
class Thelia extends Kernel
{
@@ -71,7 +71,7 @@ class Thelia extends Kernel
return ;
}
if (! Propel::isInit()) {
/* if (! Propel::isInit()) {
$definePropel = new DefinePropel(new DatabaseConfiguration(),
Yaml::parse(THELIA_ROOT . '/local/config/database.yml'));
@@ -97,7 +97,16 @@ class Thelia extends Kernel
}
Propel::initialize();
}
}*/
$definePropel = new DefinePropel(new DatabaseConfiguration(),
Yaml::parse(THELIA_ROOT . '/local/config/database.yml'));
$propelConfig = $definePropel->getConfig();
$serviceContainer = Propel::getServiceContainer();
$serviceContainer->setAdapterClass('thelia', 'mysql');
$manager = new ConnectionManagerSingle();
$manager->setConfiguration($definePropel->getConfig());
$serviceContainer->setConnectionManager('thelia', $manager);
}
/**

16
core/lib/Thelia/Model/Accessory.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAccessory;
use Thelia\Model\Base\Accessory as BaseAccessory;
class Accessory extends BaseAccessory {
/**
* Skeleton subclass for representing a row from the 'accessory' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Accessory extends BaseAccessory
{
}

21
core/lib/Thelia/Model/AccessoryPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAccessoryPeer;
/**
* Skeleton subclass for performing query and update operations on the 'accessory' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AccessoryPeer extends BaseAccessoryPeer
{
}

9
core/lib/Thelia/Model/AccessoryQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAccessoryQuery;
use Thelia\Model\Base\AccessoryQuery as BaseAccessoryQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAccessoryQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AccessoryQuery extends BaseAccessoryQuery
{
}
class AccessoryQuery extends BaseAccessoryQuery {
} // AccessoryQuery

16
core/lib/Thelia/Model/Address.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAddress;
use Thelia\Model\Base\Address as BaseAddress;
class Address extends BaseAddress {
/**
* Skeleton subclass for representing a row from the 'address' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Address extends BaseAddress
{
}

21
core/lib/Thelia/Model/AddressPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAddressPeer;
/**
* Skeleton subclass for performing query and update operations on the 'address' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AddressPeer extends BaseAddressPeer
{
}

9
core/lib/Thelia/Model/AddressQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAddressQuery;
use Thelia\Model\Base\AddressQuery as BaseAddressQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAddressQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AddressQuery extends BaseAddressQuery
{
}
class AddressQuery extends BaseAddressQuery {
} // AddressQuery

16
core/lib/Thelia/Model/Admin.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdmin;
use Thelia\Model\Base\Admin as BaseAdmin;
class Admin extends BaseAdmin {
/**
* Skeleton subclass for representing a row from the 'admin' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Admin extends BaseAdmin
{
}

16
core/lib/Thelia/Model/AdminGroup.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminGroup;
use Thelia\Model\Base\AdminGroup as BaseAdminGroup;
class AdminGroup extends BaseAdminGroup {
/**
* Skeleton subclass for representing a row from the 'admin_group' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminGroup extends BaseAdminGroup
{
}

21
core/lib/Thelia/Model/AdminGroupPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminGroupPeer;
/**
* Skeleton subclass for performing query and update operations on the 'admin_group' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminGroupPeer extends BaseAdminGroupPeer
{
}

9
core/lib/Thelia/Model/AdminGroupQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminGroupQuery;
use Thelia\Model\Base\AdminGroupQuery as BaseAdminGroupQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAdminGroupQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminGroupQuery extends BaseAdminGroupQuery
{
}
class AdminGroupQuery extends BaseAdminGroupQuery {
} // AdminGroupQuery

16
core/lib/Thelia/Model/AdminLog.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminLog;
use Thelia\Model\Base\AdminLog as BaseAdminLog;
class AdminLog extends BaseAdminLog {
/**
* Skeleton subclass for representing a row from the 'admin_log' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminLog extends BaseAdminLog
{
}

21
core/lib/Thelia/Model/AdminLogPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminLogPeer;
/**
* Skeleton subclass for performing query and update operations on the 'admin_log' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminLogPeer extends BaseAdminLogPeer
{
}

9
core/lib/Thelia/Model/AdminLogQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminLogQuery;
use Thelia\Model\Base\AdminLogQuery as BaseAdminLogQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAdminLogQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminLogQuery extends BaseAdminLogQuery
{
}
class AdminLogQuery extends BaseAdminLogQuery {
} // AdminLogQuery

21
core/lib/Thelia/Model/AdminPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminPeer;
/**
* Skeleton subclass for performing query and update operations on the 'admin' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminPeer extends BaseAdminPeer
{
}

9
core/lib/Thelia/Model/AdminQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAdminQuery;
use Thelia\Model\Base\AdminQuery as BaseAdminQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAdminQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AdminQuery extends BaseAdminQuery
{
}
class AdminQuery extends BaseAdminQuery {
} // AdminQuery

16
core/lib/Thelia/Model/Area.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseArea;
use Thelia\Model\Base\Area as BaseArea;
class Area extends BaseArea {
/**
* Skeleton subclass for representing a row from the 'area' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Area extends BaseArea
{
}

21
core/lib/Thelia/Model/AreaPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAreaPeer;
/**
* Skeleton subclass for performing query and update operations on the 'area' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AreaPeer extends BaseAreaPeer
{
}

9
core/lib/Thelia/Model/AreaQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAreaQuery;
use Thelia\Model\Base\AreaQuery as BaseAreaQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAreaQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AreaQuery extends BaseAreaQuery
{
}
class AreaQuery extends BaseAreaQuery {
} // AreaQuery

16
core/lib/Thelia/Model/Attribute.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttribute;
use Thelia\Model\Base\Attribute as BaseAttribute;
class Attribute extends BaseAttribute {
/**
* Skeleton subclass for representing a row from the 'attribute' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Attribute extends BaseAttribute
{
}

16
core/lib/Thelia/Model/AttributeAv.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAv;
use Thelia\Model\Base\AttributeAv as BaseAttributeAv;
class AttributeAv extends BaseAttributeAv {
/**
* Skeleton subclass for representing a row from the 'attribute_av' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAv extends BaseAttributeAv
{
}

16
core/lib/Thelia/Model/AttributeAvI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAvI18n;
use Thelia\Model\Base\AttributeAvI18n as BaseAttributeAvI18n;
class AttributeAvI18n extends BaseAttributeAvI18n {
/**
* Skeleton subclass for representing a row from the 'attribute_av_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAvI18n extends BaseAttributeAvI18n
{
}

21
core/lib/Thelia/Model/AttributeAvI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAvI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute_av_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAvI18nPeer extends BaseAttributeAvI18nPeer
{
}

9
core/lib/Thelia/Model/AttributeAvI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAvI18nQuery;
use Thelia\Model\Base\AttributeAvI18nQuery as BaseAttributeAvI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeAvI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAvI18nQuery extends BaseAttributeAvI18nQuery
{
}
class AttributeAvI18nQuery extends BaseAttributeAvI18nQuery {
} // AttributeAvI18nQuery

21
core/lib/Thelia/Model/AttributeAvPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAvPeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute_av' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAvPeer extends BaseAttributeAvPeer
{
}

9
core/lib/Thelia/Model/AttributeAvQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeAvQuery;
use Thelia\Model\Base\AttributeAvQuery as BaseAttributeAvQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeAvQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeAvQuery extends BaseAttributeAvQuery
{
}
class AttributeAvQuery extends BaseAttributeAvQuery {
} // AttributeAvQuery

16
core/lib/Thelia/Model/AttributeCategory.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCategory;
use Thelia\Model\Base\AttributeCategory as BaseAttributeCategory;
class AttributeCategory extends BaseAttributeCategory {
/**
* Skeleton subclass for representing a row from the 'attribute_category' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCategory extends BaseAttributeCategory
{
}

21
core/lib/Thelia/Model/AttributeCategoryPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCategoryPeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute_category' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCategoryPeer extends BaseAttributeCategoryPeer
{
}

9
core/lib/Thelia/Model/AttributeCategoryQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCategoryQuery;
use Thelia\Model\Base\AttributeCategoryQuery as BaseAttributeCategoryQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeCategoryQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCategoryQuery extends BaseAttributeCategoryQuery
{
}
class AttributeCategoryQuery extends BaseAttributeCategoryQuery {
} // AttributeCategoryQuery

16
core/lib/Thelia/Model/AttributeCombination.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCombination;
use Thelia\Model\Base\AttributeCombination as BaseAttributeCombination;
class AttributeCombination extends BaseAttributeCombination {
/**
* Skeleton subclass for representing a row from the 'attribute_combination' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCombination extends BaseAttributeCombination
{
}

21
core/lib/Thelia/Model/AttributeCombinationPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCombinationPeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute_combination' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCombinationPeer extends BaseAttributeCombinationPeer
{
}

9
core/lib/Thelia/Model/AttributeCombinationQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeCombinationQuery;
use Thelia\Model\Base\AttributeCombinationQuery as BaseAttributeCombinationQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeCombinationQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeCombinationQuery extends BaseAttributeCombinationQuery
{
}
class AttributeCombinationQuery extends BaseAttributeCombinationQuery {
} // AttributeCombinationQuery

16
core/lib/Thelia/Model/AttributeI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeI18n;
use Thelia\Model\Base\AttributeI18n as BaseAttributeI18n;
class AttributeI18n extends BaseAttributeI18n {
/**
* Skeleton subclass for representing a row from the 'attribute_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeI18n extends BaseAttributeI18n
{
}

21
core/lib/Thelia/Model/AttributeI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeI18nPeer extends BaseAttributeI18nPeer
{
}

9
core/lib/Thelia/Model/AttributeI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeI18nQuery;
use Thelia\Model\Base\AttributeI18nQuery as BaseAttributeI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeI18nQuery extends BaseAttributeI18nQuery
{
}
class AttributeI18nQuery extends BaseAttributeI18nQuery {
} // AttributeI18nQuery

21
core/lib/Thelia/Model/AttributePeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributePeer;
/**
* Skeleton subclass for performing query and update operations on the 'attribute' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributePeer extends BaseAttributePeer
{
}

9
core/lib/Thelia/Model/AttributeQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseAttributeQuery;
use Thelia\Model\Base\AttributeQuery as BaseAttributeQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseAttributeQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class AttributeQuery extends BaseAttributeQuery
{
}
class AttributeQuery extends BaseAttributeQuery {
} // AttributeQuery

20
core/lib/Thelia/Model/Category.php Executable file → Normal file
View File

@@ -2,24 +2,9 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategory;
use Thelia\Model\CategoryQuery;
/**
* Skeleton subclass for representing a row from the 'category' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Category extends BaseCategory
{
use Thelia\Model\Base\Category as BaseCategory;
class Category extends BaseCategory {
/**
* @return int number of child for the current category
*/
@@ -57,4 +42,5 @@ class Category extends BaseCategory
}
}

16
core/lib/Thelia/Model/CategoryI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryI18n;
use Thelia\Model\Base\CategoryI18n as BaseCategoryI18n;
class CategoryI18n extends BaseCategoryI18n {
/**
* Skeleton subclass for representing a row from the 'category_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryI18n extends BaseCategoryI18n
{
}

21
core/lib/Thelia/Model/CategoryI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'category_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryI18nPeer extends BaseCategoryI18nPeer
{
}

9
core/lib/Thelia/Model/CategoryI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryI18nQuery;
use Thelia\Model\Base\CategoryI18nQuery as BaseCategoryI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCategoryI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryI18nQuery extends BaseCategoryI18nQuery
{
}
class CategoryI18nQuery extends BaseCategoryI18nQuery {
} // CategoryI18nQuery

21
core/lib/Thelia/Model/CategoryPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryPeer;
/**
* Skeleton subclass for performing query and update operations on the 'category' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryPeer extends BaseCategoryPeer
{
}

11
core/lib/Thelia/Model/CategoryQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryQuery;
use Thelia\Model\Base\CategoryQuery as BaseCategoryQuery;
/**
@@ -14,14 +14,11 @@ use Thelia\Model\om\BaseCategoryQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryQuery extends BaseCategoryQuery
{
class CategoryQuery extends BaseCategoryQuery {
/**
*
* count how many direct children have a category
* count how many direct children have a category
*
* @param int $parent category parent id
* @return int
@@ -58,4 +55,4 @@ class CategoryQuery extends BaseCategoryQuery
return $result;
}
}
} // CategoryQuery

16
core/lib/Thelia/Model/CategoryVersion.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryVersion;
use Thelia\Model\Base\CategoryVersion as BaseCategoryVersion;
class CategoryVersion extends BaseCategoryVersion {
/**
* Skeleton subclass for representing a row from the 'category_version' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryVersion extends BaseCategoryVersion
{
}

21
core/lib/Thelia/Model/CategoryVersionPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryVersionPeer;
/**
* Skeleton subclass for performing query and update operations on the 'category_version' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryVersionPeer extends BaseCategoryVersionPeer
{
}

9
core/lib/Thelia/Model/CategoryVersionQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCategoryVersionQuery;
use Thelia\Model\Base\CategoryVersionQuery as BaseCategoryVersionQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCategoryVersionQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CategoryVersionQuery extends BaseCategoryVersionQuery
{
}
class CategoryVersionQuery extends BaseCategoryVersionQuery {
} // CategoryVersionQuery

16
core/lib/Thelia/Model/Combination.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCombination;
use Thelia\Model\Base\Combination as BaseCombination;
class Combination extends BaseCombination {
/**
* Skeleton subclass for representing a row from the 'combination' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Combination extends BaseCombination
{
}

21
core/lib/Thelia/Model/CombinationPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCombinationPeer;
/**
* Skeleton subclass for performing query and update operations on the 'combination' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CombinationPeer extends BaseCombinationPeer
{
}

9
core/lib/Thelia/Model/CombinationQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCombinationQuery;
use Thelia\Model\Base\CombinationQuery as BaseCombinationQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCombinationQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CombinationQuery extends BaseCombinationQuery
{
}
class CombinationQuery extends BaseCombinationQuery {
} // CombinationQuery

16
core/lib/Thelia/Model/Config.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseConfig;
use Thelia\Model\Base\Config as BaseConfig;
class Config extends BaseConfig {
/**
* Skeleton subclass for representing a row from the 'config' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Config extends BaseConfig
{
}

16
core/lib/Thelia/Model/ConfigI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseConfigI18n;
use Thelia\Model\Base\ConfigI18n as BaseConfigI18n;
class ConfigI18n extends BaseConfigI18n {
/**
* Skeleton subclass for representing a row from the 'config_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ConfigI18n extends BaseConfigI18n
{
}

21
core/lib/Thelia/Model/ConfigI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseConfigI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'config_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ConfigI18nPeer extends BaseConfigI18nPeer
{
}

9
core/lib/Thelia/Model/ConfigI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseConfigI18nQuery;
use Thelia\Model\Base\ConfigI18nQuery as BaseConfigI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseConfigI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ConfigI18nQuery extends BaseConfigI18nQuery
{
}
class ConfigI18nQuery extends BaseConfigI18nQuery {
} // ConfigI18nQuery

21
core/lib/Thelia/Model/ConfigPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseConfigPeer;
/**
* Skeleton subclass for performing query and update operations on the 'config' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ConfigPeer extends BaseConfigPeer
{
}

8
core/lib/Thelia/Model/ConfigQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseConfigQuery;
use Thelia\Model\Base\ConfigQuery as BaseConfigQuery;
/**
@@ -14,14 +14,12 @@ use Thelia\Model\om\BaseConfigQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ConfigQuery extends BaseConfigQuery
{
class ConfigQuery extends BaseConfigQuery {
public static function read($search, $default = null)
{
$value = self::create()->findOneByName($search);
return $value ? $value->getValue() : $default;
}
}
} // ConfigQuery

16
core/lib/Thelia/Model/Content.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContent;
use Thelia\Model\Base\Content as BaseContent;
class Content extends BaseContent {
/**
* Skeleton subclass for representing a row from the 'content' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Content extends BaseContent
{
}

16
core/lib/Thelia/Model/ContentAssoc.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentAssoc;
use Thelia\Model\Base\ContentAssoc as BaseContentAssoc;
class ContentAssoc extends BaseContentAssoc {
/**
* Skeleton subclass for representing a row from the 'content_assoc' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentAssoc extends BaseContentAssoc
{
}

21
core/lib/Thelia/Model/ContentAssocPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseContentAssocPeer;
/**
* Skeleton subclass for performing query and update operations on the 'content_assoc' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentAssocPeer extends BaseContentAssocPeer
{
}

9
core/lib/Thelia/Model/ContentAssocQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentAssocQuery;
use Thelia\Model\Base\ContentAssocQuery as BaseContentAssocQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseContentAssocQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentAssocQuery extends BaseContentAssocQuery
{
}
class ContentAssocQuery extends BaseContentAssocQuery {
} // ContentAssocQuery

16
core/lib/Thelia/Model/ContentFolder.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentFolder;
use Thelia\Model\Base\ContentFolder as BaseContentFolder;
class ContentFolder extends BaseContentFolder {
/**
* Skeleton subclass for representing a row from the 'content_folder' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentFolder extends BaseContentFolder
{
}

21
core/lib/Thelia/Model/ContentFolderPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseContentFolderPeer;
/**
* Skeleton subclass for performing query and update operations on the 'content_folder' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentFolderPeer extends BaseContentFolderPeer
{
}

9
core/lib/Thelia/Model/ContentFolderQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentFolderQuery;
use Thelia\Model\Base\ContentFolderQuery as BaseContentFolderQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseContentFolderQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentFolderQuery extends BaseContentFolderQuery
{
}
class ContentFolderQuery extends BaseContentFolderQuery {
} // ContentFolderQuery

16
core/lib/Thelia/Model/ContentI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentI18n;
use Thelia\Model\Base\ContentI18n as BaseContentI18n;
class ContentI18n extends BaseContentI18n {
/**
* Skeleton subclass for representing a row from the 'content_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentI18n extends BaseContentI18n
{
}

21
core/lib/Thelia/Model/ContentI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseContentI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'content_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentI18nPeer extends BaseContentI18nPeer
{
}

9
core/lib/Thelia/Model/ContentI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentI18nQuery;
use Thelia\Model\Base\ContentI18nQuery as BaseContentI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseContentI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentI18nQuery extends BaseContentI18nQuery
{
}
class ContentI18nQuery extends BaseContentI18nQuery {
} // ContentI18nQuery

21
core/lib/Thelia/Model/ContentPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseContentPeer;
/**
* Skeleton subclass for performing query and update operations on the 'content' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentPeer extends BaseContentPeer
{
}

9
core/lib/Thelia/Model/ContentQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentQuery;
use Thelia\Model\Base\ContentQuery as BaseContentQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseContentQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentQuery extends BaseContentQuery
{
}
class ContentQuery extends BaseContentQuery {
} // ContentQuery

16
core/lib/Thelia/Model/ContentVersion.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentVersion;
use Thelia\Model\Base\ContentVersion as BaseContentVersion;
class ContentVersion extends BaseContentVersion {
/**
* Skeleton subclass for representing a row from the 'content_version' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentVersion extends BaseContentVersion
{
}

21
core/lib/Thelia/Model/ContentVersionPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseContentVersionPeer;
/**
* Skeleton subclass for performing query and update operations on the 'content_version' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentVersionPeer extends BaseContentVersionPeer
{
}

9
core/lib/Thelia/Model/ContentVersionQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseContentVersionQuery;
use Thelia\Model\Base\ContentVersionQuery as BaseContentVersionQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseContentVersionQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class ContentVersionQuery extends BaseContentVersionQuery
{
}
class ContentVersionQuery extends BaseContentVersionQuery {
} // ContentVersionQuery

16
core/lib/Thelia/Model/Country.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCountry;
use Thelia\Model\Base\Country as BaseCountry;
class Country extends BaseCountry {
/**
* Skeleton subclass for representing a row from the 'country' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Country extends BaseCountry
{
}

16
core/lib/Thelia/Model/CountryI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCountryI18n;
use Thelia\Model\Base\CountryI18n as BaseCountryI18n;
class CountryI18n extends BaseCountryI18n {
/**
* Skeleton subclass for representing a row from the 'country_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CountryI18n extends BaseCountryI18n
{
}

21
core/lib/Thelia/Model/CountryI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCountryI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'country_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CountryI18nPeer extends BaseCountryI18nPeer
{
}

9
core/lib/Thelia/Model/CountryI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCountryI18nQuery;
use Thelia\Model\Base\CountryI18nQuery as BaseCountryI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCountryI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CountryI18nQuery extends BaseCountryI18nQuery
{
}
class CountryI18nQuery extends BaseCountryI18nQuery {
} // CountryI18nQuery

21
core/lib/Thelia/Model/CountryPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCountryPeer;
/**
* Skeleton subclass for performing query and update operations on the 'country' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CountryPeer extends BaseCountryPeer
{
}

9
core/lib/Thelia/Model/CountryQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCountryQuery;
use Thelia\Model\Base\CountryQuery as BaseCountryQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCountryQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CountryQuery extends BaseCountryQuery
{
}
class CountryQuery extends BaseCountryQuery {
} // CountryQuery

16
core/lib/Thelia/Model/Coupon.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCoupon;
use Thelia\Model\Base\Coupon as BaseCoupon;
class Coupon extends BaseCoupon {
/**
* Skeleton subclass for representing a row from the 'coupon' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Coupon extends BaseCoupon
{
}

16
core/lib/Thelia/Model/CouponOrder.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponOrder;
use Thelia\Model\Base\CouponOrder as BaseCouponOrder;
class CouponOrder extends BaseCouponOrder {
/**
* Skeleton subclass for representing a row from the 'coupon_order' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponOrder extends BaseCouponOrder
{
}

21
core/lib/Thelia/Model/CouponOrderPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponOrderPeer;
/**
* Skeleton subclass for performing query and update operations on the 'coupon_order' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponOrderPeer extends BaseCouponOrderPeer
{
}

9
core/lib/Thelia/Model/CouponOrderQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponOrderQuery;
use Thelia\Model\Base\CouponOrderQuery as BaseCouponOrderQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCouponOrderQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponOrderQuery extends BaseCouponOrderQuery
{
}
class CouponOrderQuery extends BaseCouponOrderQuery {
} // CouponOrderQuery

21
core/lib/Thelia/Model/CouponPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponPeer;
/**
* Skeleton subclass for performing query and update operations on the 'coupon' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponPeer extends BaseCouponPeer
{
}

9
core/lib/Thelia/Model/CouponQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponQuery;
use Thelia\Model\Base\CouponQuery as BaseCouponQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCouponQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponQuery extends BaseCouponQuery
{
}
class CouponQuery extends BaseCouponQuery {
} // CouponQuery

16
core/lib/Thelia/Model/CouponRule.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponRule;
use Thelia\Model\Base\CouponRule as BaseCouponRule;
class CouponRule extends BaseCouponRule {
/**
* Skeleton subclass for representing a row from the 'coupon_rule' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponRule extends BaseCouponRule
{
}

21
core/lib/Thelia/Model/CouponRulePeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponRulePeer;
/**
* Skeleton subclass for performing query and update operations on the 'coupon_rule' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponRulePeer extends BaseCouponRulePeer
{
}

9
core/lib/Thelia/Model/CouponRuleQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCouponRuleQuery;
use Thelia\Model\Base\CouponRuleQuery as BaseCouponRuleQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCouponRuleQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CouponRuleQuery extends BaseCouponRuleQuery
{
}
class CouponRuleQuery extends BaseCouponRuleQuery {
} // CouponRuleQuery

16
core/lib/Thelia/Model/Currency.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCurrency;
use Thelia\Model\Base\Currency as BaseCurrency;
class Currency extends BaseCurrency {
/**
* Skeleton subclass for representing a row from the 'currency' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Currency extends BaseCurrency
{
}

21
core/lib/Thelia/Model/CurrencyPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCurrencyPeer;
/**
* Skeleton subclass for performing query and update operations on the 'currency' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CurrencyPeer extends BaseCurrencyPeer
{
}

9
core/lib/Thelia/Model/CurrencyQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCurrencyQuery;
use Thelia\Model\Base\CurrencyQuery as BaseCurrencyQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCurrencyQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CurrencyQuery extends BaseCurrencyQuery
{
}
class CurrencyQuery extends BaseCurrencyQuery {
} // CurrencyQuery

57
core/lib/Thelia/Model/Customer.php Executable file → Normal file
View File

@@ -2,32 +2,36 @@
namespace Thelia\Model;
use Thelia\Model\Base\Customer as BaseCustomer;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Thelia\Core\Event\CustomRefEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\om\BaseCustomer;
/**
* Skeleton subclass for representing a row from the 'customer' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class Customer extends BaseCustomer
{
class Customer extends BaseCustomer {
/**
* @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
*/
protected $dispatcher;
public function createOrUpdate($titleId, $firstname, $lastname, $address1, $address2, $address3, $phone, $cellphone, $zipcode, $countryId, $email, $plainPassword, $reseller = 0, $sponsor = null, $discount = 0 )
/**
* @param int $titleId customer title id (from customer_title table)
* @param string $firstname customer first name
* @param string $lastname customer last name
* @param string $address1 customer address
* @param string $address2 customer adress complement 1
* @param string $address3 customer adress complement 2
* @param string $phone customer phone number
* @param string $cellphone customer cellphone number
* @param string $zipcode customer zipcode
* @param int $countryId customer country id (from Country table)
* @param string $email customer email, must be unique
* @param string $plainPassword customer plain password, hash is made calling setPassword method. Not mandatory parameter but an exception is thrown if customer is new without password
* @param int $reseller
* @param null $sponsor
* @param int $discount
*/
public function createOrUpdate($titleId, $firstname, $lastname, $address1, $address2, $address3, $phone, $cellphone, $zipcode, $countryId, $email, $plainPassword = null, $lang = null, $reseller = 0, $sponsor = null, $discount = 0)
{
$this
->setCustomerTitleId($titleId)
@@ -45,9 +49,14 @@ class Customer extends BaseCustomer
->setReseller($reseller)
->setSponsor($sponsor)
->setDiscount($discount)
->save()
;
if(!is_null($lang)) {
$this->setLang($lang);
}
$this->save();
}
public function preInsert(\PropelPDO $con = null)
@@ -69,8 +78,16 @@ class Customer extends BaseCustomer
public function setPassword($password)
{
$this->setAlgo("PASSWORD_BCRYPT");
return parent::setPassword(password_hash($password, PASSWORD_BCRYPT));
\Thelia\Log\Tlog::getInstance()->debug($password);
if ($this->isNew() && ($password === null || trim($password) == "")) {
throw new InvalidArgumentException("customer password is mandatory on creation");
}
if($password !== null && trim($password) != "") {
$this->setAlgo("PASSWORD_BCRYPT");
return parent::setPassword(password_hash($password, PASSWORD_BCRYPT));
}
}
public function setDispatcher(EventDispatcherInterface $dispatcher)

21
core/lib/Thelia/Model/CustomerPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerPeer;
/**
* Skeleton subclass for performing query and update operations on the 'customer' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerPeer extends BaseCustomerPeer
{
}

8
core/lib/Thelia/Model/CustomerQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerQuery;
use Thelia\Model\Base\CustomerQuery as BaseCustomerQuery;
/**
@@ -14,9 +14,7 @@ use Thelia\Model\om\BaseCustomerQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerQuery extends BaseCustomerQuery
{
class CustomerQuery extends BaseCustomerQuery {
}
} // CustomerQuery

16
core/lib/Thelia/Model/CustomerTitle.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerTitle;
use Thelia\Model\Base\CustomerTitle as BaseCustomerTitle;
class CustomerTitle extends BaseCustomerTitle {
/**
* Skeleton subclass for representing a row from the 'customer_title' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerTitle extends BaseCustomerTitle
{
}

16
core/lib/Thelia/Model/CustomerTitleI18n.php Executable file → Normal file
View File

@@ -2,20 +2,8 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerTitleI18n;
use Thelia\Model\Base\CustomerTitleI18n as BaseCustomerTitleI18n;
class CustomerTitleI18n extends BaseCustomerTitleI18n {
/**
* Skeleton subclass for representing a row from the 'customer_title_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerTitleI18n extends BaseCustomerTitleI18n
{
}

21
core/lib/Thelia/Model/CustomerTitleI18nPeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerTitleI18nPeer;
/**
* Skeleton subclass for performing query and update operations on the 'customer_title_i18n' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerTitleI18nPeer extends BaseCustomerTitleI18nPeer
{
}

9
core/lib/Thelia/Model/CustomerTitleI18nQuery.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerTitleI18nQuery;
use Thelia\Model\Base\CustomerTitleI18nQuery as BaseCustomerTitleI18nQuery;
/**
@@ -14,8 +14,7 @@ use Thelia\Model\om\BaseCustomerTitleI18nQuery;
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerTitleI18nQuery extends BaseCustomerTitleI18nQuery
{
}
class CustomerTitleI18nQuery extends BaseCustomerTitleI18nQuery {
} // CustomerTitleI18nQuery

21
core/lib/Thelia/Model/CustomerTitlePeer.php
View File

@@ -1,21 +0,0 @@
<?php
namespace Thelia\Model;
use Thelia\Model\om\BaseCustomerTitlePeer;
/**
* Skeleton subclass for performing query and update operations on the 'customer_title' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package propel.generator.Thelia.Model
*/
class CustomerTitlePeer extends BaseCustomerTitlePeer
{
}

Some files were not shown because too many files have changed in this diff Show More