diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php old mode 100755 new mode 100644 index f4110b19e..183f59947 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -266,7 +266,7 @@ abstract class Accessory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AccessoryQuery.php b/core/lib/Thelia/Model/Base/AccessoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php old mode 100755 new mode 100644 index 45cad61aa..a6ab068d1 --- a/core/lib/Thelia/Model/Base/Address.php +++ b/core/lib/Thelia/Model/Base/Address.php @@ -388,7 +388,7 @@ abstract class Address implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AddressQuery.php b/core/lib/Thelia/Model/Base/AddressQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php old mode 100755 new mode 100644 index b1241473e..6110aee7a --- a/core/lib/Thelia/Model/Base/Admin.php +++ b/core/lib/Thelia/Model/Base/Admin.php @@ -300,7 +300,7 @@ abstract class Admin implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminGroup.php b/core/lib/Thelia/Model/Base/AdminGroup.php old mode 100755 new mode 100644 index 60141e3f8..9eadbb107 --- a/core/lib/Thelia/Model/Base/AdminGroup.php +++ b/core/lib/Thelia/Model/Base/AdminGroup.php @@ -262,7 +262,7 @@ abstract class AdminGroup implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminGroupQuery.php b/core/lib/Thelia/Model/Base/AdminGroupQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php old mode 100755 new mode 100644 index c83be20ee..ae828e4bb --- a/core/lib/Thelia/Model/Base/AdminLog.php +++ b/core/lib/Thelia/Model/Base/AdminLog.php @@ -266,7 +266,7 @@ abstract class AdminLog implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminLogQuery.php b/core/lib/Thelia/Model/Base/AdminLogQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AdminQuery.php b/core/lib/Thelia/Model/Base/AdminQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php old mode 100755 new mode 100644 index fbd3199f4..08fc8be42 --- a/core/lib/Thelia/Model/Base/Area.php +++ b/core/lib/Thelia/Model/Base/Area.php @@ -277,7 +277,7 @@ abstract class Area implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AreaQuery.php b/core/lib/Thelia/Model/Base/AreaQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php old mode 100755 new mode 100644 index efe4a631d..3c754c3b5 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -326,7 +326,7 @@ abstract class Attribute implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php old mode 100755 new mode 100644 index 43a1be294..b94288753 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -298,7 +298,7 @@ abstract class AttributeAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php old mode 100755 new mode 100644 index 3e7b9afcd..ec6f8811f --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -272,7 +272,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeCategory.php b/core/lib/Thelia/Model/Base/AttributeCategory.php old mode 100755 new mode 100644 index 691fa43ad..da702559a --- a/core/lib/Thelia/Model/Base/AttributeCategory.php +++ b/core/lib/Thelia/Model/Base/AttributeCategory.php @@ -262,7 +262,7 @@ abstract class AttributeCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php b/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php old mode 100755 new mode 100644 index ea2ade03c..ef840a5a1 --- a/core/lib/Thelia/Model/Base/AttributeCombination.php +++ b/core/lib/Thelia/Model/Base/AttributeCombination.php @@ -269,7 +269,7 @@ abstract class AttributeCombination implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php old mode 100755 new mode 100644 index 0e4a1db8f..d75c24412 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -272,7 +272,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php old mode 100755 new mode 100644 index 910bdf0e0..20a2d9a5c --- a/core/lib/Thelia/Model/Base/Cart.php +++ b/core/lib/Thelia/Model/Base/Cart.php @@ -307,7 +307,7 @@ abstract class Cart implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php old mode 100755 new mode 100644 index 3c5711022..827a4c5ec --- a/core/lib/Thelia/Model/Base/CartItem.php +++ b/core/lib/Thelia/Model/Base/CartItem.php @@ -313,7 +313,7 @@ abstract class CartItem implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CartItemQuery.php b/core/lib/Thelia/Model/Base/CartItemQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CartQuery.php b/core/lib/Thelia/Model/Base/CartQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php old mode 100755 new mode 100644 index 185583889..ee56670a1 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -41,8 +41,6 @@ use Thelia\Model\Product as ChildProduct; use Thelia\Model\ProductCategory as ChildProductCategory; use Thelia\Model\ProductCategoryQuery as ChildProductCategoryQuery; use Thelia\Model\ProductQuery as ChildProductQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\CategoryTableMap; use Thelia\Model\Map\CategoryVersionTableMap; @@ -153,12 +151,6 @@ abstract class Category implements ActiveRecordInterface protected $collAttributeCategories; protected $collAttributeCategoriesPartial; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildCategoryImage[] Collection to store aggregation of ChildCategoryImage objects. */ @@ -270,12 +262,6 @@ abstract class Category implements ActiveRecordInterface */ protected $attributeCategoriesScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -475,7 +461,7 @@ abstract class Category implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -1039,8 +1025,6 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories = null; - $this->collRewritings = null; - $this->collCategoryImages = null; $this->collCategoryDocuments = null; @@ -1331,23 +1315,6 @@ abstract class Category implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->categoryImagesScheduledForDeletion !== null) { if (!$this->categoryImagesScheduledForDeletion->isEmpty()) { \Thelia\Model\CategoryImageQuery::create() @@ -1668,9 +1635,6 @@ abstract class Category implements ActiveRecordInterface if (null !== $this->collAttributeCategories) { $result['AttributeCategories'] = $this->collAttributeCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collCategoryImages) { $result['CategoryImages'] = $this->collCategoryImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1895,12 +1859,6 @@ abstract class Category implements ActiveRecordInterface } } - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getCategoryImages() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCategoryImage($relObj->copy($deepCopy)); @@ -1981,9 +1939,6 @@ abstract class Category implements ActiveRecordInterface if ('AttributeCategory' == $relationName) { return $this->initAttributeCategories(); } - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('CategoryImage' == $relationName) { return $this->initCategoryImages(); } @@ -2733,299 +2688,6 @@ abstract class Category implements ActiveRecordInterface return $this->getAttributeCategories($query, $con); } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildCategory is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByCategory($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setCategory(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByCategory($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Category The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setCategory($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildCategory The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setCategory(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collCategoryImages collection * @@ -4749,11 +4411,6 @@ abstract class Category implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collCategoryImages) { foreach ($this->collCategoryImages as $o) { $o->clearAllReferences($deep); @@ -4812,10 +4469,6 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories->clearIterator(); } $this->collAttributeCategories = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collCategoryImages instanceof Collection) { $this->collCategoryImages->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php index a731ec971..142ab543f 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -268,7 +268,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php old mode 100755 new mode 100644 index 165bfa492..7539312cc --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -290,7 +290,7 @@ abstract class CategoryDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php old mode 100755 new mode 100644 index db3189cc3..4d284b57e --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -272,7 +272,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php old mode 100755 new mode 100644 index 83d62572d..9ae8c8cf3 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -272,7 +272,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php old mode 100755 new mode 100644 index efde7b64a..353c79c4f --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -290,7 +290,7 @@ abstract class CategoryImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php old mode 100755 new mode 100644 index ce61e9836..61b4fc413 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -272,7 +272,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryImageQuery.php b/core/lib/Thelia/Model/Base/CategoryImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php old mode 100755 new mode 100644 index c905abf5a..7f0fb8f1c --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -58,10 +58,6 @@ use Thelia\Model\Map\CategoryTableMap; * @method ChildCategoryQuery rightJoinAttributeCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCategory relation * @method ChildCategoryQuery innerJoinAttributeCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCategory relation * - * @method ChildCategoryQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildCategoryQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildCategoryQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildCategoryQuery leftJoinCategoryImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery rightJoinCategoryImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery innerJoinCategoryImage($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryImage relation @@ -870,79 +866,6 @@ abstract class CategoryQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AttributeCategory', '\Thelia\Model\AttributeCategoryQuery'); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(CategoryTableMap::ID, $rewriting->getCategoryId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\CategoryImage object * diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php old mode 100755 new mode 100644 index d8dfe76e0..416ad95d5 --- a/core/lib/Thelia/Model/Base/CategoryVersion.php +++ b/core/lib/Thelia/Model/Base/CategoryVersion.php @@ -292,7 +292,7 @@ abstract class CategoryVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryVersionQuery.php b/core/lib/Thelia/Model/Base/CategoryVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php old mode 100755 new mode 100644 index d687ffefe..9f2080d1f --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -305,7 +305,7 @@ abstract class Config implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php old mode 100755 new mode 100644 index 6247e15d1..71f1d5287 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -272,7 +272,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ConfigI18nQuery.php b/core/lib/Thelia/Model/Base/ConfigI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php old mode 100755 new mode 100644 index a2bb2b8c2..aa53fb9b5 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -35,8 +35,6 @@ use Thelia\Model\Folder as ChildFolder; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent; use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\ContentTableMap; use Thelia\Model\Map\ContentVersionTableMap; @@ -123,12 +121,6 @@ abstract class Content implements ActiveRecordInterface */ protected $version_created_by; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -212,12 +204,6 @@ abstract class Content implements ActiveRecordInterface */ protected $foldersScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -429,7 +415,7 @@ abstract class Content implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -952,8 +938,6 @@ abstract class Content implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collRewritings = null; - $this->collContentFolders = null; $this->collContentImages = null; @@ -1141,23 +1125,6 @@ abstract class Content implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1493,9 +1460,6 @@ abstract class Content implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1702,12 +1666,6 @@ abstract class Content implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1791,9 +1749,6 @@ abstract class Content implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1817,299 +1772,6 @@ abstract class Content implements ActiveRecordInterface } } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildContent is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByContent($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setContent(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByContent($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Content The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setContent($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildContent The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setContent(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collContentFolders collection * @@ -3940,11 +3602,6 @@ abstract class Content implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3991,10 +3648,6 @@ abstract class Content implements ActiveRecordInterface $this->currentLocale = 'en_US'; $this->currentTranslations = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php old mode 100755 new mode 100644 index 990fc4a9f..a8207bb14 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -290,7 +290,7 @@ abstract class ContentDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php old mode 100755 new mode 100644 index 2cfc367b0..1e1f1bd52 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php old mode 100755 new mode 100644 index 52f5fa88a..51d72b974 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -256,7 +256,7 @@ abstract class ContentFolder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentFolderQuery.php b/core/lib/Thelia/Model/Base/ContentFolderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php old mode 100755 new mode 100644 index d3974522b..6ffc1d4bf --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -272,7 +272,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php old mode 100755 new mode 100644 index 22c4bed10..8a0a5a77c --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -290,7 +290,7 @@ abstract class ContentImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php old mode 100755 new mode 100644 index d655dec53..54016f0df --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -272,7 +272,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php b/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentImageQuery.php b/core/lib/Thelia/Model/Base/ContentImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php old mode 100755 new mode 100644 index 5341e1a5e..0dc2f57a4 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -44,10 +44,6 @@ use Thelia\Model\Map\ContentTableMap; * @method ChildContentQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildContentQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildContentQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildContentQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildContentQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildContentQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -602,79 +598,6 @@ abstract class ContentQuery extends ModelCriteria return $this->addUsingAlias(ContentTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(ContentTableMap::ID, $rewriting->getContentId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php old mode 100755 new mode 100644 index ca9189608..ef2897030 --- a/core/lib/Thelia/Model/Base/ContentVersion.php +++ b/core/lib/Thelia/Model/Base/ContentVersion.php @@ -286,7 +286,7 @@ abstract class ContentVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentVersionQuery.php b/core/lib/Thelia/Model/Base/ContentVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php old mode 100755 new mode 100644 index 704375de2..e0541a151 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -324,7 +324,7 @@ abstract class Country implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php old mode 100755 new mode 100644 index be63955ca..3e3e314cb --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -272,7 +272,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CountryI18nQuery.php b/core/lib/Thelia/Model/Base/CountryI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php old mode 100755 new mode 100644 index 154b9c11c..4c5dcd917 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -374,7 +374,7 @@ abstract class Coupon implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php index 1ccf54e1a..0ea9027b6 100644 --- a/core/lib/Thelia/Model/Base/CouponI18n.php +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -266,7 +266,7 @@ abstract class CouponI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php old mode 100755 new mode 100644 index 0b1300855..b2685ea74 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -255,7 +255,7 @@ abstract class CouponOrder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CouponRule.php b/core/lib/Thelia/Model/Base/CouponRule.php deleted file mode 100755 index 8a34f5d0b..000000000 --- a/core/lib/Thelia/Model/Base/CouponRule.php +++ /dev/null @@ -1,1534 +0,0 @@ -modifiedColumns); - } - - /** - * Has specified column been modified? - * - * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID - * @return boolean True if $col has been modified. - */ - public function isColumnModified($col) - { - return in_array($col, $this->modifiedColumns); - } - - /** - * Get the columns that have been modified in this object. - * @return array A unique list of the modified column names for this object. - */ - public function getModifiedColumns() - { - return array_unique($this->modifiedColumns); - } - - /** - * Returns whether the object has ever been saved. This will - * be false, if the object was retrieved from storage or was created - * and then saved. - * - * @return true, if the object has never been persisted. - */ - public function isNew() - { - return $this->new; - } - - /** - * Setter for the isNew attribute. This method will be called - * by Propel-generated children and objects. - * - * @param boolean $b the state of the object. - */ - public function setNew($b) - { - $this->new = (Boolean) $b; - } - - /** - * Whether this object has been deleted. - * @return boolean The deleted state of this object. - */ - public function isDeleted() - { - return $this->deleted; - } - - /** - * Specify whether this object has been deleted. - * @param boolean $b The deleted state of this object. - * @return void - */ - public function setDeleted($b) - { - $this->deleted = (Boolean) $b; - } - - /** - * Sets the modified state for the object to be false. - * @param string $col If supplied, only the specified column is reset. - * @return void - */ - public function resetModified($col = null) - { - if (null !== $col) { - while (false !== ($offset = array_search($col, $this->modifiedColumns))) { - array_splice($this->modifiedColumns, $offset, 1); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another CouponRule instance. If - * obj is an instance of CouponRule, delegates to - * equals(CouponRule). Otherwise, returns false. - * - * @param obj The object to compare to. - * @return Whether equal to the object specified. - */ - public function equals($obj) - { - $thisclazz = get_class($this); - if (!is_object($obj) || !($obj instanceof $thisclazz)) { - return false; - } - - if ($this === $obj) { - return true; - } - - if (null === $this->getPrimaryKey() - || null === $obj->getPrimaryKey()) { - return false; - } - - return $this->getPrimaryKey() === $obj->getPrimaryKey(); - } - - /** - * If the primary key is not null, return the hashcode of the - * primary key. Otherwise, return the hash code of the object. - * - * @return int Hashcode - */ - public function hashCode() - { - if (null !== $this->getPrimaryKey()) { - return crc32(serialize($this->getPrimaryKey())); - } - - return crc32(serialize(clone $this)); - } - - /** - * Get the associative array of the virtual columns in this object - * - * @param string $name The virtual column name - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @return mixed - */ - public function getVirtualColumn($name) - { - if (!$this->hasVirtualColumn($name)) { - throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); - } - - return $this->virtualColumns[$name]; - } - - /** - * Set the value of a virtual column in this object - * - * @param string $name The virtual column name - * @param mixed $value The value to give to the virtual column - * - * @return CouponRule The current object, for fluid interface - */ - public function setVirtualColumn($name, $value) - { - $this->virtualColumns[$name] = $value; - - return $this; - } - - /** - * Logs a message using Propel::log(). - * - * @param string $msg - * @param int $priority One of the Propel::LOG_* logging levels - * @return boolean - */ - protected function log($msg, $priority = Propel::LOG_INFO) - { - return Propel::log(get_class($this) . ': ' . $msg, $priority); - } - - /** - * Populate the current object from a string, using a given parser format - * - * $book = new Book(); - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, - * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from - * - * @return CouponRule The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - } - - /** - * Export the current object properties to a string, using a given parser format - * - * $book = BookQuery::create()->findPk(9012); - * echo $book->exportTo('JSON'); - * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. - * @return string The exported data - */ - public function exportTo($parser, $includeLazyLoadColumns = true) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); - } - - /** - * Clean up internal collections prior to serializing - * Avoids recursive loops that turn into segmentation faults when serializing - */ - public function __sleep() - { - $this->clearAllReferences(); - - return array_keys(get_object_vars($this)); - } - - /** - * Get the [id] column value. - * - * @return int - */ - public function getId() - { - - return $this->id; - } - - /** - * Get the [coupon_id] column value. - * - * @return int - */ - public function getCouponId() - { - - return $this->coupon_id; - } - - /** - * Get the [controller] column value. - * - * @return string - */ - public function getController() - { - - return $this->controller; - } - - /** - * Get the [operation] column value. - * - * @return string - */ - public function getOperation() - { - - return $this->operation; - } - - /** - * Get the [value] column value. - * - * @return double - */ - public function getValue() - { - - return $this->value; - } - - /** - * Get the [optionally formatted] temporal [created_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getCreatedAt($format = NULL) - { - if ($format === null) { - return $this->created_at; - } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; - } - } - - /** - * Get the [optionally formatted] temporal [updated_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getUpdatedAt($format = NULL) - { - if ($format === null) { - return $this->updated_at; - } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; - } - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[] = CouponRuleTableMap::ID; - } - - - return $this; - } // setId() - - /** - * Set the value of [coupon_id] column. - * - * @param int $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setCouponId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->coupon_id !== $v) { - $this->coupon_id = $v; - $this->modifiedColumns[] = CouponRuleTableMap::COUPON_ID; - } - - if ($this->aCoupon !== null && $this->aCoupon->getId() !== $v) { - $this->aCoupon = null; - } - - - return $this; - } // setCouponId() - - /** - * Set the value of [controller] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setController($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->controller !== $v) { - $this->controller = $v; - $this->modifiedColumns[] = CouponRuleTableMap::CONTROLLER; - } - - - return $this; - } // setController() - - /** - * Set the value of [operation] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setOperation($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->operation !== $v) { - $this->operation = $v; - $this->modifiedColumns[] = CouponRuleTableMap::OPERATION; - } - - - return $this; - } // setOperation() - - /** - * Set the value of [value] column. - * - * @param double $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setValue($v) - { - if ($v !== null) { - $v = (double) $v; - } - - if ($this->value !== $v) { - $this->value = $v; - $this->modifiedColumns[] = CouponRuleTableMap::VALUE; - } - - - return $this; - } // setValue() - - /** - * Sets the value of [created_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setCreatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->created_at !== null || $dt !== null) { - if ($dt !== $this->created_at) { - $this->created_at = $dt; - $this->modifiedColumns[] = CouponRuleTableMap::CREATED_AT; - } - } // if either are not null - - - return $this; - } // setCreatedAt() - - /** - * Sets the value of [updated_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setUpdatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->updated_at !== null || $dt !== null) { - if ($dt !== $this->updated_at) { - $this->updated_at = $dt; - $this->modifiedColumns[] = CouponRuleTableMap::UPDATED_AT; - } - } // if either are not null - - - return $this; - } // setUpdatedAt() - - /** - * Indicates whether the columns in this object are only set to default values. - * - * This method can be used in conjunction with isModified() to indicate whether an object is both - * modified _and_ has some values set which are non-default. - * - * @return boolean Whether the columns in this object are only been set with default values. - */ - public function hasOnlyDefaultValues() - { - // otherwise, everything was equal, so return TRUE - return true; - } // hasOnlyDefaultValues() - - /** - * Hydrates (populates) the object variables with values from the database resultset. - * - * An offset (0-based "start column") is specified so that objects can be hydrated - * with a subset of the columns in the resultset rows. This is needed, for example, - * for results of JOIN queries where the resultset row includes columns from two or - * more tables. - * - * @param array $row The row returned by DataFetcher->fetch(). - * @param int $startcol 0-based offset column which indicates which restultset column to start with. - * @param boolean $rehydrate Whether this object is being re-hydrated from the database. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @return int next starting column - * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. - */ - public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) - { - try { - - - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponRuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponRuleTableMap::translateFieldName('CouponId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->coupon_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponRuleTableMap::translateFieldName('Controller', TableMap::TYPE_PHPNAME, $indexType)]; - $this->controller = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponRuleTableMap::translateFieldName('Operation', TableMap::TYPE_PHPNAME, $indexType)]; - $this->operation = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponRuleTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; - $this->value = (null !== $col) ? (double) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $this->resetModified(); - - $this->setNew(false); - - if ($rehydrate) { - $this->ensureConsistency(); - } - - return $startcol + 7; // 7 = CouponRuleTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \Thelia\Model\CouponRule object", 0, $e); - } - } - - /** - * Checks and repairs the internal consistency of the object. - * - * This method is executed after an already-instantiated object is re-hydrated - * from the database. It exists to check any foreign keys to make sure that - * the objects related to the current object are correct based on foreign key. - * - * You can override this method in the stub class, but you should always invoke - * the base method from the overridden method (i.e. parent::ensureConsistency()), - * in case your model changes. - * - * @throws PropelException - */ - public function ensureConsistency() - { - if ($this->aCoupon !== null && $this->coupon_id !== $this->aCoupon->getId()) { - $this->aCoupon = null; - } - } // ensureConsistency - - /** - * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. - * - * This will only work if the object has been saved and has a valid primary key set. - * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. - * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db - */ - public function reload($deep = false, ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("Cannot reload a deleted object."); - } - - if ($this->isNew()) { - throw new PropelException("Cannot reload an unsaved object."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(CouponRuleTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildCouponRuleQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); - $row = $dataFetcher->fetch(); - $dataFetcher->close(); - if (!$row) { - throw new PropelException('Cannot find matching row in the database to reload object values.'); - } - $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate - - if ($deep) { // also de-associate any related objects? - - $this->aCoupon = null; - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see CouponRule::setDeleted() - * @see CouponRule::isDeleted() - */ - public function delete(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("This object has already been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildCouponRuleQuery::create() - ->filterByPrimaryKey($this->getPrimaryKey()); - $ret = $this->preDelete($con); - if ($ret) { - $deleteQuery->delete($con); - $this->postDelete($con); - $con->commit(); - $this->setDeleted(true); - } else { - $con->commit(); - } - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Persists this object to the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All modified related objects will also be persisted in the doSave() - * method. This method wraps all precipitate database operations in a - * single transaction. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see doSave() - */ - public function save(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("You cannot save an object that has been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - // timestampable behavior - if (!$this->isColumnModified(CouponRuleTableMap::CREATED_AT)) { - $this->setCreatedAt(time()); - } - if (!$this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } else { - $ret = $ret && $this->preUpdate($con); - // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - CouponRuleTableMap::addInstanceToPool($this); - } else { - $affectedRows = 0; - } - $con->commit(); - - return $affectedRows; - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Performs the work of inserting or updating the row in the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All related objects are also updated in this method. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see save() - */ - protected function doSave(ConnectionInterface $con) - { - $affectedRows = 0; // initialize var to track total num of affected rows - if (!$this->alreadyInSave) { - $this->alreadyInSave = true; - - // We call the save method on the following object(s) if they - // were passed to this object by their corresponding set - // method. This object relates to these object(s) by a - // foreign key reference. - - if ($this->aCoupon !== null) { - if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { - $affectedRows += $this->aCoupon->save($con); - } - $this->setCoupon($this->aCoupon); - } - - if ($this->isNew() || $this->isModified()) { - // persist changes - if ($this->isNew()) { - $this->doInsert($con); - } else { - $this->doUpdate($con); - } - $affectedRows += 1; - $this->resetModified(); - } - - $this->alreadyInSave = false; - - } - - return $affectedRows; - } // doSave() - - /** - * Insert the row in the database. - * - * @param ConnectionInterface $con - * - * @throws PropelException - * @see doSave() - */ - protected function doInsert(ConnectionInterface $con) - { - $modifiedColumns = array(); - $index = 0; - - $this->modifiedColumns[] = CouponRuleTableMap::ID; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . CouponRuleTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(CouponRuleTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(CouponRuleTableMap::COUPON_ID)) { - $modifiedColumns[':p' . $index++] = 'COUPON_ID'; - } - if ($this->isColumnModified(CouponRuleTableMap::CONTROLLER)) { - $modifiedColumns[':p' . $index++] = 'CONTROLLER'; - } - if ($this->isColumnModified(CouponRuleTableMap::OPERATION)) { - $modifiedColumns[':p' . $index++] = 'OPERATION'; - } - if ($this->isColumnModified(CouponRuleTableMap::VALUE)) { - $modifiedColumns[':p' . $index++] = 'VALUE'; - } - if ($this->isColumnModified(CouponRuleTableMap::CREATED_AT)) { - $modifiedColumns[':p' . $index++] = 'CREATED_AT'; - } - if ($this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; - } - - $sql = sprintf( - 'INSERT INTO coupon_rule (%s) VALUES (%s)', - implode(', ', $modifiedColumns), - implode(', ', array_keys($modifiedColumns)) - ); - - try { - $stmt = $con->prepare($sql); - foreach ($modifiedColumns as $identifier => $columnName) { - switch ($columnName) { - case 'ID': - $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); - break; - case 'COUPON_ID': - $stmt->bindValue($identifier, $this->coupon_id, PDO::PARAM_INT); - break; - case 'CONTROLLER': - $stmt->bindValue($identifier, $this->controller, PDO::PARAM_STR); - break; - case 'OPERATION': - $stmt->bindValue($identifier, $this->operation, PDO::PARAM_STR); - break; - case 'VALUE': - $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); - break; - case 'CREATED_AT': - $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); - break; - case 'UPDATED_AT': - $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); - break; - } - } - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); - } - - try { - $pk = $con->lastInsertId(); - } catch (Exception $e) { - throw new PropelException('Unable to get autoincrement id.', 0, $e); - } - $this->setId($pk); - - $this->setNew(false); - } - - /** - * Update the row in the database. - * - * @param ConnectionInterface $con - * - * @return Integer Number of updated rows - * @see doSave() - */ - protected function doUpdate(ConnectionInterface $con) - { - $selectCriteria = $this->buildPkeyCriteria(); - $valuesCriteria = $this->buildCriteria(); - - return $selectCriteria->doUpdate($valuesCriteria, $con); - } - - /** - * Retrieves a field from the object by name passed in as a string. - * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. - */ - public function getByName($name, $type = TableMap::TYPE_PHPNAME) - { - $pos = CouponRuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - $field = $this->getByPosition($pos); - - return $field; - } - - /** - * Retrieves a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @return mixed Value of field at $pos - */ - public function getByPosition($pos) - { - switch ($pos) { - case 0: - return $this->getId(); - break; - case 1: - return $this->getCouponId(); - break; - case 2: - return $this->getController(); - break; - case 3: - return $this->getOperation(); - break; - case 4: - return $this->getValue(); - break; - case 5: - return $this->getCreatedAt(); - break; - case 6: - return $this->getUpdatedAt(); - break; - default: - return null; - break; - } // switch() - } - - /** - * Exports the object as an array. - * - * You can specify the key type of the array by passing one of the class - * type constants. - * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. - * - * @return array an associative array containing the field names (as keys) and field values - */ - public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) - { - if (isset($alreadyDumpedObjects['CouponRule'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['CouponRule'][$this->getPrimaryKey()] = true; - $keys = CouponRuleTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getCouponId(), - $keys[2] => $this->getController(), - $keys[3] => $this->getOperation(), - $keys[4] => $this->getValue(), - $keys[5] => $this->getCreatedAt(), - $keys[6] => $this->getUpdatedAt(), - ); - $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { - $result[$key] = $virtualColumn; - } - - if ($includeForeignObjects) { - if (null !== $this->aCoupon) { - $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - } - - return $result; - } - - /** - * Sets a field from the object by name passed in as a string. - * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return void - */ - public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) - { - $pos = CouponRuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - - return $this->setByPosition($pos, $value); - } - - /** - * Sets a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @param mixed $value field value - * @return void - */ - public function setByPosition($pos, $value) - { - switch ($pos) { - case 0: - $this->setId($value); - break; - case 1: - $this->setCouponId($value); - break; - case 2: - $this->setController($value); - break; - case 3: - $this->setOperation($value); - break; - case 4: - $this->setValue($value); - break; - case 5: - $this->setCreatedAt($value); - break; - case 6: - $this->setUpdatedAt($value); - break; - } // switch() - } - - /** - * Populates the object using an array. - * - * This is particularly useful when populating an object from one of the - * request arrays (e.g. $_POST). This method goes through the column - * names, checking to see whether a matching key exists in populated - * array. If so the setByName() method is called for that column. - * - * You can specify the key type of the array by additionally passing one - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * The default key type is the column's TableMap::TYPE_PHPNAME. - * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. - * @return void - */ - public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) - { - $keys = CouponRuleTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setCouponId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setController($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setOperation($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setValue($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]); - } - - /** - * Build a Criteria object containing the values of all modified columns in this object. - * - * @return Criteria The Criteria object containing all modified values. - */ - public function buildCriteria() - { - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - - if ($this->isColumnModified(CouponRuleTableMap::ID)) $criteria->add(CouponRuleTableMap::ID, $this->id); - if ($this->isColumnModified(CouponRuleTableMap::COUPON_ID)) $criteria->add(CouponRuleTableMap::COUPON_ID, $this->coupon_id); - if ($this->isColumnModified(CouponRuleTableMap::CONTROLLER)) $criteria->add(CouponRuleTableMap::CONTROLLER, $this->controller); - if ($this->isColumnModified(CouponRuleTableMap::OPERATION)) $criteria->add(CouponRuleTableMap::OPERATION, $this->operation); - if ($this->isColumnModified(CouponRuleTableMap::VALUE)) $criteria->add(CouponRuleTableMap::VALUE, $this->value); - if ($this->isColumnModified(CouponRuleTableMap::CREATED_AT)) $criteria->add(CouponRuleTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) $criteria->add(CouponRuleTableMap::UPDATED_AT, $this->updated_at); - - return $criteria; - } - - /** - * Builds a Criteria object containing the primary key for this object. - * - * Unlike buildCriteria() this method includes the primary key values regardless - * of whether or not they have been modified. - * - * @return Criteria The Criteria object containing value(s) for primary key(s). - */ - public function buildPkeyCriteria() - { - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - $criteria->add(CouponRuleTableMap::ID, $this->id); - - return $criteria; - } - - /** - * Returns the primary key for this object (row). - * @return int - */ - public function getPrimaryKey() - { - return $this->getId(); - } - - /** - * Generic method to set the primary key (id column). - * - * @param int $key Primary key. - * @return void - */ - public function setPrimaryKey($key) - { - $this->setId($key); - } - - /** - * Returns true if the primary key for this object is null. - * @return boolean - */ - public function isPrimaryKeyNull() - { - - return null === $this->getId(); - } - - /** - * Sets contents of passed object to values from current object. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param object $copyObj An object of \Thelia\Model\CouponRule (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. - * @throws PropelException - */ - public function copyInto($copyObj, $deepCopy = false, $makeNew = true) - { - $copyObj->setCouponId($this->getCouponId()); - $copyObj->setController($this->getController()); - $copyObj->setOperation($this->getOperation()); - $copyObj->setValue($this->getValue()); - $copyObj->setCreatedAt($this->getCreatedAt()); - $copyObj->setUpdatedAt($this->getUpdatedAt()); - if ($makeNew) { - $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value - } - } - - /** - * Makes a copy of this object that will be inserted as a new row in table when saved. - * It creates a new object filling in the simple attributes, but skipping any primary - * keys that are defined for the table. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CouponRule Clone of current object. - * @throws PropelException - */ - public function copy($deepCopy = false) - { - // we use get_class(), because this might be a subclass - $clazz = get_class($this); - $copyObj = new $clazz(); - $this->copyInto($copyObj, $deepCopy); - - return $copyObj; - } - - /** - * Declares an association between this object and a ChildCoupon object. - * - * @param ChildCoupon $v - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - * @throws PropelException - */ - public function setCoupon(ChildCoupon $v = null) - { - if ($v === null) { - $this->setCouponId(NULL); - } else { - $this->setCouponId($v->getId()); - } - - $this->aCoupon = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildCoupon object, it will not be re-added. - if ($v !== null) { - $v->addCouponRule($this); - } - - - return $this; - } - - - /** - * Get the associated ChildCoupon object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCoupon The associated ChildCoupon object. - * @throws PropelException - */ - public function getCoupon(ConnectionInterface $con = null) - { - if ($this->aCoupon === null && ($this->coupon_id !== null)) { - $this->aCoupon = ChildCouponQuery::create()->findPk($this->coupon_id, $con); - /* The following can be used additionally to - guarantee the related object contains a reference - to this object. This level of coupling may, however, be - undesirable since it could result in an only partially populated collection - in the referenced object. - $this->aCoupon->addCouponRules($this); - */ - } - - return $this->aCoupon; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->coupon_id = null; - $this->controller = null; - $this->operation = null; - $this->value = null; - $this->created_at = null; - $this->updated_at = null; - $this->alreadyInSave = false; - $this->clearAllReferences(); - $this->resetModified(); - $this->setNew(true); - $this->setDeleted(false); - } - - /** - * Resets all references to other model objects or collections of model objects. - * - * This method is a user-space workaround for PHP's inability to garbage collect - * objects with circular references (even in PHP 5.3). This is currently necessary - * when using Propel in certain daemon or large-volume/high-memory operations. - * - * @param boolean $deep Whether to also clear the references on all referrer objects. - */ - public function clearAllReferences($deep = false) - { - if ($deep) { - } // if ($deep) - - $this->aCoupon = null; - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(CouponRuleTableMap::DEFAULT_STRING_FORMAT); - } - - // timestampable behavior - - /** - * Mark the current object so that the update date doesn't get updated during next save - * - * @return ChildCouponRule The current object (for fluent API support) - */ - public function keepUpdateDateUnchanged() - { - $this->modifiedColumns[] = CouponRuleTableMap::UPDATED_AT; - - return $this; - } - - /** - * Code to be run before persisting the object - * @param ConnectionInterface $con - * @return boolean - */ - public function preSave(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after persisting the object - * @param ConnectionInterface $con - */ - public function postSave(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before inserting to database - * @param ConnectionInterface $con - * @return boolean - */ - public function preInsert(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after inserting to database - * @param ConnectionInterface $con - */ - public function postInsert(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before updating the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preUpdate(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after updating the object in database - * @param ConnectionInterface $con - */ - public function postUpdate(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before deleting the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preDelete(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after deleting the object in database - * @param ConnectionInterface $con - */ - public function postDelete(ConnectionInterface $con = null) - { - - } - - - /** - * Derived method to catches calls to undefined methods. - * - * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). - * Allows to define default __call() behavior if you overwrite __call() - * - * @param string $name - * @param mixed $params - * - * @return array|string - */ - public function __call($name, $params) - { - if (0 === strpos($name, 'get')) { - $virtualColumn = substr($name, 3); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - - $virtualColumn = lcfirst($virtualColumn); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - } - - if (0 === strpos($name, 'from')) { - $format = substr($name, 4); - - return $this->importFrom($format, reset($params)); - } - - if (0 === strpos($name, 'to')) { - $format = substr($name, 2); - $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; - - return $this->exportTo($format, $includeLazyLoadColumns); - } - - throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); - } - -} diff --git a/core/lib/Thelia/Model/Base/CouponRuleQuery.php b/core/lib/Thelia/Model/Base/CouponRuleQuery.php deleted file mode 100755 index 0789f84d6..000000000 --- a/core/lib/Thelia/Model/Base/CouponRuleQuery.php +++ /dev/null @@ -1,744 +0,0 @@ -setModelAlias($modelAlias); - } - if ($criteria instanceof Criteria) { - $query->mergeWith($criteria); - } - - return $query; - } - - /** - * Find object by primary key. - * Propel uses the instance pool to skip the database if the object exists. - * Go fast if the query is untouched. - * - * - * $obj = $c->findPk(12, $con); - * - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ChildCouponRule|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = CouponRuleTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(CouponRuleTableMap::DATABASE_NAME); - } - $this->basePreSelect($con); - if ($this->formatter || $this->modelAlias || $this->with || $this->select - || $this->selectColumns || $this->asColumns || $this->selectModifiers - || $this->map || $this->having || $this->joins) { - return $this->findPkComplex($key, $con); - } else { - return $this->findPkSimple($key, $con); - } - } - - /** - * Find object by primary key using raw SQL to go fast. - * Bypass doSelect() and the object formatter by using generated code. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildCouponRule A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, COUPON_ID, CONTROLLER, OPERATION, VALUE, CREATED_AT, UPDATED_AT FROM coupon_rule WHERE ID = :p0'; - try { - $stmt = $con->prepare($sql); - $stmt->bindValue(':p0', $key, PDO::PARAM_INT); - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); - } - $obj = null; - if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { - $obj = new ChildCouponRule(); - $obj->hydrate($row); - CouponRuleTableMap::addInstanceToPool($obj, (string) $key); - } - $stmt->closeCursor(); - - return $obj; - } - - /** - * Find object by primary key. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildCouponRule|array|mixed the result, formatted by the current formatter - */ - protected function findPkComplex($key, $con) - { - // As the query uses a PK condition, no limit(1) is necessary. - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKey($key) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); - } - - /** - * Find objects by primary key - * - * $objs = $c->findPks(array(12, 56, 832), $con); - * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter - */ - public function findPks($keys, $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); - } - $this->basePreSelect($con); - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKeys($keys) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->format($dataFetcher); - } - - /** - * Filter the query by primary key - * - * @param mixed $key Primary key to use for the query - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(CouponRuleTableMap::ID, $key, Criteria::EQUAL); - } - - /** - * Filter the query by a list of primary keys - * - * @param array $keys The list of primary key to use for the query - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(CouponRuleTableMap::ID, $keys, Criteria::IN); - } - - /** - * Filter the query on the id column - * - * Example usage: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterById($id = null, $comparison = null) - { - if (is_array($id)) { - $useMinMax = false; - if (isset($id['min'])) { - $this->addUsingAlias(CouponRuleTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(CouponRuleTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the coupon_id column - * - * Example usage: - * - * $query->filterByCouponId(1234); // WHERE coupon_id = 1234 - * $query->filterByCouponId(array(12, 34)); // WHERE coupon_id IN (12, 34) - * $query->filterByCouponId(array('min' => 12)); // WHERE coupon_id > 12 - * - * - * @see filterByCoupon() - * - * @param mixed $couponId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCouponId($couponId = null, $comparison = null) - { - if (is_array($couponId)) { - $useMinMax = false; - if (isset($couponId['min'])) { - $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($couponId['max'])) { - $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId, $comparison); - } - - /** - * Filter the query on the controller column - * - * Example usage: - * - * $query->filterByController('fooValue'); // WHERE controller = 'fooValue' - * $query->filterByController('%fooValue%'); // WHERE controller LIKE '%fooValue%' - * - * - * @param string $controller The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByController($controller = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($controller)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $controller)) { - $controller = str_replace('*', '%', $controller); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::CONTROLLER, $controller, $comparison); - } - - /** - * Filter the query on the operation column - * - * Example usage: - * - * $query->filterByOperation('fooValue'); // WHERE operation = 'fooValue' - * $query->filterByOperation('%fooValue%'); // WHERE operation LIKE '%fooValue%' - * - * - * @param string $operation The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByOperation($operation = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($operation)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $operation)) { - $operation = str_replace('*', '%', $operation); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::OPERATION, $operation, $comparison); - } - - /** - * Filter the query on the value column - * - * Example usage: - * - * $query->filterByValue(1234); // WHERE value = 1234 - * $query->filterByValue(array(12, 34)); // WHERE value IN (12, 34) - * $query->filterByValue(array('min' => 12)); // WHERE value > 12 - * - * - * @param mixed $value The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByValue($value = null, $comparison = null) - { - if (is_array($value)) { - $useMinMax = false; - if (isset($value['min'])) { - $this->addUsingAlias(CouponRuleTableMap::VALUE, $value['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($value['max'])) { - $this->addUsingAlias(CouponRuleTableMap::VALUE, $value['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::VALUE, $value, $comparison); - } - - /** - * Filter the query on the created_at column - * - * Example usage: - * - * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' - * - * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCreatedAt($createdAt = null, $comparison = null) - { - if (is_array($createdAt)) { - $useMinMax = false; - if (isset($createdAt['min'])) { - $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($createdAt['max'])) { - $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt, $comparison); - } - - /** - * Filter the query on the updated_at column - * - * Example usage: - * - * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' - * - * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByUpdatedAt($updatedAt = null, $comparison = null) - { - if (is_array($updatedAt)) { - $useMinMax = false; - if (isset($updatedAt['min'])) { - $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($updatedAt['max'])) { - $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt, $comparison); - } - - /** - * Filter the query by a related \Thelia\Model\Coupon object - * - * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCoupon($coupon, $comparison = null) - { - if ($coupon instanceof \Thelia\Model\Coupon) { - return $this - ->addUsingAlias(CouponRuleTableMap::COUPON_ID, $coupon->getId(), $comparison); - } elseif ($coupon instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(CouponRuleTableMap::COUPON_ID, $coupon->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Coupon relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Coupon'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Coupon'); - } - - return $this; - } - - /** - * Use the Coupon relation Coupon object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query - */ - public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCoupon($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); - } - - /** - * Exclude object from result - * - * @param ChildCouponRule $couponRule Object to remove from the list of results - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function prune($couponRule = null) - { - if ($couponRule) { - $this->addUsingAlias(CouponRuleTableMap::ID, $couponRule->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the coupon_rule table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public function doDeleteAll(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - $affectedRows = 0; // initialize var to track total num of affected rows - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - $affectedRows += parent::doDeleteAll($con); - // Because this db requires some delete cascade/set null emulation, we have to - // clear the cached instance *after* the emulation has happened (since - // instances get re-added by the select statement contained therein). - CouponRuleTableMap::clearInstancePool(); - CouponRuleTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildCouponRule or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildCouponRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public function delete(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(CouponRuleTableMap::DATABASE_NAME); - - $affectedRows = 0; // initialize var to track total num of affected rows - - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - - - CouponRuleTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - CouponRuleTableMap::clearRelatedInstancePool(); - $con->commit(); - - return $affectedRows; - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - } - - // timestampable behavior - - /** - * Filter by the latest updated - * - * @param int $nbDays Maximum age of the latest update in days - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function recentlyUpdated($nbDays = 7) - { - return $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Filter by the latest created - * - * @param int $nbDays Maximum age of in days - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function recentlyCreated($nbDays = 7) - { - return $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Order by update date desc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function lastUpdatedFirst() - { - return $this->addDescendingOrderByColumn(CouponRuleTableMap::UPDATED_AT); - } - - /** - * Order by update date asc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function firstUpdatedFirst() - { - return $this->addAscendingOrderByColumn(CouponRuleTableMap::UPDATED_AT); - } - - /** - * Order by create date desc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function lastCreatedFirst() - { - return $this->addDescendingOrderByColumn(CouponRuleTableMap::CREATED_AT); - } - - /** - * Order by create date asc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function firstCreatedFirst() - { - return $this->addAscendingOrderByColumn(CouponRuleTableMap::CREATED_AT); - } - -} // CouponRuleQuery diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index f2e0c58aa..efa4898f4 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -328,7 +328,7 @@ abstract class CouponVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php old mode 100755 new mode 100644 index 77718992f..767e2dc37 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -337,7 +337,7 @@ abstract class Currency implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php old mode 100755 new mode 100644 index eb86a87c4..df5ff7240 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -254,7 +254,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php b/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php old mode 100755 new mode 100644 index c3315ac6f..3d87f3e28 --- a/core/lib/Thelia/Model/Base/Customer.php +++ b/core/lib/Thelia/Model/Base/Customer.php @@ -352,7 +352,7 @@ abstract class Customer implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerQuery.php b/core/lib/Thelia/Model/Base/CustomerQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php old mode 100755 new mode 100644 index 5f8b11dd9..6b1295d2b --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -319,7 +319,7 @@ abstract class CustomerTitle implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php old mode 100755 new mode 100644 index c68b87123..b384210b1 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -260,7 +260,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Delivzone.php b/core/lib/Thelia/Model/Base/Delivzone.php old mode 100755 new mode 100644 index 08125044e..deb21997e --- a/core/lib/Thelia/Model/Base/Delivzone.php +++ b/core/lib/Thelia/Model/Base/Delivzone.php @@ -255,7 +255,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/DelivzoneQuery.php b/core/lib/Thelia/Model/Base/DelivzoneQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php old mode 100755 new mode 100644 index 0dddd14e0..2860a4155 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -346,7 +346,7 @@ abstract class Feature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php old mode 100755 new mode 100644 index b09a27cec..bf1bfc41e --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -298,7 +298,7 @@ abstract class FeatureAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php old mode 100755 new mode 100644 index 7cbca8129..44e7893a2 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -272,7 +272,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureCategory.php b/core/lib/Thelia/Model/Base/FeatureCategory.php old mode 100755 new mode 100644 index f3ce14349..035e077d2 --- a/core/lib/Thelia/Model/Base/FeatureCategory.php +++ b/core/lib/Thelia/Model/Base/FeatureCategory.php @@ -262,7 +262,7 @@ abstract class FeatureCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php b/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php old mode 100755 new mode 100644 index 0ede8eddb..57c7a0b30 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -272,7 +272,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureProduct.php b/core/lib/Thelia/Model/Base/FeatureProduct.php old mode 100755 new mode 100644 index b68f4acd2..4af200d51 --- a/core/lib/Thelia/Model/Base/FeatureProduct.php +++ b/core/lib/Thelia/Model/Base/FeatureProduct.php @@ -287,7 +287,7 @@ abstract class FeatureProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureProductQuery.php b/core/lib/Thelia/Model/Base/FeatureProductQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php old mode 100755 new mode 100644 index 6ee28e7ff..4457c5042 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -31,8 +31,6 @@ use Thelia\Model\FolderImageQuery as ChildFolderImageQuery; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\FolderVersion as ChildFolderVersion; use Thelia\Model\FolderVersionQuery as ChildFolderVersionQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\FolderTableMap; use Thelia\Model\Map\FolderVersionTableMap; @@ -125,12 +123,6 @@ abstract class Folder implements ActiveRecordInterface */ protected $version_created_by; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -202,12 +194,6 @@ abstract class Folder implements ActiveRecordInterface */ protected $contentsScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -407,7 +393,7 @@ abstract class Folder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -965,8 +951,6 @@ abstract class Folder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collRewritings = null; - $this->collContentFolders = null; $this->collFolderImages = null; @@ -1150,23 +1134,6 @@ abstract class Folder implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1478,9 +1445,6 @@ abstract class Folder implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1687,12 +1651,6 @@ abstract class Folder implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1764,9 +1722,6 @@ abstract class Folder implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1784,299 +1739,6 @@ abstract class Folder implements ActiveRecordInterface } } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildFolder is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByFolder($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setFolder(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByFolder($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Folder The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setFolder($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildFolder The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setFolder(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collContentFolders collection * @@ -3422,11 +3084,6 @@ abstract class Folder implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3463,10 +3120,6 @@ abstract class Folder implements ActiveRecordInterface $this->currentLocale = 'en_US'; $this->currentTranslations = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php old mode 100755 new mode 100644 index 31e7c57a6..8e24ee9d4 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -290,7 +290,7 @@ abstract class FolderDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php old mode 100755 new mode 100644 index d39a49af7..b68c8ce9d --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -272,7 +272,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php old mode 100755 new mode 100644 index fcdc66705..976c6b041 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -272,7 +272,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderI18nQuery.php b/core/lib/Thelia/Model/Base/FolderI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php old mode 100755 new mode 100644 index 46c39060d..525dc9d48 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -290,7 +290,7 @@ abstract class FolderImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php old mode 100755 new mode 100644 index d5cc004d1..6ac9575e1 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -272,7 +272,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php b/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderImageQuery.php b/core/lib/Thelia/Model/Base/FolderImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php old mode 100755 new mode 100644 index 893bb9819..d7d6794c5 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -46,10 +46,6 @@ use Thelia\Model\Map\FolderTableMap; * @method ChildFolderQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildFolderQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildFolderQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildFolderQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildFolderQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildFolderQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -639,79 +635,6 @@ abstract class FolderQuery extends ModelCriteria return $this->addUsingAlias(FolderTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildFolderQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(FolderTableMap::ID, $rewriting->getFolderId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildFolderQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php old mode 100755 new mode 100644 index 4f6305b7e..ec588dcbd --- a/core/lib/Thelia/Model/Base/FolderVersion.php +++ b/core/lib/Thelia/Model/Base/FolderVersion.php @@ -292,7 +292,7 @@ abstract class FolderVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderVersionQuery.php b/core/lib/Thelia/Model/Base/FolderVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php old mode 100755 new mode 100644 index 9cfde2bdc..19d41e38c --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -339,7 +339,7 @@ abstract class Group implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php old mode 100755 new mode 100644 index 4de63ea63..df8f3f81a --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -272,7 +272,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupI18nQuery.php b/core/lib/Thelia/Model/Base/GroupI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupModule.php b/core/lib/Thelia/Model/Base/GroupModule.php old mode 100755 new mode 100644 index 620ca9c91..82d6056f2 --- a/core/lib/Thelia/Model/Base/GroupModule.php +++ b/core/lib/Thelia/Model/Base/GroupModule.php @@ -282,7 +282,7 @@ abstract class GroupModule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupModuleQuery.php b/core/lib/Thelia/Model/Base/GroupModuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupQuery.php b/core/lib/Thelia/Model/Base/GroupQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupResource.php b/core/lib/Thelia/Model/Base/GroupResource.php old mode 100755 new mode 100644 index 84d6006b0..ea6c0ff47 --- a/core/lib/Thelia/Model/Base/GroupResource.php +++ b/core/lib/Thelia/Model/Base/GroupResource.php @@ -290,7 +290,7 @@ abstract class GroupResource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupResourceQuery.php b/core/lib/Thelia/Model/Base/GroupResourceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php old mode 100755 new mode 100644 index 3379594ef..293b0f3a7 --- a/core/lib/Thelia/Model/Base/Lang.php +++ b/core/lib/Thelia/Model/Base/Lang.php @@ -272,7 +272,7 @@ abstract class Lang implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/LangQuery.php b/core/lib/Thelia/Model/Base/LangQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php old mode 100755 new mode 100644 index 7ff0fbd72..4ee6b4cab --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -332,7 +332,7 @@ abstract class Message implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php old mode 100755 new mode 100644 index 045a08c6e..d37682f97 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -272,7 +272,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageI18nQuery.php b/core/lib/Thelia/Model/Base/MessageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php old mode 100755 new mode 100644 index d86cf05ec..60e12da8d --- a/core/lib/Thelia/Model/Base/MessageVersion.php +++ b/core/lib/Thelia/Model/Base/MessageVersion.php @@ -286,7 +286,7 @@ abstract class MessageVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageVersionQuery.php b/core/lib/Thelia/Model/Base/MessageVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php old mode 100755 new mode 100644 index c1ee2ed8d..556ef9ff6 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -303,7 +303,7 @@ abstract class Module implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php old mode 100755 new mode 100644 index fbb4293ba..9c7d603d1 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -272,7 +272,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ModuleI18nQuery.php b/core/lib/Thelia/Model/Base/ModuleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php old mode 100755 new mode 100644 index b815aff34..6932ec6c4 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -388,7 +388,7 @@ abstract class Order implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php old mode 100755 new mode 100644 index b5ff32951..d0220d4e0 --- a/core/lib/Thelia/Model/Base/OrderAddress.php +++ b/core/lib/Thelia/Model/Base/OrderAddress.php @@ -329,7 +329,7 @@ abstract class OrderAddress implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderAddressQuery.php b/core/lib/Thelia/Model/Base/OrderAddressQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderFeature.php b/core/lib/Thelia/Model/Base/OrderFeature.php old mode 100755 new mode 100644 index 49c1a0911..e2b52e6b1 --- a/core/lib/Thelia/Model/Base/OrderFeature.php +++ b/core/lib/Thelia/Model/Base/OrderFeature.php @@ -261,7 +261,7 @@ abstract class OrderFeature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderFeatureQuery.php b/core/lib/Thelia/Model/Base/OrderFeatureQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php old mode 100755 new mode 100644 index b448e4e0c..2bf9c7ace --- a/core/lib/Thelia/Model/Base/OrderProduct.php +++ b/core/lib/Thelia/Model/Base/OrderProduct.php @@ -312,7 +312,7 @@ abstract class OrderProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderQuery.php b/core/lib/Thelia/Model/Base/OrderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php old mode 100755 new mode 100644 index fc4a224d1..d249b4865 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -285,7 +285,7 @@ abstract class OrderStatus implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php old mode 100755 new mode 100644 index 76ec4a28a..2946cc55b --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -272,7 +272,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php old mode 100755 new mode 100644 index 2fffe9af4..f7457d47b --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -41,8 +41,6 @@ use Thelia\Model\ProductSaleElements as ChildProductSaleElements; use Thelia\Model\ProductSaleElementsQuery as ChildProductSaleElementsQuery; use Thelia\Model\ProductVersion as ChildProductVersion; use Thelia\Model\ProductVersionQuery as ChildProductVersionQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\TaxRule as ChildTaxRule; use Thelia\Model\TaxRuleQuery as ChildTaxRuleQuery; use Thelia\Model\Map\ProductTableMap; @@ -191,12 +189,6 @@ abstract class Product implements ActiveRecordInterface protected $collAccessoriesRelatedByAccessory; protected $collAccessoriesRelatedByAccessoryPartial; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildCartItem[] Collection to store aggregation of ChildCartItem objects. */ @@ -326,12 +318,6 @@ abstract class Product implements ActiveRecordInterface */ protected $accessoriesRelatedByAccessoryScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -526,7 +512,7 @@ abstract class Product implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -1145,8 +1131,6 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory = null; - $this->collRewritings = null; - $this->collCartItems = null; $this->collProductAssociatedContents = null; @@ -1515,23 +1499,6 @@ abstract class Product implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->cartItemsScheduledForDeletion !== null) { if (!$this->cartItemsScheduledForDeletion->isEmpty()) { \Thelia\Model\CartItemQuery::create() @@ -1860,9 +1827,6 @@ abstract class Product implements ActiveRecordInterface if (null !== $this->collAccessoriesRelatedByAccessory) { $result['AccessoriesRelatedByAccessory'] = $this->collAccessoriesRelatedByAccessory->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collCartItems) { $result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -2114,12 +2078,6 @@ abstract class Product implements ActiveRecordInterface } } - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getCartItems() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCartItem($relObj->copy($deepCopy)); @@ -2257,9 +2215,6 @@ abstract class Product implements ActiveRecordInterface if ('AccessoryRelatedByAccessory' == $relationName) { return $this->initAccessoriesRelatedByAccessory(); } - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('CartItem' == $relationName) { return $this->initCartItems(); } @@ -3878,299 +3833,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildProduct is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByProduct($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setProduct(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByProduct($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Product The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setProduct($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildProduct The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setProduct(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collCartItems collection * @@ -5747,11 +5409,6 @@ abstract class Product implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collCartItems) { foreach ($this->collCartItems as $o) { $o->clearAllReferences($deep); @@ -5821,10 +5478,6 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory->clearIterator(); } $this->collAccessoriesRelatedByAccessory = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collCartItems instanceof Collection) { $this->collCartItems->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php index 6dce2b2c3..bbc97d5d1 100644 --- a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php @@ -268,7 +268,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php old mode 100755 new mode 100644 index 74affb0c0..62a6ea425 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -256,7 +256,7 @@ abstract class ProductCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php old mode 100755 new mode 100644 index 58c9999ed..4223679c1 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -290,7 +290,7 @@ abstract class ProductDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php old mode 100755 new mode 100644 index 2c5ca4d0c..1a6017966 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php old mode 100755 new mode 100644 index b0c74bb54..3ef14e787 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -272,7 +272,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductI18nQuery.php b/core/lib/Thelia/Model/Base/ProductI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php old mode 100755 new mode 100644 index 0b4030ccb..a54d22cd0 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -290,7 +290,7 @@ abstract class ProductImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php old mode 100755 new mode 100644 index 634f726a3..679ded79c --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -272,7 +272,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php b/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php old mode 100755 new mode 100644 index dab6e47a4..15502a385 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -274,7 +274,7 @@ abstract class ProductPrice implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php old mode 100755 new mode 100644 index f3ed6a93c..75f05dfcf --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -80,10 +80,6 @@ use Thelia\Model\Map\ProductTableMap; * @method ChildProductQuery rightJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AccessoryRelatedByAccessory relation * @method ChildProductQuery innerJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a INNER JOIN clause to the query using the AccessoryRelatedByAccessory relation * - * @method ChildProductQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildProductQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildProductQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildProductQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation * @method ChildProductQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation * @method ChildProductQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation @@ -1288,79 +1284,6 @@ abstract class ProductQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AccessoryRelatedByAccessory', '\Thelia\Model\AccessoryQuery'); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(ProductTableMap::ID, $rewriting->getProductId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\CartItem object * diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php old mode 100755 new mode 100644 index 22a8c9752..f79d9a246 --- a/core/lib/Thelia/Model/Base/ProductSaleElements.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php @@ -332,7 +332,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php b/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php old mode 100755 new mode 100644 index 1779cee20..071dfc742 --- a/core/lib/Thelia/Model/Base/ProductVersion.php +++ b/core/lib/Thelia/Model/Base/ProductVersion.php @@ -300,7 +300,7 @@ abstract class ProductVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductVersionQuery.php b/core/lib/Thelia/Model/Base/ProductVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php old mode 100755 new mode 100644 index c6c527134..5a51bdc29 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -298,7 +298,7 @@ abstract class Resource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php old mode 100755 new mode 100644 index c060e8776..ac9ca106f --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -272,7 +272,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ResourceI18nQuery.php b/core/lib/Thelia/Model/Base/ResourceI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/RewritingArgument.php b/core/lib/Thelia/Model/Base/RewritingArgument.php index e8a3a9a16..45f26c24f 100644 --- a/core/lib/Thelia/Model/Base/RewritingArgument.php +++ b/core/lib/Thelia/Model/Base/RewritingArgument.php @@ -255,7 +255,7 @@ abstract class RewritingArgument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index a6bcd3a26..75ee97e79 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -298,7 +298,7 @@ abstract class RewritingUrl implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php old mode 100755 new mode 100644 index 3e405414c..02e6bc3b0 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -285,7 +285,7 @@ abstract class Tax implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php old mode 100755 new mode 100644 index f8577e860..abb659135 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -260,7 +260,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxI18nQuery.php b/core/lib/Thelia/Model/Base/TaxI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php old mode 100755 new mode 100644 index bf318498c..d33d47e2b --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -311,7 +311,7 @@ abstract class TaxRule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php old mode 100755 new mode 100644 index b5ae7941b..66f6f585b --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -281,7 +281,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php old mode 100755 new mode 100644 index 51bab6a77..b1efadd6a --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -248,7 +248,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index ac3b2fff6..ae999ccc8 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -2,6 +2,7 @@ namespace Thelia\Model; +use Thelia\Core\Event\CategoryEvent; use Thelia\Model\Base\Category as BaseCategory; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Tools\URL; diff --git a/core/lib/Thelia/Model/Map/AccessoryTableMap.php b/core/lib/Thelia/Model/Map/AccessoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AddressTableMap.php b/core/lib/Thelia/Model/Map/AddressTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminGroupTableMap.php b/core/lib/Thelia/Model/Map/AdminGroupTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminLogTableMap.php b/core/lib/Thelia/Model/Map/AdminLogTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminTableMap.php b/core/lib/Thelia/Model/Map/AdminTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AreaTableMap.php b/core/lib/Thelia/Model/Map/AreaTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php b/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CartItemTableMap.php b/core/lib/Thelia/Model/Map/CartItemTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CartTableMap.php b/core/lib/Thelia/Model/Map/CartTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php old mode 100755 new mode 100644 index e6f38e11e..6a2d052a1 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -193,7 +193,6 @@ class CategoryTableMap extends TableMap $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories'); $this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories'); $this->addRelation('AttributeCategory', '\\Thelia\\Model\\AttributeCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'AttributeCategories'); - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CategoryImage', '\\Thelia\\Model\\CategoryImage', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryImages'); $this->addRelation('CategoryDocument', '\\Thelia\\Model\\CategoryDocument', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryDocuments'); $this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents'); @@ -228,7 +227,6 @@ class CategoryTableMap extends TableMap ProductCategoryTableMap::clearInstancePool(); FeatureCategoryTableMap::clearInstancePool(); AttributeCategoryTableMap::clearInstancePool(); - RewritingTableMap::clearInstancePool(); CategoryImageTableMap::clearInstancePool(); CategoryDocumentTableMap::clearInstancePool(); CategoryAssociatedContentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php b/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php old mode 100755 new mode 100644 index 04dcb5e91..ae9b908c0 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -184,7 +184,6 @@ class ContentTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('ContentImage', '\\Thelia\\Model\\ContentImage', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentImages'); $this->addRelation('ContentDocument', '\\Thelia\\Model\\ContentDocument', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentDocuments'); @@ -216,7 +215,6 @@ class ContentTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); ContentImageTableMap::clearInstancePool(); ContentDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ContentVersionTableMap.php b/core/lib/Thelia/Model/Map/ContentVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php index 05f4b46ec..46ecdce3b 100644 --- a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php @@ -146,11 +146,10 @@ class CouponI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); } // initialize() /** @@ -350,9 +349,15 @@ class CouponI18nTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponI18nTableMap::ID); $criteria->addSelectColumn(CouponI18nTableMap::LOCALE); + $criteria->addSelectColumn(CouponI18nTableMap::TITLE); + $criteria->addSelectColumn(CouponI18nTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponI18nTableMap::DESCRIPTION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.LOCALE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); } } diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CouponRuleTableMap.php b/core/lib/Thelia/Model/Map/CouponRuleTableMap.php deleted file mode 100755 index 99faeac59..000000000 --- a/core/lib/Thelia/Model/Map/CouponRuleTableMap.php +++ /dev/null @@ -1,463 +0,0 @@ - array('Id', 'CouponId', 'Controller', 'Operation', 'Value', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'couponId', 'controller', 'operation', 'value', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CouponRuleTableMap::ID, CouponRuleTableMap::COUPON_ID, CouponRuleTableMap::CONTROLLER, CouponRuleTableMap::OPERATION, CouponRuleTableMap::VALUE, CouponRuleTableMap::CREATED_AT, CouponRuleTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'COUPON_ID', 'CONTROLLER', 'OPERATION', 'VALUE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'coupon_id', 'controller', 'operation', 'value', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) - ); - - /** - * holds an array of keys for quick access to the fieldnames array - * - * first dimension keys are the type constants - * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 - */ - protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'CouponId' => 1, 'Controller' => 2, 'Operation' => 3, 'Value' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'couponId' => 1, 'controller' => 2, 'operation' => 3, 'value' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), - self::TYPE_COLNAME => array(CouponRuleTableMap::ID => 0, CouponRuleTableMap::COUPON_ID => 1, CouponRuleTableMap::CONTROLLER => 2, CouponRuleTableMap::OPERATION => 3, CouponRuleTableMap::VALUE => 4, CouponRuleTableMap::CREATED_AT => 5, CouponRuleTableMap::UPDATED_AT => 6, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'COUPON_ID' => 1, 'CONTROLLER' => 2, 'OPERATION' => 3, 'VALUE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), - self::TYPE_FIELDNAME => array('id' => 0, 'coupon_id' => 1, 'controller' => 2, 'operation' => 3, 'value' => 4, 'created_at' => 5, 'updated_at' => 6, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) - ); - - /** - * Initialize the table attributes and columns - * Relations are not initialized by this method since they are lazy loaded - * - * @return void - * @throws PropelException - */ - public function initialize() - { - // attributes - $this->setName('coupon_rule'); - $this->setPhpName('CouponRule'); - $this->setClassName('\\Thelia\\Model\\CouponRule'); - $this->setPackage('Thelia.Model'); - $this->setUseIdGenerator(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('COUPON_ID', 'CouponId', 'INTEGER', 'coupon', 'ID', true, null, null); - $this->addColumn('CONTROLLER', 'Controller', 'VARCHAR', false, 255, null); - $this->addColumn('OPERATION', 'Operation', 'VARCHAR', false, 255, null); - $this->addColumn('VALUE', 'Value', 'FLOAT', false, null, null); - $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); - $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); - } // initialize() - - /** - * Build the RelationMap objects for this table relationships - */ - public function buildRelations() - { - $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('coupon_id' => 'id', ), 'CASCADE', 'RESTRICT'); - } // buildRelations() - - /** - * - * Gets the list of behaviors registered for this table - * - * @return array Associative array (name => parameters) of behaviors - */ - public function getBehaviors() - { - return array( - 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), - ); - } // getBehaviors() - - /** - * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. - * - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, a serialize()d version of the primary key will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - */ - public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { - return null; - } - - return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - } - - /** - * Retrieves the primary key from the DB resultset row - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, an array of the primary key columns will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - * - * @return mixed The primary key of the row - */ - public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - - return (int) $row[ - $indexType == TableMap::TYPE_NUM - ? 0 + $offset - : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) - ]; - } - - /** - * The class that the tableMap will make instances of. - * - * If $withPrefix is true, the returned path - * uses a dot-path notation which is translated into a path - * relative to a location on the PHP include_path. - * (e.g. path.to.MyClass -> 'path/to/MyClass.php') - * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName - */ - public static function getOMClass($withPrefix = true) - { - return $withPrefix ? CouponRuleTableMap::CLASS_DEFAULT : CouponRuleTableMap::OM_CLASS; - } - - /** - * Populates an object of the default type or an object that inherit from the default. - * - * @param array $row row returned by DataFetcher->fetch(). - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CouponRule object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = CouponRuleTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = CouponRuleTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, $offset, true); // rehydrate - $col = $offset + CouponRuleTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = CouponRuleTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - CouponRuleTableMap::addInstanceToPool($obj, $key); - } - - return array($obj, $col); - } - - /** - * The returned array will contain objects of the default type or - * objects that inherit from the default. - * - * @param DataFetcherInterface $dataFetcher - * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function populateObjects(DataFetcherInterface $dataFetcher) - { - $results = array(); - - // set the class once to avoid overhead in the loop - $cls = static::getOMClass(false); - // populate the object(s) - while ($row = $dataFetcher->fetch()) { - $key = CouponRuleTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = CouponRuleTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, 0, true); // rehydrate - $results[] = $obj; - } else { - $obj = new $cls(); - $obj->hydrate($row); - $results[] = $obj; - CouponRuleTableMap::addInstanceToPool($obj, $key); - } // if key exists - } - - return $results; - } - /** - * Add all the columns needed to create a new object. - * - * Note: any columns that were marked with lazyLoad="true" in the - * XML schema will not be added to the select list and only loaded - * on demand. - * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function addSelectColumns(Criteria $criteria, $alias = null) - { - if (null === $alias) { - $criteria->addSelectColumn(CouponRuleTableMap::ID); - $criteria->addSelectColumn(CouponRuleTableMap::COUPON_ID); - $criteria->addSelectColumn(CouponRuleTableMap::CONTROLLER); - $criteria->addSelectColumn(CouponRuleTableMap::OPERATION); - $criteria->addSelectColumn(CouponRuleTableMap::VALUE); - $criteria->addSelectColumn(CouponRuleTableMap::CREATED_AT); - $criteria->addSelectColumn(CouponRuleTableMap::UPDATED_AT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.COUPON_ID'); - $criteria->addSelectColumn($alias . '.CONTROLLER'); - $criteria->addSelectColumn($alias . '.OPERATION'); - $criteria->addSelectColumn($alias . '.VALUE'); - $criteria->addSelectColumn($alias . '.CREATED_AT'); - $criteria->addSelectColumn($alias . '.UPDATED_AT'); - } - } - - /** - * Returns the TableMap related to this object. - * This method is not needed for general use but a specific application could have a need. - * @return TableMap - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function getTableMap() - { - return Propel::getServiceContainer()->getDatabaseMap(CouponRuleTableMap::DATABASE_NAME)->getTable(CouponRuleTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(CouponRuleTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(CouponRuleTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new CouponRuleTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a CouponRule or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or CouponRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doDelete($values, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \Thelia\Model\CouponRule) { // it's a model object - // create criteria based on pk values - $criteria = $values->buildPkeyCriteria(); - } else { // it's a primary key, or an array of pks - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - $criteria->add(CouponRuleTableMap::ID, (array) $values, Criteria::IN); - } - - $query = CouponRuleQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { CouponRuleTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { CouponRuleTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the coupon_rule table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public static function doDeleteAll(ConnectionInterface $con = null) - { - return CouponRuleQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a CouponRule or Criteria object. - * - * @param mixed $criteria Criteria or CouponRule object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doInsert($criteria, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from CouponRule object - } - - if ($criteria->containsKey(CouponRuleTableMap::ID) && $criteria->keyContainsValue(CouponRuleTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.CouponRuleTableMap::ID.')'); - } - - - // Set the correct dbName - $query = CouponRuleQuery::create()->mergeWith($criteria); - - try { - // use transaction because $criteria could contain info - // for more than one table (I guess, conceivably) - $con->beginTransaction(); - $pk = $query->doInsert($con); - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $pk; - } - -} // CouponRuleTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -CouponRuleTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTableMap.php b/core/lib/Thelia/Model/Map/CustomerTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/DelivzoneTableMap.php b/core/lib/Thelia/Model/Map/DelivzoneTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php b/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureProductTableMap.php b/core/lib/Thelia/Model/Map/FeatureProductTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php old mode 100755 new mode 100644 index 1bfe2cd6e..b35f63ae3 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -190,7 +190,6 @@ class FolderTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('FolderImage', '\\Thelia\\Model\\FolderImage', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderImages'); $this->addRelation('FolderDocument', '\\Thelia\\Model\\FolderDocument', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderDocuments'); @@ -220,7 +219,6 @@ class FolderTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); FolderImageTableMap::clearInstancePool(); FolderDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/FolderVersionTableMap.php b/core/lib/Thelia/Model/Map/FolderVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupModuleTableMap.php b/core/lib/Thelia/Model/Map/GroupModuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupResourceTableMap.php b/core/lib/Thelia/Model/Map/GroupResourceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/LangTableMap.php b/core/lib/Thelia/Model/Map/LangTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderAddressTableMap.php b/core/lib/Thelia/Model/Map/OrderAddressTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php b/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderTableMap.php b/core/lib/Thelia/Model/Map/OrderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php b/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php old mode 100755 new mode 100644 index e1e2eab5f..f69f6f702 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -204,7 +204,6 @@ class ProductTableMap extends TableMap $this->addRelation('ProductDocument', '\\Thelia\\Model\\ProductDocument', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductDocuments'); $this->addRelation('AccessoryRelatedByProductId', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByProductId'); $this->addRelation('AccessoryRelatedByAccessory', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'accessory', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByAccessory'); - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), null, null, 'CartItems'); $this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents'); $this->addRelation('ProductI18n', '\\Thelia\\Model\\ProductI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductI18ns'); @@ -241,7 +240,6 @@ class ProductTableMap extends TableMap ProductImageTableMap::clearInstancePool(); ProductDocumentTableMap::clearInstancePool(); AccessoryTableMap::clearInstancePool(); - RewritingTableMap::clearInstancePool(); ProductAssociatedContentTableMap::clearInstancePool(); ProductI18nTableMap::clearInstancePool(); ProductVersionTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php new file mode 100644 index 000000000..8d6f75fab --- /dev/null +++ b/core/lib/Thelia/Model/Rewriting.php @@ -0,0 +1,9 @@ + + + + @@ -740,54 +743,24 @@ - + - - - + + + + + + - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1121,4 +1094,37 @@
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
\ No newline at end of file diff --git a/reset_install.sh b/reset_install.sh index 2b818360a..8a3fe0c75 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -5,7 +5,7 @@ echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m" echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" -php composer install --prefer-dist --no-dev +composer install --prefer-dist cd local/config/