diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php index 183f59947..df3de2bc3 100644 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -152,7 +152,7 @@ abstract class Accessory implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -210,8 +210,8 @@ abstract class Accessory implements ActiveRecordInterface * obj is an instance of Accessory, delegates to * equals(Accessory). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -250,8 +250,6 @@ abstract class Accessory implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -262,6 +260,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -272,7 +271,10 @@ abstract class Accessory implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -329,7 +331,9 @@ abstract class Accessory implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -424,7 +428,7 @@ abstract class Accessory implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -444,7 +448,7 @@ abstract class Accessory implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1061,8 +1065,7 @@ abstract class Accessory implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php index 2dc666a08..47bcd35a3 100644 --- a/core/lib/Thelia/Model/Base/Address.php +++ b/core/lib/Thelia/Model/Base/Address.php @@ -274,7 +274,7 @@ abstract class Address implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -332,8 +332,8 @@ abstract class Address implements ActiveRecordInterface * obj is an instance of Address, delegates to * equals(Address). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -372,8 +372,6 @@ abstract class Address implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -384,6 +382,7 @@ abstract class Address implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -394,7 +393,10 @@ abstract class Address implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -451,7 +453,9 @@ abstract class Address implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -678,7 +682,7 @@ abstract class Address implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -698,7 +702,7 @@ abstract class Address implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1782,8 +1786,7 @@ abstract class Address implements ActiveRecordInterface $keys[17] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php index edcdb27e8..bb26ed270 100644 --- a/core/lib/Thelia/Model/Base/Admin.php +++ b/core/lib/Thelia/Model/Base/Admin.php @@ -198,7 +198,7 @@ abstract class Admin implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -256,8 +256,8 @@ abstract class Admin implements ActiveRecordInterface * obj is an instance of Admin, delegates to * equals(Admin). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -296,8 +296,6 @@ abstract class Admin implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -308,6 +306,7 @@ abstract class Admin implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -318,7 +317,10 @@ abstract class Admin implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -375,7 +377,9 @@ abstract class Admin implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -525,7 +529,7 @@ abstract class Admin implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -545,7 +549,7 @@ abstract class Admin implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1344,8 +1348,7 @@ abstract class Admin implements ActiveRecordInterface $keys[10] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AdminGroup.php b/core/lib/Thelia/Model/Base/AdminGroup.php index 9eadbb107..663e437a4 100644 --- a/core/lib/Thelia/Model/Base/AdminGroup.php +++ b/core/lib/Thelia/Model/Base/AdminGroup.php @@ -148,7 +148,7 @@ abstract class AdminGroup implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -206,8 +206,8 @@ abstract class AdminGroup implements ActiveRecordInterface * obj is an instance of AdminGroup, delegates to * equals(AdminGroup). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -246,8 +246,6 @@ abstract class AdminGroup implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -258,6 +256,7 @@ abstract class AdminGroup implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -268,7 +267,10 @@ abstract class AdminGroup implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -325,7 +327,9 @@ abstract class AdminGroup implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -409,7 +413,7 @@ abstract class AdminGroup implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -429,7 +433,7 @@ abstract class AdminGroup implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1012,8 +1016,7 @@ abstract class AdminGroup implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php index ae828e4bb..dfce950eb 100644 --- a/core/lib/Thelia/Model/Base/AdminLog.php +++ b/core/lib/Thelia/Model/Base/AdminLog.php @@ -152,7 +152,7 @@ abstract class AdminLog implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -210,8 +210,8 @@ abstract class AdminLog implements ActiveRecordInterface * obj is an instance of AdminLog, delegates to * equals(AdminLog). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -250,8 +250,6 @@ abstract class AdminLog implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -262,6 +260,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -272,7 +271,10 @@ abstract class AdminLog implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -329,7 +331,9 @@ abstract class AdminLog implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -446,7 +450,7 @@ abstract class AdminLog implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -466,7 +470,7 @@ abstract class AdminLog implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1115,8 +1119,7 @@ abstract class AdminLog implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php index f561ba330..14d834929 100644 --- a/core/lib/Thelia/Model/Base/Area.php +++ b/core/lib/Thelia/Model/Base/Area.php @@ -163,7 +163,7 @@ abstract class Area implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -221,8 +221,8 @@ abstract class Area implements ActiveRecordInterface * obj is an instance of Area, delegates to * equals(Area). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -261,8 +261,6 @@ abstract class Area implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -273,6 +271,7 @@ abstract class Area implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -283,7 +282,10 @@ abstract class Area implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -340,7 +342,9 @@ abstract class Area implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -424,7 +428,7 @@ abstract class Area implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -444,7 +448,7 @@ abstract class Area implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1031,8 +1035,7 @@ abstract class Area implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AreaDeliveryModule.php b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php index 38a16dd5a..1e2996fb4 100644 --- a/core/lib/Thelia/Model/Base/AreaDeliveryModule.php +++ b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php @@ -148,7 +148,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -206,8 +206,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * obj is an instance of AreaDeliveryModule, delegates to * equals(AreaDeliveryModule). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -246,8 +246,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -258,6 +256,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -268,7 +267,10 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -325,7 +327,9 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -409,7 +413,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -429,7 +433,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1012,8 +1016,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php index 64e765fdd..f9cee31c7 100644 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -212,7 +212,7 @@ abstract class Attribute implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -270,8 +270,8 @@ abstract class Attribute implements ActiveRecordInterface * obj is an instance of Attribute, delegates to * equals(Attribute). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -310,8 +310,6 @@ abstract class Attribute implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -322,6 +320,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -332,7 +331,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -389,7 +391,9 @@ abstract class Attribute implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -462,7 +466,7 @@ abstract class Attribute implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -482,7 +486,7 @@ abstract class Attribute implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1100,8 +1104,7 @@ abstract class Attribute implements ActiveRecordInterface $keys[3] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php index b94288753..83b55fab8 100644 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -184,7 +184,7 @@ abstract class AttributeAv implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -242,8 +242,8 @@ abstract class AttributeAv implements ActiveRecordInterface * obj is an instance of AttributeAv, delegates to * equals(AttributeAv). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -282,8 +282,6 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -294,6 +292,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -304,7 +303,10 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -361,7 +363,9 @@ abstract class AttributeAv implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -445,7 +449,7 @@ abstract class AttributeAv implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -465,7 +469,7 @@ abstract class AttributeAv implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1071,8 +1075,7 @@ abstract class AttributeAv implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php index ec6f8811f..dd2a973b7 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -158,7 +158,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * obj is an instance of AttributeAvI18n, delegates to * equals(AttributeAvI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php index ef840a5a1..543e86476 100644 --- a/core/lib/Thelia/Model/Base/AttributeCombination.php +++ b/core/lib/Thelia/Model/Base/AttributeCombination.php @@ -155,7 +155,7 @@ abstract class AttributeCombination implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -213,8 +213,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * obj is an instance of AttributeCombination, delegates to * equals(AttributeCombination). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -253,8 +253,6 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -265,6 +263,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -275,7 +274,10 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -332,7 +334,9 @@ abstract class AttributeCombination implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -416,7 +420,7 @@ abstract class AttributeCombination implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -436,7 +440,7 @@ abstract class AttributeCombination implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1023,8 +1027,7 @@ abstract class AttributeCombination implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php index d75c24412..30bd331a3 100644 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -158,7 +158,7 @@ abstract class AttributeI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * obj is an instance of AttributeI18n, delegates to * equals(AttributeI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class AttributeI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class AttributeI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/AttributeTemplate.php b/core/lib/Thelia/Model/Base/AttributeTemplate.php index 85d432a62..ae45495ee 100644 --- a/core/lib/Thelia/Model/Base/AttributeTemplate.php +++ b/core/lib/Thelia/Model/Base/AttributeTemplate.php @@ -154,7 +154,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -212,8 +212,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * obj is an instance of AttributeTemplate, delegates to * equals(AttributeTemplate). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -252,8 +252,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -264,6 +262,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -274,7 +273,10 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -331,7 +333,9 @@ abstract class AttributeTemplate implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -426,7 +430,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -446,7 +450,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1063,8 +1067,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php index 2ef18297c..96880be66 100644 --- a/core/lib/Thelia/Model/Base/Cart.php +++ b/core/lib/Thelia/Model/Base/Cart.php @@ -213,7 +213,7 @@ abstract class Cart implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -271,8 +271,8 @@ abstract class Cart implements ActiveRecordInterface * obj is an instance of Cart, delegates to * equals(Cart). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -311,8 +311,6 @@ abstract class Cart implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -323,6 +321,7 @@ abstract class Cart implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -333,7 +332,10 @@ abstract class Cart implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -390,7 +392,9 @@ abstract class Cart implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -518,7 +522,7 @@ abstract class Cart implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -538,7 +542,7 @@ abstract class Cart implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1310,8 +1314,7 @@ abstract class Cart implements ActiveRecordInterface $keys[8] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php index e785ae0a5..53b3ef411 100644 --- a/core/lib/Thelia/Model/Base/CartItem.php +++ b/core/lib/Thelia/Model/Base/CartItem.php @@ -213,7 +213,7 @@ abstract class CartItem implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -271,8 +271,8 @@ abstract class CartItem implements ActiveRecordInterface * obj is an instance of CartItem, delegates to * equals(CartItem). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -311,8 +311,6 @@ abstract class CartItem implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -323,6 +321,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -333,7 +332,10 @@ abstract class CartItem implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -390,7 +392,9 @@ abstract class CartItem implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -518,7 +522,7 @@ abstract class CartItem implements ActiveRecordInterface if ($format === null) { return $this->price_end_of_life; } else { - return $this->price_end_of_life !== null ? $this->price_end_of_life->format($format) : null; + return $this->price_end_of_life instanceof \DateTime ? $this->price_end_of_life->format($format) : null; } } @@ -560,7 +564,7 @@ abstract class CartItem implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -580,7 +584,7 @@ abstract class CartItem implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1427,8 +1431,7 @@ abstract class CartItem implements ActiveRecordInterface $keys[11] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 6dc9b727a..d5272d1e4 100644 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -293,7 +293,7 @@ abstract class Category implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -351,8 +351,8 @@ abstract class Category implements ActiveRecordInterface * obj is an instance of Category, delegates to * equals(Category). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -391,8 +391,6 @@ abstract class Category implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -403,6 +401,7 @@ abstract class Category implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -413,7 +412,10 @@ abstract class Category implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -470,7 +472,9 @@ abstract class Category implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -565,7 +569,7 @@ abstract class Category implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -585,7 +589,7 @@ abstract class Category implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -616,7 +620,7 @@ abstract class Category implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1472,8 +1476,7 @@ abstract class Category implements ActiveRecordInterface $keys[8] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php index 142ab543f..8079eb563 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -154,7 +154,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -212,8 +212,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * obj is an instance of CategoryAssociatedContent, delegates to * equals(CategoryAssociatedContent). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -252,8 +252,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -264,6 +262,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -274,7 +273,10 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -331,7 +333,9 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -426,7 +430,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -446,7 +450,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1063,8 +1067,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php index 7539312cc..83660e717 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -176,7 +176,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * obj is an instance of CategoryDocument, delegates to * equals(CategoryDocument). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class CategoryDocument implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class CategoryDocument implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class CategoryDocument implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class CategoryDocument implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php index 4d284b57e..c4348da52 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -158,7 +158,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * obj is an instance of CategoryDocumentI18n, delegates to * equals(CategoryDocumentI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php index 9ae8c8cf3..bd9bf2608 100644 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -158,7 +158,7 @@ abstract class CategoryI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * obj is an instance of CategoryI18n, delegates to * equals(CategoryI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class CategoryI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class CategoryI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php index 353c79c4f..2a7e826c7 100644 --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -176,7 +176,7 @@ abstract class CategoryImage implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class CategoryImage implements ActiveRecordInterface * obj is an instance of CategoryImage, delegates to * equals(CategoryImage). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class CategoryImage implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class CategoryImage implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class CategoryImage implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class CategoryImage implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php index 61b4fc413..1197930c8 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -158,7 +158,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * obj is an instance of CategoryImageI18n, delegates to * equals(CategoryImageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php index 416ad95d5..7abd40b21 100644 --- a/core/lib/Thelia/Model/Base/CategoryVersion.php +++ b/core/lib/Thelia/Model/Base/CategoryVersion.php @@ -178,7 +178,7 @@ abstract class CategoryVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -236,8 +236,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * obj is an instance of CategoryVersion, delegates to * equals(CategoryVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -276,8 +276,6 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -288,6 +286,7 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -298,7 +297,10 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -355,7 +357,9 @@ abstract class CategoryVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -450,7 +454,7 @@ abstract class CategoryVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -470,7 +474,7 @@ abstract class CategoryVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -501,7 +505,7 @@ abstract class CategoryVersion implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1201,8 +1205,7 @@ abstract class CategoryVersion implements ActiveRecordInterface $keys[8] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php index 9f2080d1f..72837ec39 100644 --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -191,7 +191,7 @@ abstract class Config implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -249,8 +249,8 @@ abstract class Config implements ActiveRecordInterface * obj is an instance of Config, delegates to * equals(Config). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -289,8 +289,6 @@ abstract class Config implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -301,6 +299,7 @@ abstract class Config implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -311,7 +310,10 @@ abstract class Config implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -368,7 +370,9 @@ abstract class Config implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -474,7 +478,7 @@ abstract class Config implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -494,7 +498,7 @@ abstract class Config implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1137,8 +1141,7 @@ abstract class Config implements ActiveRecordInterface $keys[6] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php index 71f1d5287..370860b61 100644 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -158,7 +158,7 @@ abstract class ConfigI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * obj is an instance of ConfigI18n, delegates to * equals(ConfigI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ConfigI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ConfigI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index aa53fb9b5..bb7299f17 100644 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -301,7 +301,7 @@ abstract class Content implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -359,8 +359,8 @@ abstract class Content implements ActiveRecordInterface * obj is an instance of Content, delegates to * equals(Content). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -399,8 +399,6 @@ abstract class Content implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -411,6 +409,7 @@ abstract class Content implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -421,7 +420,10 @@ abstract class Content implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -478,7 +480,9 @@ abstract class Content implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -562,7 +566,7 @@ abstract class Content implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -582,7 +586,7 @@ abstract class Content implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -613,7 +617,7 @@ abstract class Content implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1454,8 +1458,7 @@ abstract class Content implements ActiveRecordInterface $keys[7] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php index a8207bb14..f59b52af0 100644 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -176,7 +176,7 @@ abstract class ContentDocument implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class ContentDocument implements ActiveRecordInterface * obj is an instance of ContentDocument, delegates to * equals(ContentDocument). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class ContentDocument implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class ContentDocument implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class ContentDocument implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class ContentDocument implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php index 1e1f1bd52..e51c76524 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -158,7 +158,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * obj is an instance of ContentDocumentI18n, delegates to * equals(ContentDocumentI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php index 809825d51..8200b942c 100644 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -148,7 +148,7 @@ abstract class ContentFolder implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -206,8 +206,8 @@ abstract class ContentFolder implements ActiveRecordInterface * obj is an instance of ContentFolder, delegates to * equals(ContentFolder). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -246,8 +246,6 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -258,6 +256,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -268,7 +267,10 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -325,7 +327,9 @@ abstract class ContentFolder implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -409,7 +413,7 @@ abstract class ContentFolder implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -429,7 +433,7 @@ abstract class ContentFolder implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1009,8 +1013,7 @@ abstract class ContentFolder implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php index 6ffc1d4bf..e5de214c8 100644 --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -158,7 +158,7 @@ abstract class ContentI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ContentI18n implements ActiveRecordInterface * obj is an instance of ContentI18n, delegates to * equals(ContentI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ContentI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ContentI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php index 8a0a5a77c..17fa9d1f8 100644 --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -176,7 +176,7 @@ abstract class ContentImage implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class ContentImage implements ActiveRecordInterface * obj is an instance of ContentImage, delegates to * equals(ContentImage). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class ContentImage implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class ContentImage implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class ContentImage implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class ContentImage implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class ContentImage implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class ContentImage implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php index 54016f0df..dcee14315 100644 --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -158,7 +158,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * obj is an instance of ContentImageI18n, delegates to * equals(ContentImageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ContentImageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php index ef2897030..beb02456e 100644 --- a/core/lib/Thelia/Model/Base/ContentVersion.php +++ b/core/lib/Thelia/Model/Base/ContentVersion.php @@ -172,7 +172,7 @@ abstract class ContentVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -230,8 +230,8 @@ abstract class ContentVersion implements ActiveRecordInterface * obj is an instance of ContentVersion, delegates to * equals(ContentVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -270,8 +270,6 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -282,6 +280,7 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -292,7 +291,10 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -349,7 +351,9 @@ abstract class ContentVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -433,7 +437,7 @@ abstract class ContentVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -453,7 +457,7 @@ abstract class ContentVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -484,7 +488,7 @@ abstract class ContentVersion implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1150,8 +1154,7 @@ abstract class ContentVersion implements ActiveRecordInterface $keys[7] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index 86cc8220b..fd16e148d 100644 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -216,7 +216,7 @@ abstract class Country implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -274,8 +274,8 @@ abstract class Country implements ActiveRecordInterface * obj is an instance of Country, delegates to * equals(Country). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -314,8 +314,6 @@ abstract class Country implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -326,6 +324,7 @@ abstract class Country implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -336,7 +335,10 @@ abstract class Country implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -393,7 +395,9 @@ abstract class Country implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -510,7 +514,7 @@ abstract class Country implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -530,7 +534,7 @@ abstract class Country implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1246,8 +1250,7 @@ abstract class Country implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php index 3e3e314cb..2c660e200 100644 --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -158,7 +158,7 @@ abstract class CountryI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class CountryI18n implements ActiveRecordInterface * obj is an instance of CountryI18n, delegates to * equals(CountryI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class CountryI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class CountryI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 81bc23d07..012b97313 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -260,7 +260,7 @@ abstract class Coupon implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -318,8 +318,8 @@ abstract class Coupon implements ActiveRecordInterface * obj is an instance of Coupon, delegates to * equals(Coupon). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -358,8 +358,6 @@ abstract class Coupon implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -370,6 +368,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -380,7 +379,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -437,7 +439,9 @@ abstract class Coupon implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -543,7 +547,7 @@ abstract class Coupon implements ActiveRecordInterface if ($format === null) { return $this->expiration_date; } else { - return $this->expiration_date !== null ? $this->expiration_date->format($format) : null; + return $this->expiration_date instanceof \DateTime ? $this->expiration_date->format($format) : null; } } @@ -629,7 +633,7 @@ abstract class Coupon implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -649,7 +653,7 @@ abstract class Coupon implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1642,8 +1646,7 @@ abstract class Coupon implements ActiveRecordInterface $keys[14] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php index 0ea9027b6..7bb7d8314 100644 --- a/core/lib/Thelia/Model/Base/CouponI18n.php +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -152,7 +152,7 @@ abstract class CouponI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -210,8 +210,8 @@ abstract class CouponI18n implements ActiveRecordInterface * obj is an instance of CouponI18n, delegates to * equals(CouponI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -250,8 +250,6 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -262,6 +260,7 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -272,7 +271,10 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -329,7 +331,9 @@ abstract class CouponI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -959,8 +963,7 @@ abstract class CouponI18n implements ActiveRecordInterface $keys[4] => $this->getDescription(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php index b2685ea74..4488e8ec6 100644 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -141,7 +141,7 @@ abstract class CouponOrder implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -199,8 +199,8 @@ abstract class CouponOrder implements ActiveRecordInterface * obj is an instance of CouponOrder, delegates to * equals(CouponOrder). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -239,8 +239,6 @@ abstract class CouponOrder implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -251,6 +249,7 @@ abstract class CouponOrder implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -261,7 +260,10 @@ abstract class CouponOrder implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -318,7 +320,9 @@ abstract class CouponOrder implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -402,7 +406,7 @@ abstract class CouponOrder implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -422,7 +426,7 @@ abstract class CouponOrder implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -990,8 +994,7 @@ abstract class CouponOrder implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index 83e5bf6dc..67c077cfa 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -214,7 +214,7 @@ abstract class CouponVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -272,8 +272,8 @@ abstract class CouponVersion implements ActiveRecordInterface * obj is an instance of CouponVersion, delegates to * equals(CouponVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -312,8 +312,6 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -324,6 +322,7 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -334,7 +333,10 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -391,7 +393,9 @@ abstract class CouponVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -497,7 +501,7 @@ abstract class CouponVersion implements ActiveRecordInterface if ($format === null) { return $this->expiration_date; } else { - return $this->expiration_date !== null ? $this->expiration_date->format($format) : null; + return $this->expiration_date instanceof \DateTime ? $this->expiration_date->format($format) : null; } } @@ -583,7 +587,7 @@ abstract class CouponVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -603,7 +607,7 @@ abstract class CouponVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1547,8 +1551,7 @@ abstract class CouponVersion implements ActiveRecordInterface $keys[14] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php index e46176739..fea63f546 100644 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -223,7 +223,7 @@ abstract class Currency implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -281,8 +281,8 @@ abstract class Currency implements ActiveRecordInterface * obj is an instance of Currency, delegates to * equals(Currency). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -321,8 +321,6 @@ abstract class Currency implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -333,6 +331,7 @@ abstract class Currency implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -343,7 +342,10 @@ abstract class Currency implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -400,7 +402,9 @@ abstract class Currency implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -517,7 +521,7 @@ abstract class Currency implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -537,7 +541,7 @@ abstract class Currency implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1264,8 +1268,7 @@ abstract class Currency implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php index df5ff7240..c3e6af289 100644 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -140,7 +140,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -198,8 +198,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * obj is an instance of CurrencyI18n, delegates to * equals(CurrencyI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -238,8 +238,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -250,6 +248,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -260,7 +259,10 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -317,7 +319,9 @@ abstract class CurrencyI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -857,8 +861,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface $keys[2] => $this->getName(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php index e7bd688af..8ec119627 100644 --- a/core/lib/Thelia/Model/Base/Customer.php +++ b/core/lib/Thelia/Model/Base/Customer.php @@ -250,7 +250,7 @@ abstract class Customer implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -308,8 +308,8 @@ abstract class Customer implements ActiveRecordInterface * obj is an instance of Customer, delegates to * equals(Customer). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -348,8 +348,6 @@ abstract class Customer implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -360,6 +358,7 @@ abstract class Customer implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -370,7 +369,10 @@ abstract class Customer implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -427,7 +429,9 @@ abstract class Customer implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -632,7 +636,7 @@ abstract class Customer implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -652,7 +656,7 @@ abstract class Customer implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1652,8 +1656,7 @@ abstract class Customer implements ActiveRecordInterface $keys[15] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php index 6b1295d2b..978b779b1 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -205,7 +205,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -263,8 +263,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * obj is an instance of CustomerTitle, delegates to * equals(CustomerTitle). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -303,8 +303,6 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -315,6 +313,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -325,7 +324,10 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -382,7 +384,9 @@ abstract class CustomerTitle implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -466,7 +470,7 @@ abstract class CustomerTitle implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -486,7 +490,7 @@ abstract class CustomerTitle implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1095,8 +1099,7 @@ abstract class CustomerTitle implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php index b384210b1..5c173543b 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -146,7 +146,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -204,8 +204,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * obj is an instance of CustomerTitleI18n, delegates to * equals(CustomerTitleI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -244,8 +244,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -256,6 +254,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -266,7 +265,10 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -323,7 +325,9 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -908,8 +912,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $keys[3] => $this->getLong(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php index c9b6c5ed4..7d3a0e7f3 100644 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -232,7 +232,7 @@ abstract class Feature implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -290,8 +290,8 @@ abstract class Feature implements ActiveRecordInterface * obj is an instance of Feature, delegates to * equals(Feature). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -330,8 +330,6 @@ abstract class Feature implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -342,6 +340,7 @@ abstract class Feature implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -352,7 +351,10 @@ abstract class Feature implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -409,7 +411,9 @@ abstract class Feature implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -493,7 +497,7 @@ abstract class Feature implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -513,7 +517,7 @@ abstract class Feature implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1169,8 +1173,7 @@ abstract class Feature implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php index bf1bfc41e..7f5191418 100644 --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -184,7 +184,7 @@ abstract class FeatureAv implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -242,8 +242,8 @@ abstract class FeatureAv implements ActiveRecordInterface * obj is an instance of FeatureAv, delegates to * equals(FeatureAv). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -282,8 +282,6 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -294,6 +292,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -304,7 +303,10 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -361,7 +363,9 @@ abstract class FeatureAv implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -445,7 +449,7 @@ abstract class FeatureAv implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -465,7 +469,7 @@ abstract class FeatureAv implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1071,8 +1075,7 @@ abstract class FeatureAv implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php index 44e7893a2..e88356a16 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -158,7 +158,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * obj is an instance of FeatureAvI18n, delegates to * equals(FeatureAvI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php index 57c7a0b30..ed475e87f 100644 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -158,7 +158,7 @@ abstract class FeatureI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * obj is an instance of FeatureI18n, delegates to * equals(FeatureI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class FeatureI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class FeatureI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FeatureProduct.php b/core/lib/Thelia/Model/Base/FeatureProduct.php index 039967cee..f8ddbd9b7 100644 --- a/core/lib/Thelia/Model/Base/FeatureProduct.php +++ b/core/lib/Thelia/Model/Base/FeatureProduct.php @@ -173,7 +173,7 @@ abstract class FeatureProduct implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -231,8 +231,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * obj is an instance of FeatureProduct, delegates to * equals(FeatureProduct). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -271,8 +271,6 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -283,6 +281,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -293,7 +292,10 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -350,7 +352,9 @@ abstract class FeatureProduct implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -467,7 +471,7 @@ abstract class FeatureProduct implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -487,7 +491,7 @@ abstract class FeatureProduct implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1187,8 +1191,7 @@ abstract class FeatureProduct implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FeatureTemplate.php b/core/lib/Thelia/Model/Base/FeatureTemplate.php index b8ba55629..bc7b4f921 100644 --- a/core/lib/Thelia/Model/Base/FeatureTemplate.php +++ b/core/lib/Thelia/Model/Base/FeatureTemplate.php @@ -154,7 +154,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -212,8 +212,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * obj is an instance of FeatureTemplate, delegates to * equals(FeatureTemplate). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -252,8 +252,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -264,6 +262,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -274,7 +273,10 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -331,7 +333,9 @@ abstract class FeatureTemplate implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -426,7 +430,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -446,7 +450,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1063,8 +1067,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index 4457c5042..e62e9b71e 100644 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -279,7 +279,7 @@ abstract class Folder implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -337,8 +337,8 @@ abstract class Folder implements ActiveRecordInterface * obj is an instance of Folder, delegates to * equals(Folder). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -377,8 +377,6 @@ abstract class Folder implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -389,6 +387,7 @@ abstract class Folder implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -399,7 +398,10 @@ abstract class Folder implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -456,7 +458,9 @@ abstract class Folder implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -551,7 +555,7 @@ abstract class Folder implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -571,7 +575,7 @@ abstract class Folder implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -602,7 +606,7 @@ abstract class Folder implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1439,8 +1443,7 @@ abstract class Folder implements ActiveRecordInterface $keys[8] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php index 8e24ee9d4..ea1a35d74 100644 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -176,7 +176,7 @@ abstract class FolderDocument implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class FolderDocument implements ActiveRecordInterface * obj is an instance of FolderDocument, delegates to * equals(FolderDocument). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class FolderDocument implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class FolderDocument implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class FolderDocument implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class FolderDocument implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php index b68c8ce9d..600890a03 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -158,7 +158,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * obj is an instance of FolderDocumentI18n, delegates to * equals(FolderDocumentI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php index 976c6b041..8e972b307 100644 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -158,7 +158,7 @@ abstract class FolderI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class FolderI18n implements ActiveRecordInterface * obj is an instance of FolderI18n, delegates to * equals(FolderI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class FolderI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class FolderI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php index 525dc9d48..2440c7232 100644 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -176,7 +176,7 @@ abstract class FolderImage implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class FolderImage implements ActiveRecordInterface * obj is an instance of FolderImage, delegates to * equals(FolderImage). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class FolderImage implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class FolderImage implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class FolderImage implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class FolderImage implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class FolderImage implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class FolderImage implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php index 6ac9575e1..e080b4b5c 100644 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -158,7 +158,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * obj is an instance of FolderImageI18n, delegates to * equals(FolderImageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class FolderImageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php index ec588dcbd..657bdeb44 100644 --- a/core/lib/Thelia/Model/Base/FolderVersion.php +++ b/core/lib/Thelia/Model/Base/FolderVersion.php @@ -178,7 +178,7 @@ abstract class FolderVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -236,8 +236,8 @@ abstract class FolderVersion implements ActiveRecordInterface * obj is an instance of FolderVersion, delegates to * equals(FolderVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -276,8 +276,6 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -288,6 +286,7 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -298,7 +297,10 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -355,7 +357,9 @@ abstract class FolderVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -450,7 +454,7 @@ abstract class FolderVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -470,7 +474,7 @@ abstract class FolderVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -501,7 +505,7 @@ abstract class FolderVersion implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1201,8 +1205,7 @@ abstract class FolderVersion implements ActiveRecordInterface $keys[8] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php index 19d41e38c..751111952 100644 --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -225,7 +225,7 @@ abstract class Group implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -283,8 +283,8 @@ abstract class Group implements ActiveRecordInterface * obj is an instance of Group, delegates to * equals(Group). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -323,8 +323,6 @@ abstract class Group implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -335,6 +333,7 @@ abstract class Group implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -345,7 +344,10 @@ abstract class Group implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -402,7 +404,9 @@ abstract class Group implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -475,7 +479,7 @@ abstract class Group implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -495,7 +499,7 @@ abstract class Group implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1141,8 +1145,7 @@ abstract class Group implements ActiveRecordInterface $keys[3] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php index df8f3f81a..07274e969 100644 --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -158,7 +158,7 @@ abstract class GroupI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class GroupI18n implements ActiveRecordInterface * obj is an instance of GroupI18n, delegates to * equals(GroupI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class GroupI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class GroupI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class GroupI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class GroupI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class GroupI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/GroupModule.php b/core/lib/Thelia/Model/Base/GroupModule.php index 82d6056f2..e3f9d9e15 100644 --- a/core/lib/Thelia/Model/Base/GroupModule.php +++ b/core/lib/Thelia/Model/Base/GroupModule.php @@ -168,7 +168,7 @@ abstract class GroupModule implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -226,8 +226,8 @@ abstract class GroupModule implements ActiveRecordInterface * obj is an instance of GroupModule, delegates to * equals(GroupModule). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -266,8 +266,6 @@ abstract class GroupModule implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -278,6 +276,7 @@ abstract class GroupModule implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -288,7 +287,10 @@ abstract class GroupModule implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -345,7 +347,9 @@ abstract class GroupModule implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -440,7 +444,7 @@ abstract class GroupModule implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -460,7 +464,7 @@ abstract class GroupModule implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1081,8 +1085,7 @@ abstract class GroupModule implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/GroupResource.php b/core/lib/Thelia/Model/Base/GroupResource.php index ea6c0ff47..8bfcd442f 100644 --- a/core/lib/Thelia/Model/Base/GroupResource.php +++ b/core/lib/Thelia/Model/Base/GroupResource.php @@ -176,7 +176,7 @@ abstract class GroupResource implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class GroupResource implements ActiveRecordInterface * obj is an instance of GroupResource, delegates to * equals(GroupResource). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class GroupResource implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class GroupResource implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class GroupResource implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class GroupResource implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -459,7 +463,7 @@ abstract class GroupResource implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -479,7 +483,7 @@ abstract class GroupResource implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1138,8 +1142,7 @@ abstract class GroupResource implements ActiveRecordInterface $keys[6] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php index 59836e27d..ac6f1f63c 100644 --- a/core/lib/Thelia/Model/Base/Lang.php +++ b/core/lib/Thelia/Model/Base/Lang.php @@ -209,7 +209,7 @@ abstract class Lang implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -267,8 +267,8 @@ abstract class Lang implements ActiveRecordInterface * obj is an instance of Lang, delegates to * equals(Lang). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -307,8 +307,6 @@ abstract class Lang implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -319,6 +317,7 @@ abstract class Lang implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -329,7 +328,10 @@ abstract class Lang implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -386,7 +388,9 @@ abstract class Lang implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -580,7 +584,7 @@ abstract class Lang implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -600,7 +604,7 @@ abstract class Lang implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1507,8 +1511,7 @@ abstract class Lang implements ActiveRecordInterface $keys[14] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php index 4ee6b4cab..fbea5b241 100644 --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -218,7 +218,7 @@ abstract class Message implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -276,8 +276,8 @@ abstract class Message implements ActiveRecordInterface * obj is an instance of Message, delegates to * equals(Message). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -316,8 +316,6 @@ abstract class Message implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -328,6 +326,7 @@ abstract class Message implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -338,7 +337,10 @@ abstract class Message implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -395,7 +397,9 @@ abstract class Message implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -479,7 +483,7 @@ abstract class Message implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -499,7 +503,7 @@ abstract class Message implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -530,7 +534,7 @@ abstract class Message implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1248,8 +1252,7 @@ abstract class Message implements ActiveRecordInterface $keys[7] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php index d37682f97..42923cb69 100644 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -158,7 +158,7 @@ abstract class MessageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class MessageI18n implements ActiveRecordInterface * obj is an instance of MessageI18n, delegates to * equals(MessageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class MessageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class MessageI18n implements ActiveRecordInterface $keys[5] => $this->getHtmlMessage(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php index 60e12da8d..0c58a5bb2 100644 --- a/core/lib/Thelia/Model/Base/MessageVersion.php +++ b/core/lib/Thelia/Model/Base/MessageVersion.php @@ -172,7 +172,7 @@ abstract class MessageVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -230,8 +230,8 @@ abstract class MessageVersion implements ActiveRecordInterface * obj is an instance of MessageVersion, delegates to * equals(MessageVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -270,8 +270,6 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -282,6 +280,7 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -292,7 +291,10 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -349,7 +351,9 @@ abstract class MessageVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -433,7 +437,7 @@ abstract class MessageVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -453,7 +457,7 @@ abstract class MessageVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -484,7 +488,7 @@ abstract class MessageVersion implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1150,8 +1154,7 @@ abstract class MessageVersion implements ActiveRecordInterface $keys[7] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index 88080dbe2..09858a877 100644 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -249,7 +249,7 @@ abstract class Module implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -307,8 +307,8 @@ abstract class Module implements ActiveRecordInterface * obj is an instance of Module, delegates to * equals(Module). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -347,8 +347,6 @@ abstract class Module implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -359,6 +357,7 @@ abstract class Module implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -369,7 +368,10 @@ abstract class Module implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -426,7 +428,9 @@ abstract class Module implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -543,7 +547,7 @@ abstract class Module implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -563,7 +567,7 @@ abstract class Module implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1327,8 +1331,7 @@ abstract class Module implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php index 9c7d603d1..359fb530e 100644 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -158,7 +158,7 @@ abstract class ModuleI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * obj is an instance of ModuleI18n, delegates to * equals(ModuleI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ModuleI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ModuleI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ModuleImage.php b/core/lib/Thelia/Model/Base/ModuleImage.php index f488e289c..4185d26c9 100644 --- a/core/lib/Thelia/Model/Base/ModuleImage.php +++ b/core/lib/Thelia/Model/Base/ModuleImage.php @@ -176,7 +176,7 @@ abstract class ModuleImage implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class ModuleImage implements ActiveRecordInterface * obj is an instance of ModuleImage, delegates to * equals(ModuleImage). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class ModuleImage implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class ModuleImage implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class ModuleImage implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class ModuleImage implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ModuleImageI18n.php b/core/lib/Thelia/Model/Base/ModuleImageI18n.php index 2425b4e65..92a19a601 100644 --- a/core/lib/Thelia/Model/Base/ModuleImageI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleImageI18n.php @@ -158,7 +158,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * obj is an instance of ModuleImageI18n, delegates to * equals(ModuleImageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index a2cd3f829..befa2abfe 100644 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -293,7 +293,7 @@ abstract class Order implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -351,8 +351,8 @@ abstract class Order implements ActiveRecordInterface * obj is an instance of Order, delegates to * equals(Order). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -391,8 +391,6 @@ abstract class Order implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -403,6 +401,7 @@ abstract class Order implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -413,7 +412,10 @@ abstract class Order implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -470,7 +472,9 @@ abstract class Order implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -576,7 +580,7 @@ abstract class Order implements ActiveRecordInterface if ($format === null) { return $this->invoice_date; } else { - return $this->invoice_date !== null ? $this->invoice_date->format($format) : null; + return $this->invoice_date instanceof \DateTime ? $this->invoice_date->format($format) : null; } } @@ -706,7 +710,7 @@ abstract class Order implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -726,7 +730,7 @@ abstract class Order implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1882,8 +1886,7 @@ abstract class Order implements ActiveRecordInterface $keys[17] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php index c5502321a..d52fd9de3 100644 --- a/core/lib/Thelia/Model/Base/OrderAddress.php +++ b/core/lib/Thelia/Model/Base/OrderAddress.php @@ -215,7 +215,7 @@ abstract class OrderAddress implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -273,8 +273,8 @@ abstract class OrderAddress implements ActiveRecordInterface * obj is an instance of OrderAddress, delegates to * equals(OrderAddress). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -313,8 +313,6 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -325,6 +323,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -335,7 +334,10 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -392,7 +394,9 @@ abstract class OrderAddress implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -575,7 +579,7 @@ abstract class OrderAddress implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -595,7 +599,7 @@ abstract class OrderAddress implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1487,8 +1491,7 @@ abstract class OrderAddress implements ActiveRecordInterface $keys[13] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php index 6ff03d427..69e927214 100644 --- a/core/lib/Thelia/Model/Base/OrderProduct.php +++ b/core/lib/Thelia/Model/Base/OrderProduct.php @@ -254,7 +254,7 @@ abstract class OrderProduct implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -312,8 +312,8 @@ abstract class OrderProduct implements ActiveRecordInterface * obj is an instance of OrderProduct, delegates to * equals(OrderProduct). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -352,8 +352,6 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -364,6 +362,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -374,7 +373,10 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -431,7 +433,9 @@ abstract class OrderProduct implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -669,7 +673,7 @@ abstract class OrderProduct implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -689,7 +693,7 @@ abstract class OrderProduct implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1771,8 +1775,7 @@ abstract class OrderProduct implements ActiveRecordInterface $keys[18] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php index 971f127b6..bcdcada7a 100644 --- a/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php +++ b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php @@ -183,7 +183,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -241,8 +241,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * obj is an instance of OrderProductAttributeCombination, delegates to * equals(OrderProductAttributeCombination). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -281,8 +281,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -293,6 +291,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -303,7 +302,10 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -360,7 +362,9 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -521,7 +525,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -541,7 +545,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1347,8 +1351,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $keys[11] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderProductTax.php b/core/lib/Thelia/Model/Base/OrderProductTax.php index 6d0807ccf..91d3492e1 100644 --- a/core/lib/Thelia/Model/Base/OrderProductTax.php +++ b/core/lib/Thelia/Model/Base/OrderProductTax.php @@ -159,7 +159,7 @@ abstract class OrderProductTax implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -217,8 +217,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * obj is an instance of OrderProductTax, delegates to * equals(OrderProductTax). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -257,8 +257,6 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -269,6 +267,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -279,7 +278,10 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -336,7 +338,9 @@ abstract class OrderProductTax implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -453,7 +457,7 @@ abstract class OrderProductTax implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -473,7 +477,7 @@ abstract class OrderProductTax implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1143,8 +1147,7 @@ abstract class OrderProductTax implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php index 5771072f2..4a5e49436 100644 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -171,7 +171,7 @@ abstract class OrderStatus implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -229,8 +229,8 @@ abstract class OrderStatus implements ActiveRecordInterface * obj is an instance of OrderStatus, delegates to * equals(OrderStatus). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -269,8 +269,6 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -281,6 +279,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -291,7 +290,10 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -348,7 +350,9 @@ abstract class OrderStatus implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -421,7 +425,7 @@ abstract class OrderStatus implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -441,7 +445,7 @@ abstract class OrderStatus implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -993,8 +997,7 @@ abstract class OrderStatus implements ActiveRecordInterface $keys[3] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php index 2946cc55b..d9f7f3b52 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -158,7 +158,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * obj is an instance of OrderStatusI18n, delegates to * equals(OrderStatusI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index 9ec203fec..77824575c 100644 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -411,7 +411,7 @@ abstract class Product implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -469,8 +469,8 @@ abstract class Product implements ActiveRecordInterface * obj is an instance of Product, delegates to * equals(Product). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -509,8 +509,6 @@ abstract class Product implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -521,6 +519,7 @@ abstract class Product implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -531,7 +530,10 @@ abstract class Product implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -588,7 +590,9 @@ abstract class Product implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -705,7 +709,7 @@ abstract class Product implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -725,7 +729,7 @@ abstract class Product implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -756,7 +760,7 @@ abstract class Product implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1870,8 +1874,7 @@ abstract class Product implements ActiveRecordInterface $keys[10] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php index bbc97d5d1..764a7370c 100644 --- a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php @@ -154,7 +154,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -212,8 +212,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * obj is an instance of ProductAssociatedContent, delegates to * equals(ProductAssociatedContent). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -252,8 +252,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -264,6 +262,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -274,7 +273,10 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -331,7 +333,9 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -426,7 +430,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -446,7 +450,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1063,8 +1067,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php index 2c6db3184..2e00db24a 100644 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -148,7 +148,7 @@ abstract class ProductCategory implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -206,8 +206,8 @@ abstract class ProductCategory implements ActiveRecordInterface * obj is an instance of ProductCategory, delegates to * equals(ProductCategory). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -246,8 +246,6 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -258,6 +256,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -268,7 +267,10 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -325,7 +327,9 @@ abstract class ProductCategory implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -409,7 +413,7 @@ abstract class ProductCategory implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -429,7 +433,7 @@ abstract class ProductCategory implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1009,8 +1013,7 @@ abstract class ProductCategory implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php index 4223679c1..507539f45 100644 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -176,7 +176,7 @@ abstract class ProductDocument implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class ProductDocument implements ActiveRecordInterface * obj is an instance of ProductDocument, delegates to * equals(ProductDocument). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class ProductDocument implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class ProductDocument implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class ProductDocument implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class ProductDocument implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php index 1a6017966..2dff23586 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -158,7 +158,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * obj is an instance of ProductDocumentI18n, delegates to * equals(ProductDocumentI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php index 3ef14e787..cdab7349d 100644 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -158,7 +158,7 @@ abstract class ProductI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ProductI18n implements ActiveRecordInterface * obj is an instance of ProductI18n, delegates to * equals(ProductI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ProductI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ProductI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php index a54d22cd0..873aa0ec7 100644 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -176,7 +176,7 @@ abstract class ProductImage implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -234,8 +234,8 @@ abstract class ProductImage implements ActiveRecordInterface * obj is an instance of ProductImage, delegates to * equals(ProductImage). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -274,8 +274,6 @@ abstract class ProductImage implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -286,6 +284,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -296,7 +295,10 @@ abstract class ProductImage implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -353,7 +355,9 @@ abstract class ProductImage implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -448,7 +452,7 @@ abstract class ProductImage implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -468,7 +472,7 @@ abstract class ProductImage implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1089,8 +1093,7 @@ abstract class ProductImage implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php index 679ded79c..76f9b38a9 100644 --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -158,7 +158,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * obj is an instance of ProductImageI18n, delegates to * equals(ProductImageI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ProductImageI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php index e92ca2cfa..dc177ad1b 100644 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -154,7 +154,7 @@ abstract class ProductPrice implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -212,8 +212,8 @@ abstract class ProductPrice implements ActiveRecordInterface * obj is an instance of ProductPrice, delegates to * equals(ProductPrice). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -252,8 +252,6 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -264,6 +262,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -274,7 +273,10 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -331,7 +333,9 @@ abstract class ProductPrice implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -426,7 +430,7 @@ abstract class ProductPrice implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -446,7 +450,7 @@ abstract class ProductPrice implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1052,8 +1056,7 @@ abstract class ProductPrice implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php index eb6aa2b1a..e54b13155 100644 --- a/core/lib/Thelia/Model/Base/ProductSaleElements.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php @@ -234,7 +234,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -292,8 +292,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * obj is an instance of ProductSaleElements, delegates to * equals(ProductSaleElements). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -332,8 +332,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -344,6 +342,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -354,7 +353,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -411,7 +413,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -550,7 +554,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -570,7 +574,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1389,8 +1393,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface $keys[9] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php index a5d22e498..f4327e4f1 100644 --- a/core/lib/Thelia/Model/Base/ProductVersion.php +++ b/core/lib/Thelia/Model/Base/ProductVersion.php @@ -192,7 +192,7 @@ abstract class ProductVersion implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -250,8 +250,8 @@ abstract class ProductVersion implements ActiveRecordInterface * obj is an instance of ProductVersion, delegates to * equals(ProductVersion). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -290,8 +290,6 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -302,6 +300,7 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -312,7 +311,10 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -369,7 +371,9 @@ abstract class ProductVersion implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -486,7 +490,7 @@ abstract class ProductVersion implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -506,7 +510,7 @@ abstract class ProductVersion implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -537,7 +541,7 @@ abstract class ProductVersion implements ActiveRecordInterface if ($format === null) { return $this->version_created_at; } else { - return $this->version_created_at !== null ? $this->version_created_at->format($format) : null; + return $this->version_created_at instanceof \DateTime ? $this->version_created_at->format($format) : null; } } @@ -1309,8 +1313,7 @@ abstract class ProductVersion implements ActiveRecordInterface $keys[10] => $this->getVersionCreatedBy(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php index 5a51bdc29..59bb2766a 100644 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -184,7 +184,7 @@ abstract class Resource implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -242,8 +242,8 @@ abstract class Resource implements ActiveRecordInterface * obj is an instance of Resource, delegates to * equals(Resource). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -282,8 +282,6 @@ abstract class Resource implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -294,6 +292,7 @@ abstract class Resource implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -304,7 +303,10 @@ abstract class Resource implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -361,7 +363,9 @@ abstract class Resource implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -434,7 +438,7 @@ abstract class Resource implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -454,7 +458,7 @@ abstract class Resource implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1034,8 +1038,7 @@ abstract class Resource implements ActiveRecordInterface $keys[3] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php index ac9ca106f..bd1104a90 100644 --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -158,7 +158,7 @@ abstract class ResourceI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -216,8 +216,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * obj is an instance of ResourceI18n, delegates to * equals(ResourceI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -256,8 +256,6 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -268,6 +266,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -278,7 +277,10 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -335,7 +337,9 @@ abstract class ResourceI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -1010,8 +1014,7 @@ abstract class ResourceI18n implements ActiveRecordInterface $keys[5] => $this->getPostscriptum(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/RewritingArgument.php b/core/lib/Thelia/Model/Base/RewritingArgument.php index 45f26c24f..e34778574 100644 --- a/core/lib/Thelia/Model/Base/RewritingArgument.php +++ b/core/lib/Thelia/Model/Base/RewritingArgument.php @@ -141,7 +141,7 @@ abstract class RewritingArgument implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -199,8 +199,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * obj is an instance of RewritingArgument, delegates to * equals(RewritingArgument). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -239,8 +239,6 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -251,6 +249,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -261,7 +260,10 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -318,7 +320,9 @@ abstract class RewritingArgument implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -402,7 +406,7 @@ abstract class RewritingArgument implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -422,7 +426,7 @@ abstract class RewritingArgument implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -979,8 +983,7 @@ abstract class RewritingArgument implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index 75ee97e79..06fa093b2 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -184,7 +184,7 @@ abstract class RewritingUrl implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -242,8 +242,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * obj is an instance of RewritingUrl, delegates to * equals(RewritingUrl). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -282,8 +282,6 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -294,6 +292,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -304,7 +303,10 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -361,7 +363,9 @@ abstract class RewritingUrl implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -478,7 +482,7 @@ abstract class RewritingUrl implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -498,7 +502,7 @@ abstract class RewritingUrl implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1207,8 +1211,7 @@ abstract class RewritingUrl implements ActiveRecordInterface $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index da674b5cf..2ca5a8735 100644 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -177,7 +177,7 @@ abstract class Tax implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -235,8 +235,8 @@ abstract class Tax implements ActiveRecordInterface * obj is an instance of Tax, delegates to * equals(Tax). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -275,8 +275,6 @@ abstract class Tax implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -287,6 +285,7 @@ abstract class Tax implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -297,7 +296,10 @@ abstract class Tax implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -354,7 +356,9 @@ abstract class Tax implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -438,7 +442,7 @@ abstract class Tax implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -458,7 +462,7 @@ abstract class Tax implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1044,8 +1048,7 @@ abstract class Tax implements ActiveRecordInterface $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php index abb659135..cedf8b348 100644 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -146,7 +146,7 @@ abstract class TaxI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -204,8 +204,8 @@ abstract class TaxI18n implements ActiveRecordInterface * obj is an instance of TaxI18n, delegates to * equals(TaxI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -244,8 +244,6 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -256,6 +254,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -266,7 +265,10 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -323,7 +325,9 @@ abstract class TaxI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -908,8 +912,7 @@ abstract class TaxI18n implements ActiveRecordInterface $keys[3] => $this->getDescription(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index b361567d8..7accb0df8 100644 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -199,7 +199,7 @@ abstract class TaxRule implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -257,8 +257,8 @@ abstract class TaxRule implements ActiveRecordInterface * obj is an instance of TaxRule, delegates to * equals(TaxRule). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -297,8 +297,6 @@ abstract class TaxRule implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -309,6 +307,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -319,7 +318,10 @@ abstract class TaxRule implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -376,7 +378,9 @@ abstract class TaxRule implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -449,7 +453,7 @@ abstract class TaxRule implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -469,7 +473,7 @@ abstract class TaxRule implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1053,8 +1057,7 @@ abstract class TaxRule implements ActiveRecordInterface $keys[3] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php index 0cc3e74eb..de527540c 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -161,7 +161,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -219,8 +219,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * obj is an instance of TaxRuleCountry, delegates to * equals(TaxRuleCountry). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -259,8 +259,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -271,6 +269,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -281,7 +280,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -338,7 +340,9 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -433,7 +437,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -453,7 +457,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1074,8 +1078,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index 711dba307..535195fb7 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -146,7 +146,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -204,8 +204,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * obj is an instance of TaxRuleI18n, delegates to * equals(TaxRuleI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -244,8 +244,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -256,6 +254,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -266,7 +265,10 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -323,7 +325,9 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -908,8 +912,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $keys[3] => $this->getDescription(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/Template.php b/core/lib/Thelia/Model/Base/Template.php index 08bb0f3a0..fdb767c96 100644 --- a/core/lib/Thelia/Model/Base/Template.php +++ b/core/lib/Thelia/Model/Base/Template.php @@ -219,7 +219,7 @@ abstract class Template implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -277,8 +277,8 @@ abstract class Template implements ActiveRecordInterface * obj is an instance of Template, delegates to * equals(Template). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -317,8 +317,6 @@ abstract class Template implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -329,6 +327,7 @@ abstract class Template implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -339,7 +338,10 @@ abstract class Template implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -396,7 +398,9 @@ abstract class Template implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -458,7 +462,7 @@ abstract class Template implements ActiveRecordInterface if ($format === null) { return $this->created_at; } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; + return $this->created_at instanceof \DateTime ? $this->created_at->format($format) : null; } } @@ -478,7 +482,7 @@ abstract class Template implements ActiveRecordInterface if ($format === null) { return $this->updated_at; } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; + return $this->updated_at instanceof \DateTime ? $this->updated_at->format($format) : null; } } @@ -1091,8 +1095,7 @@ abstract class Template implements ActiveRecordInterface $keys[2] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Model/Base/TemplateI18n.php b/core/lib/Thelia/Model/Base/TemplateI18n.php index 7c61c6983..67ec21bc5 100644 --- a/core/lib/Thelia/Model/Base/TemplateI18n.php +++ b/core/lib/Thelia/Model/Base/TemplateI18n.php @@ -140,7 +140,7 @@ abstract class TemplateI18n implements ActiveRecordInterface * be false, if the object was retrieved from storage or was created * and then saved. * - * @return true, if the object has never been persisted. + * @return boolean true, if the object has never been persisted. */ public function isNew() { @@ -198,8 +198,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * obj is an instance of TemplateI18n, delegates to * equals(TemplateI18n). Otherwise, returns false. * - * @param obj The object to compare to. - * @return Whether equal to the object specified. + * @param mixed $obj The object to compare to. + * @return boolean Whether equal to the object specified. */ public function equals($obj) { @@ -238,8 +238,6 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Get the associative array of the virtual columns in this object * - * @param string $name The virtual column name - * * @return array */ public function getVirtualColumns() @@ -250,6 +248,7 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Checks the existence of a virtual column in this object * + * @param string $name The virtual column name * @return boolean */ public function hasVirtualColumn($name) @@ -260,7 +259,10 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Get the value of a virtual column in this object * + * @param string $name The virtual column name * @return mixed + * + * @throws PropelException */ public function getVirtualColumn($name) { @@ -317,7 +319,9 @@ abstract class TemplateI18n implements ActiveRecordInterface $parser = AbstractParser::getParser($parser); } - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + + return $this; } /** @@ -857,8 +861,7 @@ abstract class TemplateI18n implements ActiveRecordInterface $keys[2] => $this->getName(), ); $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { + foreach ($virtualColumns as $key => $virtualColumn) { $result[$key] = $virtualColumn; } diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php index ea7a2997e..9c4198c06 100644 --- a/core/lib/Thelia/Tests/Action/AddressTest.php +++ b/core/lib/Thelia/Tests/Action/AddressTest.php @@ -22,9 +22,11 @@ /*************************************************************************************/ namespace Thelia\Tests\Action; + use Thelia\Action\Address; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Model\Base\CustomerQuery; +use Thelia\Tests\Action\BaseAction; /** * @@ -34,20 +36,9 @@ use Thelia\Model\Base\CustomerQuery; * @package Thelia\Tests\Action * @author Manuel Raynaud */ -class AddressTest extends \PHPUnit_Framework_TestCase +class AddressTest extends BaseAction { - public function getContainer() - { - $container = new \Symfony\Component\DependencyInjection\ContainerBuilder(); - - $dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"); - - $container->set("event_dispatcher", $dispatcher); - - return $container; - } - public function testCreatedAddress() { $customer = CustomerQuery::create()->findOne(); diff --git a/core/lib/Thelia/Tests/Action/BaseAction.php b/core/lib/Thelia/Tests/Action/BaseAction.php new file mode 100644 index 000000000..f0027fd21 --- /dev/null +++ b/core/lib/Thelia/Tests/Action/BaseAction.php @@ -0,0 +1,44 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Tests\Action; + + +/** + * Class BaseAction + * @package Thelia\Tests\Action\ImageTest + * @author Manuel Raynaud + */ +class BaseAction extends \PHPUnit_Framework_TestCase +{ + public function getContainer() + { + $container = new \Symfony\Component\DependencyInjection\ContainerBuilder(); + + $dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"); + + $container->set("event_dispatcher", $dispatcher); + + return $container; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Action/DocumentTest.php b/core/lib/Thelia/Tests/Action/DocumentTest.php index 41ed063e1..17a841d94 100644 --- a/core/lib/Thelia/Tests/Action/DocumentTest.php +++ b/core/lib/Thelia/Tests/Action/DocumentTest.php @@ -21,7 +21,7 @@ /* */ /*************************************************************************************/ -namespace Thelia\Tests\Action\DocumentTest; +namespace Thelia\Tests\Action; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Thelia\Core\HttpFoundation\Request; diff --git a/core/lib/Thelia/Tests/Action/FolderTest.php b/core/lib/Thelia/Tests/Action/FolderTest.php new file mode 100644 index 000000000..cb925f148 --- /dev/null +++ b/core/lib/Thelia/Tests/Action/FolderTest.php @@ -0,0 +1,94 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Tests\Action; +use Thelia\Action\Folder; +use Thelia\Core\Event\Folder\FolderCreateEvent; +use Thelia\Core\Event\Folder\FolderUpdateEvent; +use Thelia\Model\FolderQuery; + + +/** + * Class FolderTest + * @package Thelia\Tests\Action\ImageTest + * @author Manuel Raynaud + */ +class FolderTest extends BaseAction +{ + public function testCreateFolder() + { + + $event = new FolderCreateEvent(); + $event + ->setParent(0) + ->setVisible(1) + ->setLocale('en_US') + ->setTitle('folder creation test'); + + $folderAction = new Folder($this->getContainer()); + + $folderAction->create($event); + + $folder = $event->getFolder(); + + $this->assertInstanceOf('Thelia\Model\Folder', $folder); + $this->assertEquals('folder creation test', $folder->getTitle()); + $this->assertEquals(1, $folder->getVisible()); + $this->assertEquals(0, $folder->getParent()); + } + + public function testUpdateFolder() + { + $folder = FolderQuery::create()->findOne(); + + if(null === $folder) { + $this->fail('use fixtures before launching test, there is no folder in database'); + } + + $visible = !$folder->getVisible(); + $event = new FolderUpdateEvent($folder->getId()); + + $event + ->setLocale('en_US') + ->setTitle('test update folder') + ->setVisible($visible) + ->setChapo('test folder update chapo') + ->setDescription('update folder description') + ->setPostscriptum('update folder postscriptum') + ->setParent(0) + ; + + $folderAction = new Folder($this->getContainer()); + $folderAction->update($event); + + $updatedFolder = $event->getFolder(); + + $this->assertInstanceOf('Thelia\Model\Folder', $updatedFolder); + $this->assertEquals('test update folder', $updatedFolder->getTitle()); + $this->assertEquals('test folder update chapo', $updatedFolder->getChapo()); + $this->assertEquals('update folder description', $updatedFolder->getDescription()); + $this->assertEquals('update folder postscriptum', $updatedFolder->getPostscriptum()); + $this->assertEquals(0, $updatedFolder->getParent()); + $this->assertEquals($visible, $updatedFolder->getVisible()); + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Action/ImageTest.php b/core/lib/Thelia/Tests/Action/ImageTest.php index bbd596f1d..1b718f096 100755 --- a/core/lib/Thelia/Tests/Action/ImageTest.php +++ b/core/lib/Thelia/Tests/Action/ImageTest.php @@ -21,7 +21,7 @@ /* */ /*************************************************************************************/ -namespace Thelia\Tests\Action\ImageTest; +namespace Thelia\Tests\Action; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Thelia\Core\HttpFoundation\Request;