From a5cfcf91ca27e36ae90e7e4b8f17a8df86508e13 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 22 Feb 2014 19:01:37 +0100 Subject: [PATCH] update changelog and fix cs --- CHANGELOG.md | 7 + core/lib/Thelia/Action/BaseAction.php | 5 +- core/lib/Thelia/Action/Cart.php | 1 - core/lib/Thelia/Action/Coupon.php | 2 - core/lib/Thelia/Action/Module.php | 6 +- core/lib/Thelia/Action/Order.php | 8 +- core/lib/Thelia/Cart/CartTrait.php | 2 +- core/lib/Thelia/Command/CacheClear.php | 1 - core/lib/Thelia/Command/ClearImageCache.php | 2 - core/lib/Thelia/Command/CreateAdminUser.php | 1 - core/lib/Thelia/Command/GenerateResources.php | 1 - .../Controller/Admin/BaseAdminController.php | 4 +- .../Controller/Admin/CategoryController.php | 1 - .../Controller/Admin/CouponController.php | 1 - .../Controller/Admin/CustomerController.php | 1 - .../Controller/Admin/FileController.php | 2 - .../Controller/Admin/OrderController.php | 2 - .../Controller/Admin/SessionController.php | 5 +- .../Controller/Admin/TaxRuleController.php | 4 +- core/lib/Thelia/Controller/BaseController.php | 4 +- core/lib/Thelia/Core/Event/AccessoryEvent.php | 1 - .../Administrator/AdministratorEvent.php | 3 +- .../Attribute/AttributeAvCreateEvent.php | 2 - .../Attribute/AttributeAvDeleteEvent.php | 2 - .../Attribute/AttributeAvUpdateEvent.php | 2 - .../Event/Attribute/AttributeCreateEvent.php | 2 - .../Event/Attribute/AttributeDeleteEvent.php | 2 - .../Event/Attribute/AttributeUpdateEvent.php | 2 - core/lib/Thelia/Core/Event/Cart/CartEvent.php | 8 +- .../Category/CategoryAddContentEvent.php | 1 - .../Event/Category/CategoryCreateEvent.php | 2 - .../Category/CategoryDeleteContentEvent.php | 1 - .../Event/Category/CategoryDeleteEvent.php | 2 - .../CategoryToggleVisibilityEvent.php | 2 - .../Event/Category/CategoryUpdateEvent.php | 2 - .../Core/Event/Config/ConfigCreateEvent.php | 2 - .../Core/Event/Config/ConfigDeleteEvent.php | 2 - .../Core/Event/Config/ConfigUpdateEvent.php | 2 - .../Coupon/CouponCreateOrUpdateEvent.php | 14 +- .../Event/Currency/CurrencyCreateEvent.php | 2 - .../Event/Currency/CurrencyDeleteEvent.php | 2 - .../Event/Currency/CurrencyUpdateEvent.php | 2 - .../Customer/CustomerCreateOrUpdateEvent.php | 4 +- .../Thelia/Core/Event/DefaultActionEvent.php | 2 - .../Document/DocumentCreateOrUpdateEvent.php | 2 +- .../Event/Feature/FeatureAvCreateEvent.php | 2 - .../Event/Feature/FeatureAvDeleteEvent.php | 2 - .../Event/Feature/FeatureAvUpdateEvent.php | 2 - .../Core/Event/Feature/FeatureCreateEvent.php | 2 - .../Core/Event/Feature/FeatureDeleteEvent.php | 2 - .../Core/Event/Feature/FeatureUpdateEvent.php | 2 - .../FeatureProductDeleteEvent.php | 1 - .../FeatureProductUpdateEvent.php | 1 - .../Core/Event/Folder/FolderCreateEvent.php | 1 - .../Core/Event/Folder/FolderDeleteEvent.php | 1 - .../Folder/FolderToggleVisibilityEvent.php | 1 - .../Core/Event/Folder/FolderUpdateEvent.php | 1 - .../Event/Image/ImageCreateOrUpdateEvent.php | 6 +- .../Core/Event/Image/ImageDeleteEvent.php | 2 +- .../Core/Event/Message/MessageCreateEvent.php | 2 - .../Core/Event/Message/MessageDeleteEvent.php | 2 - .../Core/Event/Message/MessageUpdateEvent.php | 1 - .../Thelia/Core/Event/Order/OrderEvent.php | 2 +- .../Core/Event/Order/OrderManualEvent.php | 13 + .../Core/Event/Order/OrderPaymentEvent.php | 6 +- .../Product/ProductToggleVisibilityEvent.php | 2 - .../Core/Event/Product/ProductUpdateEvent.php | 2 - .../Template/TemplateAddAttributeEvent.php | 1 - .../Template/TemplateAddFeatureEvent.php | 1 - .../Event/Template/TemplateCreateEvent.php | 2 - .../Template/TemplateDeleteAttributeEvent.php | 1 - .../Event/Template/TemplateDeleteEvent.php | 2 - .../Template/TemplateDeleteFeatureEvent.php | 1 - .../Event/Template/TemplateUpdateEvent.php | 2 - .../Core/EventListener/RequestListener.php | 3 +- ...AdminUsernamePasswordFormAuthenticator.php | 1 - .../Authentication/TokenAuthenticator.php | 1 - .../UsernamePasswordFormAuthenticator.php | 1 - .../UserProvider/AdminUserProvider.php | 1 - .../UserProvider/CustomerUserProvider.php | 1 - .../Core/Template/Element/BaseI18nLoop.php | 1 - .../Thelia/Core/Template/Element/BaseLoop.php | 6 +- .../Core/Template/Element/LoopResult.php | 3 +- .../Thelia/Core/Template/Loop/Accessory.php | 2 - .../Loop/Argument/ArgumentCollection.php | 2 +- .../Core/Template/Loop/AssociatedContent.php | 2 - .../Thelia/Core/Template/Loop/Category.php | 2 - .../Thelia/Core/Template/Loop/Delivery.php | 1 - core/lib/Thelia/Core/Template/Loop/Lang.php | 1 - .../Template/Smarty/AbstractSmartyPlugin.php | 2 +- .../Smarty/Assets/SmartyAssetsManager.php | 2 - .../Core/Template/Smarty/Plugins/Form.php | 3 +- .../Core/Template/Smarty/Plugins/Module.php | 2 +- .../Core/Template/Smarty/SmartyParser.php | 2 - core/lib/Thelia/Core/Thelia.php | 1 - .../Thelia/Core/TheliaContainerBuilder.php | 2 +- core/lib/Thelia/Core/TheliaHttpKernel.php | 4 +- core/lib/Thelia/Coupon/BaseFacade.php | 1 + .../lib/Thelia/Coupon/Type/CouponAbstract.php | 7 +- .../Thelia/Coupon/Type/CouponInterface.php | 6 +- core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 2 - .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 8 +- .../Thelia/Exception/CustomerException.php | 3 +- .../Thelia/Form/AdministratorCreationForm.php | 5 +- .../Thelia/Form/Area/AreaModificationForm.php | 1 - .../Thelia/Form/ContentModificationForm.php | 1 - core/lib/Thelia/Form/CustomerLogin.php | 1 - .../Form/Image/DocumentModification.php | 1 - .../Form/MailingSystemModificationForm.php | 2 - core/lib/Thelia/Form/TaxCreationForm.php | 4 +- .../Thelia/Log/AbstractTlogDestination.php | 1 - .../Log/Destination/TlogDestinationFile.php | 6 +- .../TlogDestinationRotatingFile.php | 3 +- core/lib/Thelia/Log/Tlog.php | 8 +- core/lib/Thelia/Model/Accessory.php | 7 +- core/lib/Thelia/Model/AccessoryQuery.php | 5 +- core/lib/Thelia/Model/Address.php | 9 +- core/lib/Thelia/Model/AddressQuery.php | 5 +- core/lib/Thelia/Model/Admin.php | 38 +- core/lib/Thelia/Model/AdminLog.php | 34 +- core/lib/Thelia/Model/AdminLogQuery.php | 21 +- core/lib/Thelia/Model/AdminQuery.php | 5 +- core/lib/Thelia/Model/Area.php | 4 +- .../Thelia/Model/AreaDeliveryModuleQuery.php | 1 - core/lib/Thelia/Model/AreaQuery.php | 5 +- core/lib/Thelia/Model/Attribute.php | 4 +- core/lib/Thelia/Model/AttributeAv.php | 10 +- core/lib/Thelia/Model/AttributeAvI18n.php | 4 +- .../lib/Thelia/Model/AttributeAvI18nQuery.php | 5 +- core/lib/Thelia/Model/AttributeAvQuery.php | 5 +- .../lib/Thelia/Model/AttributeCombination.php | 4 +- .../Model/AttributeCombinationQuery.php | 5 +- core/lib/Thelia/Model/AttributeI18n.php | 4 +- core/lib/Thelia/Model/AttributeI18nQuery.php | 5 +- core/lib/Thelia/Model/AttributeQuery.php | 5 +- .../Thelia/Model/AttributeTemplateQuery.php | 1 - core/lib/Thelia/Model/Base/Accessory.php | 163 ++-- core/lib/Thelia/Model/Base/AccessoryQuery.php | 169 ++-- core/lib/Thelia/Model/Base/Address.php | 355 ++++----- core/lib/Thelia/Model/Base/AddressQuery.php | 291 ++++--- core/lib/Thelia/Model/Base/Admin.php | 210 +++-- core/lib/Thelia/Model/Base/AdminLog.php | 177 ++--- core/lib/Thelia/Model/Base/AdminLogQuery.php | 149 ++-- core/lib/Thelia/Model/Base/AdminQuery.php | 187 +++-- core/lib/Thelia/Model/Base/Area.php | 205 +++-- .../Thelia/Model/Base/AreaDeliveryModule.php | 155 ++-- .../Model/Base/AreaDeliveryModuleQuery.php | 159 ++-- core/lib/Thelia/Model/Base/AreaQuery.php | 155 ++-- core/lib/Thelia/Model/Base/Attribute.php | 317 ++++---- core/lib/Thelia/Model/Base/AttributeAv.php | 247 +++--- .../lib/Thelia/Model/Base/AttributeAvI18n.php | 146 ++-- .../Model/Base/AttributeAvI18nQuery.php | 103 ++- .../Thelia/Model/Base/AttributeAvQuery.php | 197 +++-- .../Model/Base/AttributeCombination.php | 163 ++-- .../Model/Base/AttributeCombinationQuery.php | 167 ++-- core/lib/Thelia/Model/Base/AttributeI18n.php | 146 ++-- .../Thelia/Model/Base/AttributeI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/AttributeQuery.php | 207 +++-- .../Thelia/Model/Base/AttributeTemplate.php | 163 ++-- .../Model/Base/AttributeTemplateQuery.php | 169 ++-- core/lib/Thelia/Model/Base/Cart.php | 252 +++--- core/lib/Thelia/Model/Base/CartItem.php | 220 +++--- core/lib/Thelia/Model/Base/CartItemQuery.php | 237 +++--- core/lib/Thelia/Model/Base/CartQuery.php | 243 +++--- core/lib/Thelia/Model/Base/Category.php | 479 ++++++------ .../Model/Base/CategoryAssociatedContent.php | 163 ++-- .../Base/CategoryAssociatedContentQuery.php | 169 ++-- .../Thelia/Model/Base/CategoryDocument.php | 204 +++-- .../Model/Base/CategoryDocumentI18n.php | 146 ++-- .../Model/Base/CategoryDocumentI18nQuery.php | 103 ++- .../Model/Base/CategoryDocumentQuery.php | 187 +++-- core/lib/Thelia/Model/Base/CategoryI18n.php | 170 ++-- .../Thelia/Model/Base/CategoryI18nQuery.php | 123 ++- core/lib/Thelia/Model/Base/CategoryImage.php | 204 +++-- .../Thelia/Model/Base/CategoryImageI18n.php | 146 ++-- .../Model/Base/CategoryImageI18nQuery.php | 103 ++- .../Thelia/Model/Base/CategoryImageQuery.php | 187 +++-- core/lib/Thelia/Model/Base/CategoryQuery.php | 295 ++++--- .../lib/Thelia/Model/Base/CategoryVersion.php | 179 ++--- .../Model/Base/CategoryVersionQuery.php | 163 ++-- core/lib/Thelia/Model/Base/Config.php | 212 +++-- core/lib/Thelia/Model/Base/ConfigI18n.php | 146 ++-- .../lib/Thelia/Model/Base/ConfigI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/ConfigQuery.php | 177 +++-- core/lib/Thelia/Model/Base/Content.php | 515 ++++++------ .../lib/Thelia/Model/Base/ContentDocument.php | 204 +++-- .../Thelia/Model/Base/ContentDocumentI18n.php | 146 ++-- .../Model/Base/ContentDocumentI18nQuery.php | 103 ++- .../Model/Base/ContentDocumentQuery.php | 187 +++-- core/lib/Thelia/Model/Base/ContentFolder.php | 154 ++-- .../Thelia/Model/Base/ContentFolderQuery.php | 157 ++-- core/lib/Thelia/Model/Base/ContentI18n.php | 170 ++-- .../Thelia/Model/Base/ContentI18nQuery.php | 123 ++- core/lib/Thelia/Model/Base/ContentImage.php | 204 +++-- .../Thelia/Model/Base/ContentImageI18n.php | 146 ++-- .../Model/Base/ContentImageI18nQuery.php | 103 ++- .../Thelia/Model/Base/ContentImageQuery.php | 187 +++-- core/lib/Thelia/Model/Base/ContentQuery.php | 299 ++++--- core/lib/Thelia/Model/Base/ContentVersion.php | 171 ++-- .../Thelia/Model/Base/ContentVersionQuery.php | 153 ++-- core/lib/Thelia/Model/Base/Country.php | 323 ++++---- core/lib/Thelia/Model/Base/CountryI18n.php | 146 ++-- .../Thelia/Model/Base/CountryI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/CountryQuery.php | 243 +++--- core/lib/Thelia/Model/Base/Coupon.php | 369 ++++----- core/lib/Thelia/Model/Base/CouponI18n.php | 138 ++-- .../lib/Thelia/Model/Base/CouponI18nQuery.php | 99 ++- core/lib/Thelia/Model/Base/CouponQuery.php | 285 ++++--- core/lib/Thelia/Model/Base/CouponVersion.php | 227 +++--- .../Thelia/Model/Base/CouponVersionQuery.php | 221 +++--- core/lib/Thelia/Model/Base/Currency.php | 377 ++++----- core/lib/Thelia/Model/Base/CurrencyI18n.php | 122 ++- .../Thelia/Model/Base/CurrencyI18nQuery.php | 87 +-- core/lib/Thelia/Model/Base/CurrencyQuery.php | 235 +++--- core/lib/Thelia/Model/Base/Customer.php | 394 +++++----- core/lib/Thelia/Model/Base/CustomerQuery.php | 259 +++--- core/lib/Thelia/Model/Base/CustomerTitle.php | 264 +++---- .../Thelia/Model/Base/CustomerTitleI18n.php | 130 ++-- .../Model/Base/CustomerTitleI18nQuery.php | 91 ++- .../Thelia/Model/Base/CustomerTitleQuery.php | 193 +++-- core/lib/Thelia/Model/Base/Feature.php | 313 ++++---- core/lib/Thelia/Model/Base/FeatureAv.php | 245 +++--- core/lib/Thelia/Model/Base/FeatureAvI18n.php | 146 ++-- .../Thelia/Model/Base/FeatureAvI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/FeatureAvQuery.php | 197 +++-- core/lib/Thelia/Model/Base/FeatureI18n.php | 146 ++-- .../Thelia/Model/Base/FeatureI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/FeatureProduct.php | 188 ++--- .../Thelia/Model/Base/FeatureProductQuery.php | 201 +++-- core/lib/Thelia/Model/Base/FeatureQuery.php | 215 +++-- .../lib/Thelia/Model/Base/FeatureTemplate.php | 163 ++-- .../Model/Base/FeatureTemplateQuery.php | 169 ++-- core/lib/Thelia/Model/Base/Folder.php | 453 +++++------ core/lib/Thelia/Model/Base/FolderDocument.php | 204 +++-- .../Thelia/Model/Base/FolderDocumentI18n.php | 146 ++-- .../Model/Base/FolderDocumentI18nQuery.php | 103 ++- .../Thelia/Model/Base/FolderDocumentQuery.php | 187 +++-- core/lib/Thelia/Model/Base/FolderI18n.php | 170 ++-- .../lib/Thelia/Model/Base/FolderI18nQuery.php | 123 ++- core/lib/Thelia/Model/Base/FolderImage.php | 204 +++-- .../lib/Thelia/Model/Base/FolderImageI18n.php | 146 ++-- .../Model/Base/FolderImageI18nQuery.php | 103 ++- .../Thelia/Model/Base/FolderImageQuery.php | 187 +++-- core/lib/Thelia/Model/Base/FolderQuery.php | 279 ++++--- core/lib/Thelia/Model/Base/FolderVersion.php | 179 ++--- .../Thelia/Model/Base/FolderVersionQuery.php | 163 ++-- core/lib/Thelia/Model/Base/Lang.php | 290 +++---- core/lib/Thelia/Model/Base/LangQuery.php | 203 +++-- core/lib/Thelia/Model/Base/Message.php | 345 ++++---- core/lib/Thelia/Model/Base/MessageI18n.php | 146 ++-- .../Thelia/Model/Base/MessageI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/MessageQuery.php | 237 +++--- core/lib/Thelia/Model/Base/MessageVersion.php | 203 +++-- .../Thelia/Model/Base/MessageVersionQuery.php | 173 ++-- core/lib/Thelia/Model/Base/Module.php | 460 +++++------ core/lib/Thelia/Model/Base/ModuleI18n.php | 146 ++-- .../lib/Thelia/Model/Base/ModuleI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/ModuleImage.php | 204 +++-- .../lib/Thelia/Model/Base/ModuleImageI18n.php | 146 ++-- .../Model/Base/ModuleImageI18nQuery.php | 103 ++- .../Thelia/Model/Base/ModuleImageQuery.php | 187 +++-- core/lib/Thelia/Model/Base/ModuleQuery.php | 267 ++++--- core/lib/Thelia/Model/Base/Newsletter.php | 153 ++-- .../lib/Thelia/Model/Base/NewsletterQuery.php | 131 ++-- core/lib/Thelia/Model/Base/Order.php | 385 ++++----- core/lib/Thelia/Model/Base/OrderAddress.php | 354 ++++----- .../Thelia/Model/Base/OrderAddressQuery.php | 213 +++-- core/lib/Thelia/Model/Base/OrderCoupon.php | 229 +++--- .../Thelia/Model/Base/OrderCouponQuery.php | 229 +++--- core/lib/Thelia/Model/Base/OrderProduct.php | 327 ++++---- .../Base/OrderProductAttributeCombination.php | 202 +++-- .../OrderProductAttributeCombinationQuery.php | 179 +++-- .../Thelia/Model/Base/OrderProductQuery.php | 281 ++++--- .../lib/Thelia/Model/Base/OrderProductTax.php | 170 ++-- .../Model/Base/OrderProductTaxQuery.php | 163 ++-- core/lib/Thelia/Model/Base/OrderQuery.php | 409 +++++----- core/lib/Thelia/Model/Base/OrderStatus.php | 265 +++---- .../lib/Thelia/Model/Base/OrderStatusI18n.php | 146 ++-- .../Model/Base/OrderStatusI18nQuery.php | 103 ++- .../Thelia/Model/Base/OrderStatusQuery.php | 167 ++-- core/lib/Thelia/Model/Base/Product.php | 736 ++++++++---------- .../Model/Base/ProductAssociatedContent.php | 163 ++-- .../Base/ProductAssociatedContentQuery.php | 169 ++-- .../lib/Thelia/Model/Base/ProductCategory.php | 154 ++-- .../Model/Base/ProductCategoryQuery.php | 157 ++-- .../lib/Thelia/Model/Base/ProductDocument.php | 204 +++-- .../Thelia/Model/Base/ProductDocumentI18n.php | 146 ++-- .../Model/Base/ProductDocumentI18nQuery.php | 103 ++- .../Model/Base/ProductDocumentQuery.php | 187 +++-- core/lib/Thelia/Model/Base/ProductI18n.php | 170 ++-- .../Thelia/Model/Base/ProductI18nQuery.php | 123 ++- core/lib/Thelia/Model/Base/ProductImage.php | 204 +++-- .../Thelia/Model/Base/ProductImageI18n.php | 146 ++-- .../Model/Base/ProductImageI18nQuery.php | 103 ++- .../Thelia/Model/Base/ProductImageQuery.php | 187 +++-- core/lib/Thelia/Model/Base/ProductPrice.php | 173 ++-- .../Thelia/Model/Base/ProductPriceQuery.php | 175 +++-- core/lib/Thelia/Model/Base/ProductQuery.php | 427 +++++----- .../Thelia/Model/Base/ProductSaleElements.php | 320 ++++---- .../Model/Base/ProductSaleElementsQuery.php | 245 +++--- core/lib/Thelia/Model/Base/ProductVersion.php | 195 ++--- .../Thelia/Model/Base/ProductVersionQuery.php | 179 +++-- core/lib/Thelia/Model/Base/Profile.php | 312 ++++---- core/lib/Thelia/Model/Base/ProfileI18n.php | 146 ++-- .../Thelia/Model/Base/ProfileI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/ProfileModule.php | 157 ++-- .../Thelia/Model/Base/ProfileModuleQuery.php | 155 ++-- core/lib/Thelia/Model/Base/ProfileQuery.php | 203 +++-- .../lib/Thelia/Model/Base/ProfileResource.php | 157 ++-- .../Model/Base/ProfileResourceQuery.php | 155 ++-- core/lib/Thelia/Model/Base/Resource.php | 245 +++--- core/lib/Thelia/Model/Base/ResourceI18n.php | 146 ++-- .../Thelia/Model/Base/ResourceI18nQuery.php | 105 ++- core/lib/Thelia/Model/Base/ResourceQuery.php | 171 ++-- .../Thelia/Model/Base/RewritingArgument.php | 145 ++-- .../Model/Base/RewritingArgumentQuery.php | 129 ++- core/lib/Thelia/Model/Base/RewritingUrl.php | 229 +++--- .../Thelia/Model/Base/RewritingUrlQuery.php | 187 +++-- core/lib/Thelia/Model/Base/Tax.php | 234 +++--- core/lib/Thelia/Model/Base/TaxI18n.php | 130 ++-- core/lib/Thelia/Model/Base/TaxI18nQuery.php | 93 ++- core/lib/Thelia/Model/Base/TaxQuery.php | 173 ++-- core/lib/Thelia/Model/Base/TaxRule.php | 263 +++---- core/lib/Thelia/Model/Base/TaxRuleCountry.php | 171 ++-- .../Thelia/Model/Base/TaxRuleCountryQuery.php | 181 +++-- core/lib/Thelia/Model/Base/TaxRuleI18n.php | 130 ++-- .../Thelia/Model/Base/TaxRuleI18nQuery.php | 93 ++- core/lib/Thelia/Model/Base/TaxRuleQuery.php | 189 +++-- core/lib/Thelia/Model/Base/Template.php | 325 ++++---- core/lib/Thelia/Model/Base/TemplateI18n.php | 122 ++- .../Thelia/Model/Base/TemplateI18nQuery.php | 87 +-- core/lib/Thelia/Model/Base/TemplateQuery.php | 201 +++-- core/lib/Thelia/Model/Cart.php | 13 +- core/lib/Thelia/Model/CartItem.php | 19 +- core/lib/Thelia/Model/CartItemQuery.php | 1 - core/lib/Thelia/Model/CartQuery.php | 2 - core/lib/Thelia/Model/Category.php | 19 +- .../Model/CategoryAssociatedContent.php | 4 +- .../Model/CategoryAssociatedContentQuery.php | 5 +- core/lib/Thelia/Model/CategoryDocument.php | 6 +- .../Model/CategoryDocumentI18nQuery.php | 1 - .../Thelia/Model/CategoryDocumentQuery.php | 1 - core/lib/Thelia/Model/CategoryI18n.php | 3 +- core/lib/Thelia/Model/CategoryI18nQuery.php | 5 +- core/lib/Thelia/Model/CategoryImage.php | 5 +- .../Thelia/Model/CategoryImageI18nQuery.php | 1 - core/lib/Thelia/Model/CategoryImageQuery.php | 1 - core/lib/Thelia/Model/CategoryQuery.php | 15 +- core/lib/Thelia/Model/CategoryVersion.php | 4 +- .../lib/Thelia/Model/CategoryVersionQuery.php | 5 +- core/lib/Thelia/Model/Config.php | 6 +- core/lib/Thelia/Model/ConfigI18n.php | 4 +- core/lib/Thelia/Model/ConfigI18nQuery.php | 5 +- core/lib/Thelia/Model/ConfigQuery.php | 16 +- core/lib/Thelia/Model/Content.php | 11 +- core/lib/Thelia/Model/ContentDocument.php | 4 +- .../Thelia/Model/ContentDocumentI18nQuery.php | 1 - .../lib/Thelia/Model/ContentDocumentQuery.php | 1 - core/lib/Thelia/Model/ContentFolder.php | 4 +- core/lib/Thelia/Model/ContentFolderQuery.php | 5 +- core/lib/Thelia/Model/ContentI18n.php | 3 +- core/lib/Thelia/Model/ContentI18nQuery.php | 5 +- core/lib/Thelia/Model/ContentImage.php | 6 +- .../Thelia/Model/ContentImageI18nQuery.php | 1 - core/lib/Thelia/Model/ContentImageQuery.php | 1 - core/lib/Thelia/Model/ContentQuery.php | 5 +- core/lib/Thelia/Model/ContentVersion.php | 4 +- core/lib/Thelia/Model/ContentVersionQuery.php | 5 +- core/lib/Thelia/Model/Country.php | 13 +- core/lib/Thelia/Model/CountryI18n.php | 4 +- core/lib/Thelia/Model/CountryI18nQuery.php | 5 +- core/lib/Thelia/Model/CountryQuery.php | 5 +- core/lib/Thelia/Model/Coupon.php | 9 +- core/lib/Thelia/Model/CouponI18n.php | 4 +- core/lib/Thelia/Model/CouponI18nQuery.php | 5 +- core/lib/Thelia/Model/CouponQuery.php | 5 +- core/lib/Thelia/Model/CouponVersion.php | 4 +- core/lib/Thelia/Model/CouponVersionQuery.php | 5 +- core/lib/Thelia/Model/Currency.php | 10 +- core/lib/Thelia/Model/CurrencyI18nQuery.php | 1 - core/lib/Thelia/Model/CurrencyQuery.php | 5 +- core/lib/Thelia/Model/Customer.php | 85 +- core/lib/Thelia/Model/CustomerQuery.php | 7 +- core/lib/Thelia/Model/CustomerTitle.php | 4 +- core/lib/Thelia/Model/CustomerTitleI18n.php | 4 +- .../Thelia/Model/CustomerTitleI18nQuery.php | 5 +- core/lib/Thelia/Model/CustomerTitleQuery.php | 5 +- .../Exception/InvalidArgumentException.php | 3 +- .../Thelia/Model/Exception/ModelException.php | 3 +- core/lib/Thelia/Model/Feature.php | 4 +- core/lib/Thelia/Model/FeatureAv.php | 7 +- core/lib/Thelia/Model/FeatureAvI18n.php | 4 +- core/lib/Thelia/Model/FeatureAvI18nQuery.php | 5 +- core/lib/Thelia/Model/FeatureAvQuery.php | 5 +- core/lib/Thelia/Model/FeatureI18n.php | 4 +- core/lib/Thelia/Model/FeatureI18nQuery.php | 5 +- core/lib/Thelia/Model/FeatureProductQuery.php | 1 - core/lib/Thelia/Model/FeatureQuery.php | 5 +- .../lib/Thelia/Model/FeatureTemplateQuery.php | 1 - core/lib/Thelia/Model/Folder.php | 10 +- core/lib/Thelia/Model/FolderDocument.php | 4 +- .../Thelia/Model/FolderDocumentI18nQuery.php | 1 - core/lib/Thelia/Model/FolderDocumentQuery.php | 1 - core/lib/Thelia/Model/FolderI18n.php | 4 +- core/lib/Thelia/Model/FolderI18nQuery.php | 5 +- core/lib/Thelia/Model/FolderImage.php | 4 +- .../lib/Thelia/Model/FolderImageI18nQuery.php | 1 - core/lib/Thelia/Model/FolderImageQuery.php | 1 - core/lib/Thelia/Model/FolderQuery.php | 12 +- core/lib/Thelia/Model/FolderVersion.php | 4 +- core/lib/Thelia/Model/FolderVersionQuery.php | 5 +- core/lib/Thelia/Model/Lang.php | 17 +- core/lib/Thelia/Model/LangQuery.php | 5 +- .../Thelia/Model/Map/AccessoryTableMap.php | 57 +- core/lib/Thelia/Model/Map/AddressTableMap.php | 57 +- .../lib/Thelia/Model/Map/AdminLogTableMap.php | 57 +- core/lib/Thelia/Model/Map/AdminTableMap.php | 57 +- .../Model/Map/AreaDeliveryModuleTableMap.php | 57 +- core/lib/Thelia/Model/Map/AreaTableMap.php | 57 +- .../Model/Map/AttributeAvI18nTableMap.php | 59 +- .../Thelia/Model/Map/AttributeAvTableMap.php | 57 +- .../Map/AttributeCombinationTableMap.php | 59 +- .../Model/Map/AttributeI18nTableMap.php | 59 +- .../Thelia/Model/Map/AttributeTableMap.php | 57 +- .../Model/Map/AttributeTemplateTableMap.php | 57 +- .../lib/Thelia/Model/Map/CartItemTableMap.php | 57 +- core/lib/Thelia/Model/Map/CartTableMap.php | 57 +- .../Map/CategoryAssociatedContentTableMap.php | 57 +- .../Map/CategoryDocumentI18nTableMap.php | 59 +- .../Model/Map/CategoryDocumentTableMap.php | 57 +- .../Thelia/Model/Map/CategoryI18nTableMap.php | 59 +- .../Model/Map/CategoryImageI18nTableMap.php | 59 +- .../Model/Map/CategoryImageTableMap.php | 57 +- .../lib/Thelia/Model/Map/CategoryTableMap.php | 57 +- .../Model/Map/CategoryVersionTableMap.php | 59 +- .../Thelia/Model/Map/ConfigI18nTableMap.php | 59 +- core/lib/Thelia/Model/Map/ConfigTableMap.php | 57 +- .../Model/Map/ContentDocumentI18nTableMap.php | 59 +- .../Model/Map/ContentDocumentTableMap.php | 57 +- .../Model/Map/ContentFolderTableMap.php | 59 +- .../Thelia/Model/Map/ContentI18nTableMap.php | 59 +- .../Model/Map/ContentImageI18nTableMap.php | 59 +- .../Thelia/Model/Map/ContentImageTableMap.php | 57 +- core/lib/Thelia/Model/Map/ContentTableMap.php | 57 +- .../Model/Map/ContentVersionTableMap.php | 59 +- .../Thelia/Model/Map/CountryI18nTableMap.php | 59 +- core/lib/Thelia/Model/Map/CountryTableMap.php | 57 +- .../Thelia/Model/Map/CouponI18nTableMap.php | 59 +- core/lib/Thelia/Model/Map/CouponTableMap.php | 57 +- .../Model/Map/CouponVersionTableMap.php | 59 +- .../Thelia/Model/Map/CurrencyI18nTableMap.php | 59 +- .../lib/Thelia/Model/Map/CurrencyTableMap.php | 57 +- .../lib/Thelia/Model/Map/CustomerTableMap.php | 57 +- .../Model/Map/CustomerTitleI18nTableMap.php | 59 +- .../Model/Map/CustomerTitleTableMap.php | 57 +- .../Model/Map/FeatureAvI18nTableMap.php | 59 +- .../Thelia/Model/Map/FeatureAvTableMap.php | 57 +- .../Thelia/Model/Map/FeatureI18nTableMap.php | 59 +- .../Model/Map/FeatureProductTableMap.php | 57 +- core/lib/Thelia/Model/Map/FeatureTableMap.php | 57 +- .../Model/Map/FeatureTemplateTableMap.php | 57 +- .../Model/Map/FolderDocumentI18nTableMap.php | 59 +- .../Model/Map/FolderDocumentTableMap.php | 57 +- .../Thelia/Model/Map/FolderI18nTableMap.php | 59 +- .../Model/Map/FolderImageI18nTableMap.php | 59 +- .../Thelia/Model/Map/FolderImageTableMap.php | 57 +- core/lib/Thelia/Model/Map/FolderTableMap.php | 57 +- .../Model/Map/FolderVersionTableMap.php | 59 +- core/lib/Thelia/Model/Map/LangTableMap.php | 57 +- .../Thelia/Model/Map/MessageI18nTableMap.php | 59 +- core/lib/Thelia/Model/Map/MessageTableMap.php | 57 +- .../Model/Map/MessageVersionTableMap.php | 59 +- .../Thelia/Model/Map/ModuleI18nTableMap.php | 59 +- .../Model/Map/ModuleImageI18nTableMap.php | 59 +- .../Thelia/Model/Map/ModuleImageTableMap.php | 57 +- core/lib/Thelia/Model/Map/ModuleTableMap.php | 57 +- .../Thelia/Model/Map/NewsletterTableMap.php | 57 +- .../Thelia/Model/Map/OrderAddressTableMap.php | 57 +- .../Thelia/Model/Map/OrderCouponTableMap.php | 57 +- ...derProductAttributeCombinationTableMap.php | 57 +- .../Thelia/Model/Map/OrderProductTableMap.php | 57 +- .../Model/Map/OrderProductTaxTableMap.php | 57 +- .../Model/Map/OrderStatusI18nTableMap.php | 59 +- .../Thelia/Model/Map/OrderStatusTableMap.php | 57 +- core/lib/Thelia/Model/Map/OrderTableMap.php | 57 +- .../Map/ProductAssociatedContentTableMap.php | 57 +- .../Model/Map/ProductCategoryTableMap.php | 59 +- .../Model/Map/ProductDocumentI18nTableMap.php | 59 +- .../Model/Map/ProductDocumentTableMap.php | 57 +- .../Thelia/Model/Map/ProductI18nTableMap.php | 59 +- .../Model/Map/ProductImageI18nTableMap.php | 59 +- .../Thelia/Model/Map/ProductImageTableMap.php | 57 +- .../Thelia/Model/Map/ProductPriceTableMap.php | 59 +- .../Model/Map/ProductSaleElementsTableMap.php | 57 +- core/lib/Thelia/Model/Map/ProductTableMap.php | 57 +- .../Model/Map/ProductVersionTableMap.php | 59 +- .../Thelia/Model/Map/ProfileI18nTableMap.php | 59 +- .../Model/Map/ProfileModuleTableMap.php | 59 +- .../Model/Map/ProfileResourceTableMap.php | 59 +- core/lib/Thelia/Model/Map/ProfileTableMap.php | 57 +- .../Thelia/Model/Map/ResourceI18nTableMap.php | 59 +- .../lib/Thelia/Model/Map/ResourceTableMap.php | 57 +- .../Model/Map/RewritingArgumentTableMap.php | 59 +- .../Thelia/Model/Map/RewritingUrlTableMap.php | 57 +- core/lib/Thelia/Model/Map/TaxI18nTableMap.php | 59 +- .../Model/Map/TaxRuleCountryTableMap.php | 59 +- .../Thelia/Model/Map/TaxRuleI18nTableMap.php | 59 +- core/lib/Thelia/Model/Map/TaxRuleTableMap.php | 57 +- core/lib/Thelia/Model/Map/TaxTableMap.php | 57 +- .../Thelia/Model/Map/TemplateI18nTableMap.php | 59 +- .../lib/Thelia/Model/Map/TemplateTableMap.php | 57 +- core/lib/Thelia/Model/Message.php | 25 +- core/lib/Thelia/Model/MessageI18n.php | 4 +- core/lib/Thelia/Model/MessageI18nQuery.php | 5 +- core/lib/Thelia/Model/MessageQuery.php | 5 +- core/lib/Thelia/Model/MessageVersion.php | 4 +- core/lib/Thelia/Model/MessageVersionQuery.php | 5 +- core/lib/Thelia/Model/Module.php | 27 +- core/lib/Thelia/Model/ModuleI18n.php | 4 +- core/lib/Thelia/Model/ModuleI18nQuery.php | 5 +- .../lib/Thelia/Model/ModuleImageI18nQuery.php | 1 - core/lib/Thelia/Model/ModuleImageQuery.php | 1 - core/lib/Thelia/Model/ModuleQuery.php | 8 +- core/lib/Thelia/Model/NewsletterQuery.php | 1 - core/lib/Thelia/Model/Order.php | 12 +- core/lib/Thelia/Model/OrderAddress.php | 4 +- core/lib/Thelia/Model/OrderAddressQuery.php | 5 +- core/lib/Thelia/Model/OrderCouponQuery.php | 1 - core/lib/Thelia/Model/OrderFeature.php | 4 +- core/lib/Thelia/Model/OrderFeatureQuery.php | 5 +- .../OrderProductAttributeCombinationQuery.php | 1 - core/lib/Thelia/Model/OrderProductQuery.php | 1 - .../lib/Thelia/Model/OrderProductTaxQuery.php | 1 - core/lib/Thelia/Model/OrderQuery.php | 11 +- core/lib/Thelia/Model/OrderStatusI18n.php | 4 +- .../lib/Thelia/Model/OrderStatusI18nQuery.php | 5 +- core/lib/Thelia/Model/OrderStatusQuery.php | 5 +- core/lib/Thelia/Model/Product.php | 41 +- .../Thelia/Model/ProductAssociatedContent.php | 7 +- .../Model/ProductAssociatedContentQuery.php | 5 +- core/lib/Thelia/Model/ProductCategory.php | 4 +- .../lib/Thelia/Model/ProductCategoryQuery.php | 5 +- core/lib/Thelia/Model/ProductDocument.php | 4 +- .../Thelia/Model/ProductDocumentI18nQuery.php | 1 - .../lib/Thelia/Model/ProductDocumentQuery.php | 1 - core/lib/Thelia/Model/ProductI18n.php | 4 +- core/lib/Thelia/Model/ProductI18nQuery.php | 5 +- core/lib/Thelia/Model/ProductImage.php | 4 +- .../Thelia/Model/ProductImageI18nQuery.php | 1 - core/lib/Thelia/Model/ProductImageQuery.php | 1 - core/lib/Thelia/Model/ProductPriceQuery.php | 1 - core/lib/Thelia/Model/ProductQuery.php | 5 +- core/lib/Thelia/Model/ProductSaleElements.php | 6 +- .../Thelia/Model/ProductSaleElementsQuery.php | 1 - core/lib/Thelia/Model/ProductVersion.php | 4 +- core/lib/Thelia/Model/ProductVersionQuery.php | 5 +- core/lib/Thelia/Model/Profile.php | 2 +- core/lib/Thelia/Model/ProfileI18nQuery.php | 1 - core/lib/Thelia/Model/ProfileModuleQuery.php | 1 - core/lib/Thelia/Model/ProfileQuery.php | 4 +- .../lib/Thelia/Model/ProfileResourceQuery.php | 1 - core/lib/Thelia/Model/Resource.php | 4 +- core/lib/Thelia/Model/ResourceI18n.php | 4 +- core/lib/Thelia/Model/ResourceI18nQuery.php | 5 +- core/lib/Thelia/Model/ResourceQuery.php | 5 +- core/lib/Thelia/Model/RewritingArgument.php | 4 +- .../Thelia/Model/RewritingArgumentQuery.php | 5 +- core/lib/Thelia/Model/RewritingUrl.php | 7 +- core/lib/Thelia/Model/RewritingUrlQuery.php | 4 +- core/lib/Thelia/Model/Tax.php | 18 +- core/lib/Thelia/Model/TaxI18n.php | 4 +- core/lib/Thelia/Model/TaxI18nQuery.php | 5 +- core/lib/Thelia/Model/TaxQuery.php | 5 +- core/lib/Thelia/Model/TaxRule.php | 2 +- core/lib/Thelia/Model/TaxRuleCountry.php | 4 +- core/lib/Thelia/Model/TaxRuleCountryQuery.php | 5 +- core/lib/Thelia/Model/TaxRuleI18n.php | 4 +- core/lib/Thelia/Model/TaxRuleI18nQuery.php | 5 +- core/lib/Thelia/Model/TaxRuleQuery.php | 1 - core/lib/Thelia/Model/TemplateI18nQuery.php | 1 - core/lib/Thelia/Model/TemplateQuery.php | 1 - .../Thelia/Model/Tools/ModelCriteriaTools.php | 19 +- .../Model/Tools/ModelEventDispatcherTrait.php | 6 +- .../Model/Tools/PositionManagementTrait.php | 39 +- .../Thelia/Model/Tools/UrlRewritingTrait.php | 45 +- .../TaxEngine/OrderProductTaxCollection.php | 2 +- core/lib/Thelia/Tools/FileManager.php | 1 - core/lib/Thelia/Tools/MoneyFormat.php | 1 + core/lib/Thelia/Tools/URL.php | 1 - core/lib/Thelia/Type/TypeCollection.php | 2 +- 590 files changed, 21397 insertions(+), 24262 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b1515eb6..dc813ed76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ - Remove container from BaseAction. - fix sending mail on order creation - less files in default templates are already compile in css. +- all validator message are translated +- type argument is now a default argument and used for generating loop cache +- fix total amount without discount in backoffice. Fix #235 +- description is not required anymore in coupon form. Fix #233 +- Do not allow to cumulate the same coupon many times. Fix #217 +- colissimo module is now fully configurable +- test suite are executed on PHP 5.4, 5.5, 5.6 and HHVM. Thelia is not fully compatible with HHVM #2.0.0-beta4 - Tinymce is now a dedicated module. You need to activate it. diff --git a/core/lib/Thelia/Action/BaseAction.php b/core/lib/Thelia/Action/BaseAction.php index 8da1e1ce5..46dc3eaf1 100644 --- a/core/lib/Thelia/Action/BaseAction.php +++ b/core/lib/Thelia/Action/BaseAction.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Action; -use Symfony\Component\DependencyInjection\ContainerInterface; use Propel\Runtime\ActiveQuery\ModelCriteria; use Thelia\Core\Event\UpdatePositionEvent; @@ -64,7 +63,7 @@ class BaseAction * @param ModelCriteria $query * @param UpdateSeoEvent $event * - * @return mixed an SEOxxx object + * @return mixed an SEOxxx object * @throws FormValidationException if a rewritten URL cannot be created */ protected function genericUpdateSeo(ModelCriteria $query, UpdateSeoEvent $event) @@ -94,4 +93,4 @@ class BaseAction return $object; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php index 25c2604c6..69ef2dd29 100644 --- a/core/lib/Thelia/Action/Cart.php +++ b/core/lib/Thelia/Action/Cart.php @@ -23,7 +23,6 @@ namespace Thelia\Action; - use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Core\Event\Cart\CartEvent; diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index adf589578..ed19c64b9 100644 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -23,8 +23,6 @@ namespace Thelia\Action; -use Propel\Runtime\ServiceContainer\ServiceContainerInterface; -use Symfony\Component\DependencyInjection\Container; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Condition\ConditionFactory; use Thelia\Condition\Implementation\ConditionInterface; diff --git a/core/lib/Thelia/Action/Module.php b/core/lib/Thelia/Action/Module.php index ecd72aece..05e29020b 100644 --- a/core/lib/Thelia/Action/Module.php +++ b/core/lib/Thelia/Action/Module.php @@ -155,11 +155,11 @@ class Module extends BaseAction implements EventSubscriberInterface /** * Call the payment method of the payment module of the given order * - * @param OrderPaymentEvent $event + * @param OrderPaymentEvent $event * @throws \RuntimeException if no payment module can be found. */ - public function pay(OrderPaymentEvent $event) { - + public function pay(OrderPaymentEvent $event) + { $order = $event->getOrder(); /* call pay method */ diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php index 3c9dd9b0b..0e8293c4a 100644 --- a/core/lib/Thelia/Action/Order.php +++ b/core/lib/Thelia/Action/Order.php @@ -26,7 +26,6 @@ namespace Thelia\Action; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Cart\CartTrait; -use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\Order\OrderAddressEvent; use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\Order\OrderManualEvent; @@ -53,7 +52,6 @@ use Thelia\Model\OrderStatus; use Thelia\Model\OrderStatusQuery; use Thelia\Tools\I18n; - /** * * Class Order @@ -157,7 +155,6 @@ class Order extends BaseAction implements EventSubscriberInterface $con->beginTransaction(); - $placedOrder = $sessionOrder->copy(); $placedOrder->setDispatcher($dispatcher); @@ -307,8 +304,8 @@ class Order extends BaseAction implements EventSubscriberInterface /** * Create an order outside of the front-office context, e.g. manually from the back-office. */ - public function createManual(OrderManualEvent $event) { - + public function createManual(OrderManualEvent $event) + { $placedOrder = $this->createOrder( $event->getDispatcher(), $event->getOrder(), @@ -339,7 +336,6 @@ class Order extends BaseAction implements EventSubscriberInterface $event->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder)); - /* but memorize placed order */ $event->setOrder(new \Thelia\Model\Order()); $event->setPlacedOrder($placedOrder); diff --git a/core/lib/Thelia/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php index 568a6aaec..dce726552 100644 --- a/core/lib/Thelia/Cart/CartTrait.php +++ b/core/lib/Thelia/Cart/CartTrait.php @@ -45,7 +45,7 @@ trait CartTrait * * search if cart already exists in session. If not try to create a new one or duplicate an old one. * - * @param EventDispatcherInterface $dispatcher the event dispatcher + * @param EventDispatcherInterface $dispatcher the event dispatcher * @param \Symfony\Component\HttpFoundation\Request $request * @return \Thelia\Model\Cart */ diff --git a/core/lib/Thelia/Command/CacheClear.php b/core/lib/Thelia/Command/CacheClear.php index a2cd7ee2f..f8a6063c8 100644 --- a/core/lib/Thelia/Command/CacheClear.php +++ b/core/lib/Thelia/Command/CacheClear.php @@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Filesystem\Exception\IOException; - use Thelia\Core\Event\Cache\CacheEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Command/ClearImageCache.php b/core/lib/Thelia/Command/ClearImageCache.php index 053533469..acd2cb02e 100644 --- a/core/lib/Thelia/Command/ClearImageCache.php +++ b/core/lib/Thelia/Command/ClearImageCache.php @@ -23,8 +23,6 @@ namespace Thelia\Command; - - use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Thelia\Core\Event\Image\ImageEvent; diff --git a/core/lib/Thelia/Command/CreateAdminUser.php b/core/lib/Thelia/Command/CreateAdminUser.php index f935221dc..ad8d386e5 100644 --- a/core/lib/Thelia/Command/CreateAdminUser.php +++ b/core/lib/Thelia/Command/CreateAdminUser.php @@ -27,7 +27,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; - use Thelia\Model\Admin; class CreateAdminUser extends ContainerAwareCommand diff --git a/core/lib/Thelia/Command/GenerateResources.php b/core/lib/Thelia/Command/GenerateResources.php index 3db889ddb..3e67a0d42 100644 --- a/core/lib/Thelia/Command/GenerateResources.php +++ b/core/lib/Thelia/Command/GenerateResources.php @@ -27,7 +27,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; - use Thelia\Core\Security\Resource\AdminResources; use Thelia\Model\Map\ResourceI18nTableMap; diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 43d3bbdc9..116d5ff26 100644 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -248,8 +248,8 @@ class BaseAdminController extends BaseController * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route * @throws InvalidParameterException When a parameter value for a placeholder is not correct because * it does not match the requirement - * @throws \InvalidArgumentException When the router doesn't exist - * @return string The generated URL + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL * * @see \Thelia\Controller\BaseController::getRouteFromRouter() */ diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index a6581cca7..3a006922b 100644 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -23,7 +23,6 @@ namespace Thelia\Controller\Admin; - use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Event\Category\CategoryDeleteEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index b0fa48569..62bbff786 100644 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -98,7 +98,6 @@ class CouponController extends BaseAdminController { $this->checkAuth(AdminResources::COUPON, array(), AccessManager::VIEW); - $coupon = CouponQuery::create()->findPk($couponId); if ($coupon === null) { diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php index ed8eb5651..cf655a30e 100644 --- a/core/lib/Thelia/Controller/Admin/CustomerController.php +++ b/core/lib/Thelia/Controller/Admin/CustomerController.php @@ -32,7 +32,6 @@ use Thelia\Form\CustomerCreateForm; use Thelia\Form\CustomerUpdateForm; use Thelia\Model\CustomerQuery; - /** * Class CustomerController * @package Thelia\Controller\Admin diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php index d5af5b3c5..4e8fb6403 100644 --- a/core/lib/Thelia/Controller/Admin/FileController.php +++ b/core/lib/Thelia/Controller/Admin/FileController.php @@ -841,8 +841,6 @@ class FileController extends BaseAdminController $model->setPostscriptum($data['postscriptum']); } - - $imageCreateEvent->setModelImage($model); return $imageCreateEvent; diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php index 1d7c080c4..b532ae102 100644 --- a/core/lib/Thelia/Controller/Admin/OrderController.php +++ b/core/lib/Thelia/Controller/Admin/OrderController.php @@ -23,7 +23,6 @@ namespace Thelia\Controller\Admin; - use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Event\Order\OrderAddressEvent; use Thelia\Core\Event\Order\OrderEvent; @@ -46,7 +45,6 @@ class OrderController extends BaseAdminController public function indexAction() { if (null !== $response = $this->checkAuth(AdminResources::ORDER, array(), AccessManager::VIEW)) return $response; - return $this->render("orders", array( "display_order" => 20, "orders_order" => $this->getListOrderFromSession("orders", "orders_order", "create-date-reverse") diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php index 03e626812..6a0e30984 100644 --- a/core/lib/Thelia/Controller/Admin/SessionController.php +++ b/core/lib/Thelia/Controller/Admin/SessionController.php @@ -32,7 +32,6 @@ use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Model\Lang; use Thelia\Model\LangQuery; - use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\Authentication\AdminTokenAuthenticator; @@ -75,8 +74,8 @@ class SessionController extends BaseAdminController return $this->render("login"); } - protected function applyUserLocale(Admin $user) { - + protected function applyUserLocale(Admin $user) + { // Set the current language according to Admin locale preference $locale = $user->getLocale(); diff --git a/core/lib/Thelia/Controller/Admin/TaxRuleController.php b/core/lib/Thelia/Controller/Admin/TaxRuleController.php index 513f5859a..5ae75c8ec 100644 --- a/core/lib/Thelia/Controller/Admin/TaxRuleController.php +++ b/core/lib/Thelia/Controller/Admin/TaxRuleController.php @@ -51,8 +51,8 @@ class TaxRuleController extends AbstractCrudController ); } - public function defaultAction() { - + public function defaultAction() + { // In the tax rule template we use the TaxCreationForm. // // The TaxCreationForm require the TaxEngine, but we cannot pass it from the Parser Form plugin, diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 452fd87d0..71a099929 100644 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -293,8 +293,8 @@ abstract class BaseController extends ContainerAware * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route * @throws InvalidParameterException When a parameter value for a placeholder is not correct because * it does not match the requirement - * @throws \InvalidArgumentException When the router doesn't exist - * @return string The generated URL + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL */ protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_URL) { diff --git a/core/lib/Thelia/Core/Event/AccessoryEvent.php b/core/lib/Thelia/Core/Event/AccessoryEvent.php index 1e14e6fb7..afb0a9861 100644 --- a/core/lib/Thelia/Core/Event/AccessoryEvent.php +++ b/core/lib/Thelia/Core/Event/AccessoryEvent.php @@ -24,7 +24,6 @@ namespace Thelia\Core\Event; use Thelia\Model\Accessory; -use Thelia\Core\Event\ActionEvent; class AccessoryEvent extends ActionEvent { diff --git a/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php b/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php index 0071526dc..54716aada 100644 --- a/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php +++ b/core/lib/Thelia/Core/Event/Administrator/AdministratorEvent.php @@ -134,6 +134,7 @@ class AdministratorEvent extends ActionEvent public function setLocale($locale) { $this->locale = $locale; + return $this; } @@ -141,4 +142,4 @@ class AdministratorEvent extends ActionEvent { return $this->locale; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php index b0b0ee6a3..d61299142 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeAvEvent; - class AttributeAvCreateEvent extends AttributeAvEvent { protected $title; diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php index 515764e3d..574446f80 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeAvEvent; - class AttributeAvDeleteEvent extends AttributeAvEvent { protected $attributeAv_id; diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php index 318ec5817..70f85e1e5 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeAvCreateEvent; - class AttributeAvUpdateEvent extends AttributeAvCreateEvent { protected $attributeAv_id; diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php index 155560de0..cbbab5f1a 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeEvent; - class AttributeCreateEvent extends AttributeEvent { protected $title; diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php index d4ee6227b..30b1e8941 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeEvent; - class AttributeDeleteEvent extends AttributeEvent { protected $attribute_id; diff --git a/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php index d692586e4..636cf6784 100644 --- a/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Attribute; -use Thelia\Core\Event\Attribute\AttributeCreateEvent; - class AttributeUpdateEvent extends AttributeCreateEvent { protected $attribute_id; diff --git a/core/lib/Thelia/Core/Event/Cart/CartEvent.php b/core/lib/Thelia/Core/Event/Cart/CartEvent.php index b62f18f86..784e825fb 100644 --- a/core/lib/Thelia/Core/Event/Cart/CartEvent.php +++ b/core/lib/Thelia/Core/Event/Cart/CartEvent.php @@ -48,6 +48,7 @@ class CartEvent extends ActionEvent public function setAppend($append) { $this->append = $append; + return $this; } @@ -65,6 +66,7 @@ class CartEvent extends ActionEvent public function setCartItem($cartItem) { $this->cartItem = $cartItem; + return $this; } @@ -82,6 +84,7 @@ class CartEvent extends ActionEvent public function setNewness($newness) { $this->newness = $newness; + return $this; } @@ -99,6 +102,7 @@ class CartEvent extends ActionEvent public function setProduct($product) { $this->product = $product; + return $this; } @@ -116,6 +120,7 @@ class CartEvent extends ActionEvent public function setProductSaleElementsId($productSaleElementsId) { $this->productSaleElementsId = $productSaleElementsId; + return $this; } @@ -133,6 +138,7 @@ class CartEvent extends ActionEvent public function setQuantity($quantity) { $this->quantity = $quantity; + return $this; } @@ -151,4 +157,4 @@ class CartEvent extends ActionEvent { return $this->cart; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php index 115eae724..87b912f99 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryEvent; use Thelia\Model\Category; class CategoryAddContentEvent extends CategoryEvent diff --git a/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php index 870b0beb8..d574c8cf1 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryEvent; - class CategoryCreateEvent extends CategoryEvent { protected $title; diff --git a/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php index 01a92a1b8..5b723cf4f 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryEvent; use Thelia\Model\Category; class CategoryDeleteContentEvent extends CategoryEvent diff --git a/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php index a81d9c7ad..013e2aef5 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryEvent; - class CategoryDeleteEvent extends CategoryEvent { public function __construct($category_id) diff --git a/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php index 3d580701a..dc644b4f9 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryEvent; - class CategoryToggleVisibilityEvent extends CategoryEvent { } diff --git a/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php index 1ed2c5fe4..120c41bc2 100644 --- a/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Category; -use Thelia\Core\Event\Category\CategoryCreateEvent; - class CategoryUpdateEvent extends CategoryCreateEvent { protected $category_id; diff --git a/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php index 86cd5c84f..cca6c59cd 100644 --- a/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Config; -use Thelia\Core\Event\Config\ConfigEvent; - class ConfigCreateEvent extends ConfigEvent { protected $event_name; diff --git a/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php index f225e49b5..285df3cfd 100644 --- a/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Config; -use Thelia\Core\Event\Config\ConfigEvent; - class ConfigDeleteEvent extends ConfigEvent { protected $config_id; diff --git a/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php index f37f6ab55..71feba6ed 100644 --- a/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Config; -use Thelia\Core\Event\Config\ConfigCreateEvent; - class ConfigUpdateEvent extends ConfigCreateEvent { protected $config_id; diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php index 376db1d3f..f50a9264d 100644 --- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php @@ -87,10 +87,10 @@ class CouponCreateOrUpdateEvent extends ActionEvent /** * Constructor * - * @param string $code Coupon Code - * @param string $serviceId Coupon Service id - * @param string $title Coupon title - * @param array $effects Coupon effects ready to be serialized + * @param string $code Coupon Code + * @param string $serviceId Coupon Service id + * @param string $title Coupon title + * @param array $effects Coupon effects ready to be serialized * 'amount' key is mandatory and reflects * the amount deduced from the cart * @param string $shortDescription Coupon short description @@ -256,9 +256,9 @@ class CouponCreateOrUpdateEvent extends ActionEvent /** * Set effects ready to be serialized * - * @param array $effects Effect ready to be serialized - * Needs at least the key 'amount' - * with the amount removed from the cart + * @param array $effects Effect ready to be serialized + * Needs at least the key 'amount' + * with the amount removed from the cart * @throws \Thelia\Model\Exception\InvalidArgumentException */ public function setEffects(array $effects) diff --git a/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php index 45f5a1bbe..e28f88ec2 100644 --- a/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Currency; -use Thelia\Core\Event\Currency\CurrencyEvent; - class CurrencyCreateEvent extends CurrencyEvent { protected $currency_name; diff --git a/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php index 0845d4b9a..7ae1e44e1 100644 --- a/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Currency; -use Thelia\Core\Event\Currency\CurrencyEvent; - class CurrencyDeleteEvent extends CurrencyEvent { protected $currency_id; diff --git a/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php index 2d9e6e72b..75011adfa 100644 --- a/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Currency; -use Thelia\Core\Event\Currency\CurrencyCreateEvent; - class CurrencyUpdateEvent extends CurrencyCreateEvent { protected $currency_id; diff --git a/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php index 36ce32617..e7b12238b 100644 --- a/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php @@ -68,8 +68,8 @@ class CustomerCreateOrUpdateEvent extends CustomerEvent * @param string $email * @param string $password plain password, don't put hash password, it will hashes again * @param $lang - * @param int $reseller if customer is a reseller - * @param int $sponsor customer's id sponsor + * @param int $reseller if customer is a reseller + * @param int $sponsor customer's id sponsor * @param float $discount * @param string $company * @param string $ref diff --git a/core/lib/Thelia/Core/Event/DefaultActionEvent.php b/core/lib/Thelia/Core/Event/DefaultActionEvent.php index af7477840..51e507a56 100644 --- a/core/lib/Thelia/Core/Event/DefaultActionEvent.php +++ b/core/lib/Thelia/Core/Event/DefaultActionEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event; -use Thelia\Core\Event\ActionEvent; - class DefaultActionEvent extends ActionEvent { } diff --git a/core/lib/Thelia/Core/Event/Document/DocumentCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Document/DocumentCreateOrUpdateEvent.php index 74deeacc1..a374bd43a 100644 --- a/core/lib/Thelia/Core/Event/Document/DocumentCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Document/DocumentCreateOrUpdateEvent.php @@ -66,7 +66,7 @@ class DocumentCreateOrUpdateEvent extends ActionEvent * * @param string $documentType Document type * ex : FileManager::TYPE_CATEGORY - * @param int $parentId Document parent id + * @param int $parentId Document parent id */ public function __construct($documentType, $parentId) { diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php index f465d92d3..4a515f8ef 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureAvEvent; - class FeatureAvCreateEvent extends FeatureAvEvent { protected $title; diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php index 85e97f890..06bafc2ec 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureAvEvent; - class FeatureAvDeleteEvent extends FeatureAvEvent { protected $featureAv_id; diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php index cd9d375aa..88235a5a0 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureAvCreateEvent; - class FeatureAvUpdateEvent extends FeatureAvCreateEvent { protected $featureAv_id; diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php index 34f49b541..b5654f6a3 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureEvent; - class FeatureCreateEvent extends FeatureEvent { protected $title; diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php index 5d53bf4bd..ea7a52f0a 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureEvent; - class FeatureDeleteEvent extends FeatureEvent { protected $feature_id; diff --git a/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php index 55c6cd651..1dd96f54d 100644 --- a/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Feature; -use Thelia\Core\Event\Feature\FeatureCreateEvent; - class FeatureUpdateEvent extends FeatureCreateEvent { protected $feature_id; diff --git a/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductDeleteEvent.php b/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductDeleteEvent.php index 73cb88013..f0e07e37f 100644 --- a/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductDeleteEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\FeatureProduct; -use Thelia\Core\Event\FeatureProduct\FeatureProductEvent; use Thelia\Model\FeatureProduct; class FeatureProductDeleteEvent extends FeatureProductEvent diff --git a/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductUpdateEvent.php b/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductUpdateEvent.php index 8cb90dfdd..37186f4a9 100644 --- a/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductUpdateEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\FeatureProduct; -use Thelia\Core\Event\FeatureProduct\FeatureProductEvent; use Thelia\Model\FeatureProduct; class FeatureProductUpdateEvent extends FeatureProductEvent diff --git a/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php index 162d6c896..c45b77632 100644 --- a/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Folder; -use Thelia\Core\Event\Folder\FolderEvent; /** * Class FolderCreateEvent diff --git a/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php index 4dd251179..f20a35bdb 100644 --- a/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Folder; -use Thelia\Core\Event\Folder\FolderEvent; /** * Class FolderDeleteEvent diff --git a/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php index d6bf24297..2f39e1c7d 100644 --- a/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php +++ b/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Folder; -use Thelia\Core\Event\Folder\FolderEvent; /** * Class FolderToggleVisibilityEvent diff --git a/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php index e88026b85..258668b16 100644 --- a/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Folder; -use Thelia\Core\Event\Folder\FolderCreateEvent; /** * Class FolderUpdateEvent diff --git a/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php index 0153688a4..1f37ff7af 100644 --- a/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php @@ -63,8 +63,8 @@ class ImageCreateOrUpdateEvent extends ActionEvent * Constructor * * @param string $imageType Image type - * ex : FileManager::TYPE_CATEGORY - * @param int $parentId Image parent id + * ex : FileManager::TYPE_CATEGORY + * @param int $parentId Image parent id */ public function __construct($imageType, $parentId) { @@ -90,8 +90,6 @@ class ImageCreateOrUpdateEvent extends ActionEvent return $this->locale; } - - /** * Set Image to save * diff --git a/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php b/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php index d3ba94374..ad1319f42 100644 --- a/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php @@ -53,7 +53,7 @@ class ImageDeleteEvent extends ActionEvent * * @param CategoryImage|ProductImage|ContentImage|FolderImage $imageToDelete Image about to be deleted * @param string $imageType Image type - * ex : FileManager::TYPE_CATEGORY + * ex : FileManager::TYPE_CATEGORY */ public function __construct($imageToDelete, $imageType) { diff --git a/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php index fc20c2c81..2957d2c2d 100644 --- a/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Message; -use Thelia\Core\Event\Message\MessageEvent; - class MessageCreateEvent extends MessageEvent { protected $message_name; diff --git a/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php index a40b19a27..950daebde 100644 --- a/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Message; -use Thelia\Core\Event\Message\MessageEvent; - class MessageDeleteEvent extends MessageEvent { protected $message_id; diff --git a/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php index b1446bfce..56e4d57a0 100644 --- a/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Message; -use Thelia\Core\Event\Message\MessageCreateEvent; class MessageUpdateEvent extends MessageCreateEvent { diff --git a/core/lib/Thelia/Core/Event/Order/OrderEvent.php b/core/lib/Thelia/Core/Event/Order/OrderEvent.php index f35f343d2..282a71207 100644 --- a/core/lib/Thelia/Core/Event/Order/OrderEvent.php +++ b/core/lib/Thelia/Core/Event/Order/OrderEvent.php @@ -214,7 +214,7 @@ class OrderEvent extends ActionEvent } /** - * @param Response $response + * @param Response $response * @return $this */ public function setResponse(Response $response) diff --git a/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php b/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php index 7b6754097..da48db139 100644 --- a/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php +++ b/core/lib/Thelia/Core/Event/Order/OrderManualEvent.php @@ -56,6 +56,7 @@ class OrderManualEvent extends OrderEvent public function setOrder(Order $order) { $this->order = $order; + return $this; } @@ -65,6 +66,7 @@ class OrderManualEvent extends OrderEvent public function setPlacedOrder(Order $order) { $this->placedOrder = $order; + return $this; } @@ -74,6 +76,7 @@ class OrderManualEvent extends OrderEvent public function setInvoiceAddress($address) { $this->invoiceAddress = $address; + return $this; } @@ -83,6 +86,7 @@ class OrderManualEvent extends OrderEvent public function setDeliveryAddress($address) { $this->deliveryAddress = $address; + return $this; } @@ -92,6 +96,7 @@ class OrderManualEvent extends OrderEvent public function setDeliveryModule($module) { $this->deliveryModule = $module; + return $this; } @@ -101,6 +106,7 @@ class OrderManualEvent extends OrderEvent public function setPaymentModule($module) { $this->paymentModule = $module; + return $this; } @@ -110,6 +116,7 @@ class OrderManualEvent extends OrderEvent public function setPostage($postage) { $this->postage = $postage; + return $this; } @@ -119,6 +126,7 @@ class OrderManualEvent extends OrderEvent public function setRef($ref) { $this->ref = $ref; + return $this; } @@ -128,6 +136,7 @@ class OrderManualEvent extends OrderEvent public function setStatus($status) { $this->status = $status; + return $this; } @@ -227,6 +236,7 @@ class OrderManualEvent extends OrderEvent public function setCurrency($currency) { $this->currency = $currency; + return $this; } @@ -238,6 +248,7 @@ class OrderManualEvent extends OrderEvent public function setLang($lang) { $this->lang = $lang; + return $this; } @@ -249,6 +260,7 @@ class OrderManualEvent extends OrderEvent public function setCart($cart) { $this->cart = $cart; + return $this; } @@ -260,6 +272,7 @@ class OrderManualEvent extends OrderEvent public function setCustomer($customer) { $this->customer = $customer; + return $this; } diff --git a/core/lib/Thelia/Core/Event/Order/OrderPaymentEvent.php b/core/lib/Thelia/Core/Event/Order/OrderPaymentEvent.php index 9881afc82..1e15c2dfc 100644 --- a/core/lib/Thelia/Core/Event/Order/OrderPaymentEvent.php +++ b/core/lib/Thelia/Core/Event/Order/OrderPaymentEvent.php @@ -44,7 +44,8 @@ class OrderPaymentEvent extends ActionEvent */ protected $response; - public function __construct(Order $order) { + public function __construct(Order $order) + { $this->order = $order; } @@ -79,5 +80,4 @@ class OrderPaymentEvent extends ActionEvent return null !== $this->response; } - -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php index c6a35a660..1d082fd6d 100644 --- a/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php +++ b/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Product; -use Thelia\Core\Event\Product\ProductEvent; - class ProductToggleVisibilityEvent extends ProductEvent { } diff --git a/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php b/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php index 228633d87..7bde5599a 100644 --- a/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Product; -use Thelia\Core\Event\Product\ProductCreateEvent; - class ProductUpdateEvent extends ProductCreateEvent { protected $product_id; diff --git a/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php index f73aba820..03160ffb6 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; use Thelia\Model\Template; class TemplateAddAttributeEvent extends TemplateEvent { diff --git a/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php index c718ea78e..900007853 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; use Thelia\Model\Template; class TemplateAddFeatureEvent extends TemplateEvent { diff --git a/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php index e8b1cfb1a..4cb676481 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; - class TemplateCreateEvent extends TemplateEvent { protected $template_name; diff --git a/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php index f3381678a..a9c3f978e 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; use Thelia\Model\Template; class TemplateDeleteAttributeEvent extends TemplateEvent diff --git a/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php index cda8c9eea..b5c2efca6 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; - class TemplateDeleteEvent extends TemplateEvent { protected $template_id; diff --git a/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php index a2d795402..0c5c75eef 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateEvent; use Thelia\Model\Template; class TemplateDeleteFeatureEvent extends TemplateEvent diff --git a/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php index aaf39708f..9f2c22a9c 100644 --- a/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Event\Template; -use Thelia\Core\Event\Template\TemplateCreateEvent; - class TemplateUpdateEvent extends TemplateCreateEvent { protected $template_id; diff --git a/core/lib/Thelia/Core/EventListener/RequestListener.php b/core/lib/Thelia/Core/EventListener/RequestListener.php index 4b9c242b4..a3f7aad4e 100644 --- a/core/lib/Thelia/Core/EventListener/RequestListener.php +++ b/core/lib/Thelia/Core/EventListener/RequestListener.php @@ -27,7 +27,6 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; use Thelia\Core\Translation\Translator; - /** * Class RequestListener * @package Thelia\Core\EventListener @@ -91,4 +90,4 @@ class RequestListener implements EventSubscriberInterface KernelEvents::REQUEST => array("registerValidatorTranslator", 128) ); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/Security/Authentication/AdminUsernamePasswordFormAuthenticator.php b/core/lib/Thelia/Core/Security/Authentication/AdminUsernamePasswordFormAuthenticator.php index 00201c0f1..256649ae0 100644 --- a/core/lib/Thelia/Core/Security/Authentication/AdminUsernamePasswordFormAuthenticator.php +++ b/core/lib/Thelia/Core/Security/Authentication/AdminUsernamePasswordFormAuthenticator.php @@ -26,7 +26,6 @@ namespace Thelia\Core\Security\Authentication; use Symfony\Component\HttpFoundation\Request; - use Thelia\Core\Security\UserProvider\AdminUserProvider; use Thelia\Form\AdminLogin; diff --git a/core/lib/Thelia/Core/Security/Authentication/TokenAuthenticator.php b/core/lib/Thelia/Core/Security/Authentication/TokenAuthenticator.php index c348628ab..840394d4f 100644 --- a/core/lib/Thelia/Core/Security/Authentication/TokenAuthenticator.php +++ b/core/lib/Thelia/Core/Security/Authentication/TokenAuthenticator.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Security\Authentication; - use Thelia\Core\Security\UserProvider\TokenUserProvider; use Thelia\Core\Security\Exception\TokenAuthenticationException; diff --git a/core/lib/Thelia/Core/Security/Authentication/UsernamePasswordFormAuthenticator.php b/core/lib/Thelia/Core/Security/Authentication/UsernamePasswordFormAuthenticator.php index 2b85bb7f3..e016233c2 100644 --- a/core/lib/Thelia/Core/Security/Authentication/UsernamePasswordFormAuthenticator.php +++ b/core/lib/Thelia/Core/Security/Authentication/UsernamePasswordFormAuthenticator.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Security\Authentication; - use Symfony\Component\HttpFoundation\Request; use Thelia\Core\Security\UserProvider\UserProviderInterface; diff --git a/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php b/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php index c7ee4207a..0ed80d556 100644 --- a/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php +++ b/core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Security\UserProvider; - use Thelia\Model\AdminQuery; class AdminUserProvider implements UserProviderInterface diff --git a/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php b/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php index 730bdcfeb..3193e3a45 100644 --- a/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php +++ b/core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Security\UserProvider; - use Thelia\Model\CustomerQuery; class CustomerUserProvider implements UserProviderInterface { diff --git a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php index 000716c9a..35912679d 100644 --- a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php @@ -23,7 +23,6 @@ namespace Thelia\Core\Template\Element; - use Thelia\Core\Template\Loop\Argument\Argument; use Propel\Runtime\ActiveQuery\ModelCriteria; use Thelia\Model\Tools\ModelCriteriaTools; diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php index dec43f93c..7a6e3bf8f 100644 --- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php @@ -337,8 +337,7 @@ abstract class BaseLoop public function count() { $hash = $this->args->getHash(); - if(false === isset(self::$cacheCount[$hash])) - { + if (false === isset(self::$cacheCount[$hash])) { $count = 0; if ($this instanceof PropelSearchLoopInterface) { $searchModelCriteria = $this->buildModelCriteria(); @@ -368,8 +367,7 @@ abstract class BaseLoop public function exec(&$pagination) { $hash = $this->args->getHash(); - if(false === isset(self::$cacheLoopResult[$hash])) - { + if (false === isset(self::$cacheLoopResult[$hash])) { if ($this instanceof PropelSearchLoopInterface) { $searchModelCriteria = $this->buildModelCriteria(); if (null === $searchModelCriteria) { diff --git a/core/lib/Thelia/Core/Template/Element/LoopResult.php b/core/lib/Thelia/Core/Template/Element/LoopResult.php index a8e093d9b..66a972872 100644 --- a/core/lib/Thelia/Core/Template/Element/LoopResult.php +++ b/core/lib/Thelia/Core/Template/Element/LoopResult.php @@ -26,7 +26,6 @@ namespace Thelia\Core\Template\Element; use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Util\PropelModelPager; - class LoopResult implements \Iterator { private $position; @@ -152,7 +151,7 @@ class LoopResult implements \Iterator * Checks if current position is valid * @link http://php.net/manual/en/iterator.valid.php * @return boolean The return value will be casted to boolean and then evaluated. - * Returns true on success or false on failure. + * Returns true on success or false on failure. */ public function valid() { diff --git a/core/lib/Thelia/Core/Template/Loop/Accessory.php b/core/lib/Thelia/Core/Template/Loop/Accessory.php index 45be652e4..04f121b01 100644 --- a/core/lib/Thelia/Core/Template/Loop/Accessory.php +++ b/core/lib/Thelia/Core/Template/Loop/Accessory.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Template\Loop; - - use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Core\Template\Element\LoopResult; diff --git a/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php b/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php index eb815c708..c272592eb 100644 --- a/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php +++ b/core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php @@ -127,7 +127,7 @@ class ArgumentCollection implements \Iterator * Checks if current position is valid * @link http://php.net/manual/en/iterator.valid.php * @return boolean The return value will be casted to boolean and then evaluated. - * Returns true on success or false on failure. + * Returns true on success or false on failure. */ public function valid() { diff --git a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php index 535f47c2a..9ef9d33da 100644 --- a/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php +++ b/core/lib/Thelia/Core/Template/Loop/AssociatedContent.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Template\Loop; - - use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Core\Template\Element\LoopResult; diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php index 5ee8e639e..b5dbd4de0 100644 --- a/core/lib/Thelia/Core/Template/Loop/Category.php +++ b/core/lib/Thelia/Core/Template/Loop/Category.php @@ -194,7 +194,6 @@ class Category extends BaseI18nLoop implements PropelSearchLoopInterface { foreach ($loopResult->getResultDataCollection() as $category) { - /* * no cause pagination lost : * if ($this->getNotEmpty() && $category->countAllProducts() == 0) continue; @@ -254,7 +253,6 @@ class Category extends BaseI18nLoop implements PropelSearchLoopInterface ; } - $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php index 67bf0fbd3..2e7391c95 100644 --- a/core/lib/Thelia/Core/Template/Loop/Delivery.php +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -30,7 +30,6 @@ use Thelia\Model\CountryQuery; use Thelia\Module\BaseModule; use Thelia\Module\DeliveryModuleInterface; - /** * Class Delivery * @package Thelia\Core\Template\Loop diff --git a/core/lib/Thelia/Core/Template/Loop/Lang.php b/core/lib/Thelia/Core/Template/Loop/Lang.php index 10350a7db..64066ab89 100644 --- a/core/lib/Thelia/Core/Template/Loop/Lang.php +++ b/core/lib/Thelia/Core/Template/Loop/Lang.php @@ -87,7 +87,6 @@ class Lang extends BaseLoop implements PropelSearchLoopInterface $search->filterById($exclude, Criteria::NOT_IN); } - $orders = $this->getOrder(); foreach ($orders as $order) { diff --git a/core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php b/core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php index b596f9d81..a0ef6601a 100644 --- a/core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php +++ b/core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php @@ -46,7 +46,7 @@ abstract class AbstractSmartyPlugin $array = explode(',', $commaSeparatedValues); - if (array_walk($array, function(&$item) { + if (array_walk($array, function (&$item) { $item = strtoupper(trim($item)); })) { return $array; diff --git a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php index d595fdbe4..90026b6e8 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php +++ b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php @@ -23,8 +23,6 @@ namespace Thelia\Core\Template\Smarty\Assets; - -use Thelia\Log\Tlog; use Thelia\Tools\URL; use Thelia\Core\Template\Assets\AssetManagerInterface; diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php index fac094dd6..92ad357f2 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php @@ -109,8 +109,7 @@ class Form extends AbstractSmartyPlugin if (null != $form) { // Re-use the form $instance = $form; - } - else { + } else { // Create a new one $class = new \ReflectionClass($formClass); diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php index 5f88068ac..a66a1ed03 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php @@ -54,7 +54,7 @@ class Module extends AbstractSmartyPlugin * AdminIncludes/.html file, and fetch it as a Smarty template. * - countvar : this is the name of a template variable where the number of found modules includes will be assigned. * - * @param array $params + * @param array $params * @param \Smarty_Internal_Template $template * @internal param \Thelia\Core\Template\Smarty\Plugins\unknown $smarty * diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index cffd16479..27b8fbfa5 100644 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -7,10 +7,8 @@ use \Symfony\Component\EventDispatcher\EventDispatcherInterface; use \Smarty; - use Thelia\Core\Template\ParserInterface; - use Thelia\Core\Template\Exception\ResourceNotFoundException; use Thelia\Core\Template\ParserContext; use Thelia\Core\Template\TemplateDefinition; diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 9eb47b5ef..2c8148c3e 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -42,7 +42,6 @@ use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Yaml\Yaml; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; -use Thelia\Core\Bundle; use Thelia\Core\Event\TheliaEvents; use Thelia\Config\DatabaseConfiguration; use Thelia\Config\DefinePropel; diff --git a/core/lib/Thelia/Core/TheliaContainerBuilder.php b/core/lib/Thelia/Core/TheliaContainerBuilder.php index 7e49a8141..6a1f896e9 100644 --- a/core/lib/Thelia/Core/TheliaContainerBuilder.php +++ b/core/lib/Thelia/Core/TheliaContainerBuilder.php @@ -35,7 +35,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; class TheliaContainerBuilder extends ContainerBuilder { - public function compile(){} + public function compile() {} public function customCompile() { diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php index 77219fbab..339ea12d2 100644 --- a/core/lib/Thelia/Core/TheliaHttpKernel.php +++ b/core/lib/Thelia/Core/TheliaHttpKernel.php @@ -67,8 +67,8 @@ class TheliaHttpKernel extends HttpKernel * * @param Request $request A Request instance * @param integer $type The type of the request - * (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) - * @param Boolean $catch Whether to catch exceptions or not + * (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) + * @param Boolean $catch Whether to catch exceptions or not * * @return Response A Response instance * diff --git a/core/lib/Thelia/Coupon/BaseFacade.php b/core/lib/Thelia/Coupon/BaseFacade.php index b9bf65204..51a43064f 100644 --- a/core/lib/Thelia/Coupon/BaseFacade.php +++ b/core/lib/Thelia/Coupon/BaseFacade.php @@ -128,6 +128,7 @@ class BaseFacade implements FacadeInterface public function getCartTotalTaxPrice() { $taxCountry = $this->getContainer()->get('thelia.taxEngine')->getDeliveryCountry(); + return $this->getCart()->getTaxedAmount($taxCountry); } diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index 23247e658..9518c3214 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -29,7 +29,6 @@ use Thelia\Coupon\FacadeInterface; use Thelia\Condition\ConditionCollection; use Thelia\Condition\ConditionOrganizerInterface; - /** * Assist in writing a CouponInterface * @@ -139,9 +138,9 @@ abstract class CouponAbstract implements CouponInterface * @param bool $isRemovingPostage If Coupon is removing postage * @param bool $isAvailableOnSpecialOffers If available on Product already * on special offer price - * @param bool $isEnabled False if Coupon is disabled by admin - * @param int $maxUsage How many usage left - * @param \Datetime $expirationDate When the Code is expiring + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring * * @return $this */ diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index 7f58d282c..822af01c9 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -76,9 +76,9 @@ interface CouponInterface * @param bool $isRemovingPostage If Coupon is removing postage * @param bool $isAvailableOnSpecialOffers If available on Product already * on special offer price - * @param bool $isEnabled False if Coupon is disabled by admin - * @param int $maxUsage How many usage left - * @param \Datetime $expirationDate When the Code is expiring + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring */ public function set( FacadeInterface $facade, diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php index df28b6a11..e9d7b208e 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -23,8 +23,6 @@ namespace Thelia\Coupon\Type; - - /** * Allow to remove an amount from the checkout total * diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index cc04dc787..747d55a72 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -25,7 +25,6 @@ namespace Thelia\Coupon\Type; use Thelia\Coupon\FacadeInterface; - /** * @package Coupon * @author Guillaume MOREL @@ -59,9 +58,9 @@ class RemoveXPercent extends CouponAbstract * @param bool $isRemovingPostage If Coupon is removing postage * @param bool $isAvailableOnSpecialOffers If available on Product already * on special offer price - * @param bool $isEnabled False if Coupon is disabled by admin - * @param int $maxUsage How many usage left - * @param \Datetime $expirationDate When the Code is expiring + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring * * @return $this */ @@ -104,7 +103,6 @@ class RemoveXPercent extends CouponAbstract ); } - return round($this->facade->getCartTotalTaxPrice() * $this->percentage/100, 2); } diff --git a/core/lib/Thelia/Exception/CustomerException.php b/core/lib/Thelia/Exception/CustomerException.php index 48abf7020..e2381ca26 100644 --- a/core/lib/Thelia/Exception/CustomerException.php +++ b/core/lib/Thelia/Exception/CustomerException.php @@ -23,7 +23,6 @@ namespace Thelia\Exception; - /** * Class CustomerException * @package Thelia\Exception @@ -31,4 +30,4 @@ namespace Thelia\Exception; */ class CustomerException extends \RuntimeException { -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Form/AdministratorCreationForm.php b/core/lib/Thelia/Form/AdministratorCreationForm.php index 9ad3e3421..669b72a9a 100644 --- a/core/lib/Thelia/Form/AdministratorCreationForm.php +++ b/core/lib/Thelia/Form/AdministratorCreationForm.php @@ -118,12 +118,13 @@ class AdministratorCreationForm extends BaseForm ; } - protected function getLocaleList() { + protected function getLocaleList() + { $locales = array(); $list = LangQuery::create()->find(); - foreach($list as $item) { + foreach ($list as $item) { $locales[$item->getLocale()] = $item->getLocale(); } diff --git a/core/lib/Thelia/Form/Area/AreaModificationForm.php b/core/lib/Thelia/Form/Area/AreaModificationForm.php index a2a5ff12e..6c9d52f7f 100644 --- a/core/lib/Thelia/Form/Area/AreaModificationForm.php +++ b/core/lib/Thelia/Form/Area/AreaModificationForm.php @@ -24,7 +24,6 @@ namespace Thelia\Form\Area; use Symfony\Component\Validator\Constraints\GreaterThan; - /** * Class AreaModificationForm * @package Thelia\Form\Shipping diff --git a/core/lib/Thelia/Form/ContentModificationForm.php b/core/lib/Thelia/Form/ContentModificationForm.php index b0130b2d2..dbe427b9f 100644 --- a/core/lib/Thelia/Form/ContentModificationForm.php +++ b/core/lib/Thelia/Form/ContentModificationForm.php @@ -24,7 +24,6 @@ namespace Thelia\Form; use Symfony\Component\Validator\Constraints\GreaterThan; -use Thelia\Form\StandardDescriptionFieldsTrait; /** * Class ContentModificationForm diff --git a/core/lib/Thelia/Form/CustomerLogin.php b/core/lib/Thelia/Form/CustomerLogin.php index eb24e62d0..8c2f2fa6d 100644 --- a/core/lib/Thelia/Form/CustomerLogin.php +++ b/core/lib/Thelia/Form/CustomerLogin.php @@ -24,7 +24,6 @@ namespace Thelia\Form; use Symfony\Component\Validator\Constraints; - use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ExecutionContextInterface; use Thelia\Core\Translation\Translator; diff --git a/core/lib/Thelia/Form/Image/DocumentModification.php b/core/lib/Thelia/Form/Image/DocumentModification.php index 49f1a53fb..199a874b4 100644 --- a/core/lib/Thelia/Form/Image/DocumentModification.php +++ b/core/lib/Thelia/Form/Image/DocumentModification.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Form\Image; - use Symfony\Component\Validator\Constraints\NotBlank; use Thelia\Core\Translation\Translator; use Thelia\Form\BaseForm; diff --git a/core/lib/Thelia/Form/MailingSystemModificationForm.php b/core/lib/Thelia/Form/MailingSystemModificationForm.php index c30025bd1..2ae325b20 100644 --- a/core/lib/Thelia/Form/MailingSystemModificationForm.php +++ b/core/lib/Thelia/Form/MailingSystemModificationForm.php @@ -22,10 +22,8 @@ /*************************************************************************************/ namespace Thelia\Form; - use Thelia\Core\Translation\Translator; - /** * Class MailingSystemModificationForm * @package Thelia\Form diff --git a/core/lib/Thelia/Form/TaxCreationForm.php b/core/lib/Thelia/Form/TaxCreationForm.php index 539eda8c6..8d91bdc4a 100644 --- a/core/lib/Thelia/Form/TaxCreationForm.php +++ b/core/lib/Thelia/Form/TaxCreationForm.php @@ -41,8 +41,8 @@ class TaxCreationForm extends BaseForm protected $taxEngine = null; - public function __construct(Request $request, $type= "form", $data = array(), $options = array(), TaxEngine $taxEngine = null) { - + public function __construct(Request $request, $type= "form", $data = array(), $options = array(), TaxEngine $taxEngine = null) + { $this->taxEngine = $taxEngine; parent::__construct($request, $type, $data, $options); diff --git a/core/lib/Thelia/Log/AbstractTlogDestination.php b/core/lib/Thelia/Log/AbstractTlogDestination.php index 718679d76..6c4fd2aff 100644 --- a/core/lib/Thelia/Log/AbstractTlogDestination.php +++ b/core/lib/Thelia/Log/AbstractTlogDestination.php @@ -49,7 +49,6 @@ abstract class AbstractTlogDestination // Appliquer les changements if ($apply_changes) $this->configure(); - return true; } } diff --git a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php index 2f21583a3..ff5119131 100644 --- a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php +++ b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php @@ -46,11 +46,13 @@ class TlogDestinationFile extends AbstractTlogDestination parent::__construct(); } - protected function getFilePath() { + protected function getFilePath() + { return $this->getConfig(self::VAR_PATH_FILE); } - protected function getOpenMode() { + protected function getOpenMode() + { return strtolower($this->getConfig(self::VAR_MODE, self::VALEUR_MODE_DEFAULT)) == 'a' ? 'a' : 'w'; } diff --git a/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php b/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php index 4bb5e73d5..4e0c3e94e 100644 --- a/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php +++ b/core/lib/Thelia/Log/Destination/TlogDestinationRotatingFile.php @@ -23,7 +23,6 @@ namespace Thelia\Log\Destination; - use Thelia\Log\TlogDestinationConfig; use Thelia\Core\Translation\Translator; @@ -98,4 +97,4 @@ class TlogDestinationRotatingFile extends TlogDestinationFile return $arr; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Log/Tlog.php b/core/lib/Thelia/Log/Tlog.php index 7e3554755..3073ad055 100644 --- a/core/lib/Thelia/Log/Tlog.php +++ b/core/lib/Thelia/Log/Tlog.php @@ -104,7 +104,7 @@ class Tlog Implements LoggerInterface /** * */ - private function __construct(){} + private function __construct() {} /** * @@ -665,11 +665,9 @@ class Tlog Implements LoggerInterface if ($message instanceof \Exception) { $text = $message->getMessage()."\n".$message->getTraceAsString(); - } - else if (is_scalar($message) === false) { + } elseif (is_scalar($message) === false) { $text = print_r($message, 1); - } - else { + } else { $text = $message; } diff --git a/core/lib/Thelia/Model/Accessory.php b/core/lib/Thelia/Model/Accessory.php index f24aab680..e21b98d7e 100644 --- a/core/lib/Thelia/Model/Accessory.php +++ b/core/lib/Thelia/Model/Accessory.php @@ -7,8 +7,8 @@ use Thelia\Core\Event\TheliaEvents; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\AccessoryEvent; -class Accessory extends BaseAccessory { - +class Accessory extends BaseAccessory +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; @@ -16,7 +16,8 @@ class Accessory extends BaseAccessory { /** * Calculate next position relative to our product */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByProductId($this->getProductId()); } diff --git a/core/lib/Thelia/Model/AccessoryQuery.php b/core/lib/Thelia/Model/AccessoryQuery.php index 28c89f005..e6b776656 100644 --- a/core/lib/Thelia/Model/AccessoryQuery.php +++ b/core/lib/Thelia/Model/AccessoryQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AccessoryQuery as BaseAccessoryQuery; - /** * Skeleton subclass for performing query and update operations on the 'accessory' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AccessoryQuery as BaseAccessoryQuery; * long as it does not already exist in the output directory. * */ -class AccessoryQuery extends BaseAccessoryQuery { - +class AccessoryQuery extends BaseAccessoryQuery +{ } // AccessoryQuery diff --git a/core/lib/Thelia/Model/Address.php b/core/lib/Thelia/Model/Address.php index 20bf10bd8..827d1e08f 100644 --- a/core/lib/Thelia/Model/Address.php +++ b/core/lib/Thelia/Model/Address.php @@ -8,8 +8,8 @@ use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\Address as BaseAddress; - -class Address extends BaseAddress { +class Address extends BaseAddress +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** @@ -33,6 +33,7 @@ class Address extends BaseAddress { public function preInsert(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_CREATEADDRESS, new AddressEvent($this)); + return true; } @@ -53,6 +54,7 @@ class Address extends BaseAddress { public function preUpdate(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_UPDATEADDRESS, new AddressEvent($this)); + return true; } @@ -72,11 +74,12 @@ class Address extends BaseAddress { */ public function preDelete(ConnectionInterface $con = null) { - if($this->getIsDefault()) { + if ($this->getIsDefault()) { return false; } $this->dispatchEvent(TheliaEvents::BEFORE_DELETEADDRESS, new AddressEvent($this)); + return true; } diff --git a/core/lib/Thelia/Model/AddressQuery.php b/core/lib/Thelia/Model/AddressQuery.php index f84c723c3..ae4fb7ba6 100644 --- a/core/lib/Thelia/Model/AddressQuery.php +++ b/core/lib/Thelia/Model/AddressQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AddressQuery as BaseAddressQuery; - /** * Skeleton subclass for performing query and update operations on the 'address' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AddressQuery as BaseAddressQuery; * long as it does not already exist in the output directory. * */ -class AddressQuery extends BaseAddressQuery { - +class AddressQuery extends BaseAddressQuery +{ } // AddressQuery diff --git a/core/lib/Thelia/Model/Admin.php b/core/lib/Thelia/Model/Admin.php index df8e5ebf5..355258336 100644 --- a/core/lib/Thelia/Model/Admin.php +++ b/core/lib/Thelia/Model/Admin.php @@ -31,7 +31,7 @@ class Admin extends BaseAdmin implements UserInterface { $profileId = $this->getProfileId(); - if( null === $profileId || 0 === $profileId ) { + if (null === $profileId || 0 === $profileId) { return AdminResources::SUPERADMINISTRATOR; } @@ -48,10 +48,10 @@ class Admin extends BaseAdmin implements UserInterface ->find(); $userPermissions = array(); - foreach($userResourcePermissionsQuery as $userResourcePermission) { + foreach ($userResourcePermissionsQuery as $userResourcePermission) { $userPermissions[$userResourcePermission->getVirtualColumn('code')] = new AccessManager($userResourcePermission->getAccess()); } - foreach($userModulePermissionsQuery as $userModulePermission) { + foreach ($userModulePermissionsQuery as $userModulePermission) { $userPermissions['module'][strtolower($userModulePermission->getVirtualColumn('code'))] = new AccessManager($userModulePermission->getAccess()); } @@ -75,8 +75,9 @@ class Admin extends BaseAdmin implements UserInterface throw new \InvalidArgumentException("customer password is mandatory on creation"); } - if($password !== null && trim($password) != "") { + if ($password !== null && trim($password) != "") { $this->setAlgo("PASSWORD_BCRYPT"); + return parent::setPassword(password_hash($password, PASSWORD_BCRYPT)); } @@ -88,55 +89,62 @@ class Admin extends BaseAdmin implements UserInterface */ public function checkPassword($password) { - return password_verify($password, $this->password); + return password_verify($password, $this->password); } - /** + /** * {@inheritDoc} */ - public function getUsername() { + public function getUsername() + { return $this->getLogin(); } /** * {@inheritDoc} */ - public function eraseCredentials() { - $this->setPassword(null); + public function eraseCredentials() + { + $this->setPassword(null); } /** * {@inheritDoc} */ - public function getRoles() { - return array(new Role('ADMIN')); + public function getRoles() + { + return array(new Role('ADMIN')); } /** * {@inheritDoc} */ - public function getToken() { + public function getToken() + { return $this->getRememberMeToken(); } /** * {@inheritDoc} */ - public function setToken($token) { + public function setToken($token) + { $this->setRememberMeToken($token)->save(); } /** * {@inheritDoc} */ - public function getSerial() { + public function getSerial() + { return $this->getRememberMeSerial(); } /** * {@inheritDoc} */ - public function setSerial($serial) { + public function setSerial($serial) + { $this->setRememberMeSerial($serial)->save(); } } diff --git a/core/lib/Thelia/Model/AdminLog.php b/core/lib/Thelia/Model/AdminLog.php index 169891c67..b991d0f76 100644 --- a/core/lib/Thelia/Model/AdminLog.php +++ b/core/lib/Thelia/Model/AdminLog.php @@ -10,34 +10,32 @@ use Thelia\Model\Base\Admin as BaseAdminUser; class AdminLog extends BaseAdminLog { /** - * A simple helper to insert an entry in the admin log - * + * A simple helper to insert an entry in the admin log + * * @param $resource * @param $action * @param $message * @param Request $request * @param Base\Admin $adminUser */ - public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true) { - - $log = new AdminLog(); + public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true) + { + $log = new AdminLog(); $log - ->setAdminLogin($adminUser !== null ? $adminUser->getLogin() : '') - ->setAdminFirstname($adminUser !== null ? $adminUser->getFirstname() : '') - ->setAdminLastname($adminUser !== null ? $adminUser->getLastname() : '') - ->setResource($resource) - ->setAction($action) + ->setAdminLogin($adminUser !== null ? $adminUser->getLogin() : '') + ->setAdminFirstname($adminUser !== null ? $adminUser->getFirstname() : '') + ->setAdminLastname($adminUser !== null ? $adminUser->getLastname() : '') + ->setResource($resource) + ->setAction($action) ->setMessage($message) - ->setRequest($request->toString($withRequestContent)) - ; + ->setRequest($request->toString($withRequestContent)); try { - $log->save(); - } - catch (\Exception $ex) { - Tlog::getInstance()->err("Failed to insert new entry in AdminLog: {ex}", array('ex' => $ex)); + $log->save(); + } catch (\Exception $ex) { + Tlog::getInstance()->err("Failed to insert new entry in AdminLog: {ex}", array('ex' => $ex)); } - } -} \ No newline at end of file + } +} diff --git a/core/lib/Thelia/Model/AdminLogQuery.php b/core/lib/Thelia/Model/AdminLogQuery.php index 7113a4658..a443767db 100644 --- a/core/lib/Thelia/Model/AdminLogQuery.php +++ b/core/lib/Thelia/Model/AdminLogQuery.php @@ -5,7 +5,6 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\AdminLogQuery as BaseAdminLogQuery; - /** * Skeleton subclass for performing query and update operations on the 'admin_log' table. * @@ -19,11 +18,11 @@ use Thelia\Model\Base\AdminLogQuery as BaseAdminLogQuery; class AdminLogQuery extends BaseAdminLogQuery { /** - * @param null $login - * @param null $minDate - * @param null $maxDate - * @param null $resources - * @param null $actions + * @param null $login + * @param null $minDate + * @param null $maxDate + * @param null $resources + * @param null $actions * * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection */ @@ -31,25 +30,25 @@ class AdminLogQuery extends BaseAdminLogQuery { $search = self::create(); - if(null !== $minDate) { + if (null !== $minDate) { $search->filterByCreatedAt($minDate, Criteria::GREATER_EQUAL); } - if(null !== $maxDate) { + if (null !== $maxDate) { $maxDateObject = new \DateTime($maxDate); $maxDateObject->add(new \DateInterval('P1D')); $search->filterByCreatedAt(date('Y-m-d', $maxDateObject->getTimestamp()), Criteria::LESS_THAN); } - if(null !== $resources) { + if (null !== $resources) { $search->filterByResource($resources); } - if(null !== $actions) { + if (null !== $actions) { $search->filterByAction($actions); } - if(null !== $login) { + if (null !== $login) { $search->filterByAdminLogin($login); } diff --git a/core/lib/Thelia/Model/AdminQuery.php b/core/lib/Thelia/Model/AdminQuery.php index 81fced3af..affc199c3 100644 --- a/core/lib/Thelia/Model/AdminQuery.php +++ b/core/lib/Thelia/Model/AdminQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AdminQuery as BaseAdminQuery; - /** * Skeleton subclass for performing query and update operations on the 'admin' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AdminQuery as BaseAdminQuery; * long as it does not already exist in the output directory. * */ -class AdminQuery extends BaseAdminQuery { - +class AdminQuery extends BaseAdminQuery +{ } // AdminQuery diff --git a/core/lib/Thelia/Model/Area.php b/core/lib/Thelia/Model/Area.php index f826c0fcd..6d5ae93b9 100644 --- a/core/lib/Thelia/Model/Area.php +++ b/core/lib/Thelia/Model/Area.php @@ -7,8 +7,8 @@ use Thelia\Core\Event\Area\AreaEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\Area as BaseArea; -class Area extends BaseArea { - +class Area extends BaseArea +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; public function preInsert(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/AreaDeliveryModuleQuery.php b/core/lib/Thelia/Model/AreaDeliveryModuleQuery.php index 34be03b29..416daa8c9 100644 --- a/core/lib/Thelia/Model/AreaDeliveryModuleQuery.php +++ b/core/lib/Thelia/Model/AreaDeliveryModuleQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AreaDeliveryModuleQuery as BaseAreaDeliveryModuleQuery; - /** * Skeleton subclass for performing query and update operations on the 'area_delivery_module' table. * diff --git a/core/lib/Thelia/Model/AreaQuery.php b/core/lib/Thelia/Model/AreaQuery.php index ac9c5141a..a0463261a 100644 --- a/core/lib/Thelia/Model/AreaQuery.php +++ b/core/lib/Thelia/Model/AreaQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AreaQuery as BaseAreaQuery; - /** * Skeleton subclass for performing query and update operations on the 'area' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AreaQuery as BaseAreaQuery; * long as it does not already exist in the output directory. * */ -class AreaQuery extends BaseAreaQuery { - +class AreaQuery extends BaseAreaQuery +{ } // AreaQuery diff --git a/core/lib/Thelia/Model/Attribute.php b/core/lib/Thelia/Model/Attribute.php index 3439cac06..a7504ed63 100644 --- a/core/lib/Thelia/Model/Attribute.php +++ b/core/lib/Thelia/Model/Attribute.php @@ -7,8 +7,8 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\Attribute\AttributeEvent; -class Attribute extends BaseAttribute { - +class Attribute extends BaseAttribute +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; diff --git a/core/lib/Thelia/Model/AttributeAv.php b/core/lib/Thelia/Model/AttributeAv.php index bb0694eb5..e3e5be242 100644 --- a/core/lib/Thelia/Model/AttributeAv.php +++ b/core/lib/Thelia/Model/AttributeAv.php @@ -7,9 +7,8 @@ use Thelia\Core\Event\Attribute\AttributeAvEvent; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; - -class AttributeAv extends BaseAttributeAv { - +class AttributeAv extends BaseAttributeAv +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; @@ -17,7 +16,8 @@ class AttributeAv extends BaseAttributeAv { /** * when dealing with position, be sure to work insite the current attribute. */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByAttributeId($this->getAttributeId()); } @@ -77,4 +77,4 @@ class AttributeAv extends BaseAttributeAv { { $this->dispatchEvent(TheliaEvents::AFTER_DELETEATTRIBUTE_AV, new AttributeAvEvent($this)); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/AttributeAvI18n.php b/core/lib/Thelia/Model/AttributeAvI18n.php index ff1181262..689d013f1 100644 --- a/core/lib/Thelia/Model/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/AttributeAvI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeAvI18n as BaseAttributeAvI18n; -class AttributeAvI18n extends BaseAttributeAvI18n { - +class AttributeAvI18n extends BaseAttributeAvI18n +{ } diff --git a/core/lib/Thelia/Model/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/AttributeAvI18nQuery.php index 5b377a684..3ebf32f7c 100644 --- a/core/lib/Thelia/Model/AttributeAvI18nQuery.php +++ b/core/lib/Thelia/Model/AttributeAvI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeAvI18nQuery as BaseAttributeAvI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute_av_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AttributeAvI18nQuery as BaseAttributeAvI18nQuery; * long as it does not already exist in the output directory. * */ -class AttributeAvI18nQuery extends BaseAttributeAvI18nQuery { - +class AttributeAvI18nQuery extends BaseAttributeAvI18nQuery +{ } // AttributeAvI18nQuery diff --git a/core/lib/Thelia/Model/AttributeAvQuery.php b/core/lib/Thelia/Model/AttributeAvQuery.php index 763fbe498..f97d65bd6 100644 --- a/core/lib/Thelia/Model/AttributeAvQuery.php +++ b/core/lib/Thelia/Model/AttributeAvQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeAvQuery as BaseAttributeAvQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute_av' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AttributeAvQuery as BaseAttributeAvQuery; * long as it does not already exist in the output directory. * */ -class AttributeAvQuery extends BaseAttributeAvQuery { - +class AttributeAvQuery extends BaseAttributeAvQuery +{ } // AttributeAvQuery diff --git a/core/lib/Thelia/Model/AttributeCombination.php b/core/lib/Thelia/Model/AttributeCombination.php index 1c1a51c03..0761e6747 100644 --- a/core/lib/Thelia/Model/AttributeCombination.php +++ b/core/lib/Thelia/Model/AttributeCombination.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeCombination as BaseAttributeCombination; -class AttributeCombination extends BaseAttributeCombination { - +class AttributeCombination extends BaseAttributeCombination +{ } diff --git a/core/lib/Thelia/Model/AttributeCombinationQuery.php b/core/lib/Thelia/Model/AttributeCombinationQuery.php index 4f1a80738..2aaf7c109 100644 --- a/core/lib/Thelia/Model/AttributeCombinationQuery.php +++ b/core/lib/Thelia/Model/AttributeCombinationQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeCombinationQuery as BaseAttributeCombinationQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute_combination' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AttributeCombinationQuery as BaseAttributeCombinationQuery * long as it does not already exist in the output directory. * */ -class AttributeCombinationQuery extends BaseAttributeCombinationQuery { - +class AttributeCombinationQuery extends BaseAttributeCombinationQuery +{ } // AttributeCombinationQuery diff --git a/core/lib/Thelia/Model/AttributeI18n.php b/core/lib/Thelia/Model/AttributeI18n.php index 91c447cc9..5e1e80e99 100644 --- a/core/lib/Thelia/Model/AttributeI18n.php +++ b/core/lib/Thelia/Model/AttributeI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeI18n as BaseAttributeI18n; -class AttributeI18n extends BaseAttributeI18n { - +class AttributeI18n extends BaseAttributeI18n +{ } diff --git a/core/lib/Thelia/Model/AttributeI18nQuery.php b/core/lib/Thelia/Model/AttributeI18nQuery.php index 1f2177005..fbc05b8ed 100644 --- a/core/lib/Thelia/Model/AttributeI18nQuery.php +++ b/core/lib/Thelia/Model/AttributeI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeI18nQuery as BaseAttributeI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AttributeI18nQuery as BaseAttributeI18nQuery; * long as it does not already exist in the output directory. * */ -class AttributeI18nQuery extends BaseAttributeI18nQuery { - +class AttributeI18nQuery extends BaseAttributeI18nQuery +{ } // AttributeI18nQuery diff --git a/core/lib/Thelia/Model/AttributeQuery.php b/core/lib/Thelia/Model/AttributeQuery.php index 3dd1cc4b6..82a4b3845 100644 --- a/core/lib/Thelia/Model/AttributeQuery.php +++ b/core/lib/Thelia/Model/AttributeQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeQuery as BaseAttributeQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\AttributeQuery as BaseAttributeQuery; * long as it does not already exist in the output directory. * */ -class AttributeQuery extends BaseAttributeQuery { - +class AttributeQuery extends BaseAttributeQuery +{ } // AttributeQuery diff --git a/core/lib/Thelia/Model/AttributeTemplateQuery.php b/core/lib/Thelia/Model/AttributeTemplateQuery.php index 2b10c9896..5e29bbe41 100644 --- a/core/lib/Thelia/Model/AttributeTemplateQuery.php +++ b/core/lib/Thelia/Model/AttributeTemplateQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\AttributeTemplateQuery as BaseAttributeTemplateQuery; - /** * Skeleton subclass for performing query and update operations on the 'attribute_template' table. * diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php index ae63078cd..045aa32f6 100644 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -29,7 +29,6 @@ abstract class Accessory implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AccessoryTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -319,9 +318,9 @@ abstract class Accessory implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Accessory The current object, for fluid interface */ @@ -371,44 +370,40 @@ abstract class Accessory implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [accessory] column value. * - * @return int + * @return int */ public function getAccessory() { - return $this->accessory; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -416,8 +411,8 @@ abstract class Accessory implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -436,8 +431,8 @@ abstract class Accessory implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -455,8 +450,8 @@ abstract class Accessory implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setId($v) { @@ -469,15 +464,14 @@ abstract class Accessory implements ActiveRecordInterface $this->modifiedColumns[AccessoryTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setProductId($v) { @@ -494,15 +488,14 @@ abstract class Accessory implements ActiveRecordInterface $this->aProductRelatedByProductId = null; } - return $this; } // setProductId() /** * Set the value of [accessory] column. * - * @param int $v new value - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setAccessory($v) { @@ -519,15 +512,14 @@ abstract class Accessory implements ActiveRecordInterface $this->aProductRelatedByAccessory = null; } - return $this; } // setAccessory() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setPosition($v) { @@ -540,16 +532,15 @@ abstract class Accessory implements ActiveRecordInterface $this->modifiedColumns[AccessoryTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -561,16 +552,15 @@ abstract class Accessory implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Accessory The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -582,7 +572,6 @@ abstract class Accessory implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -689,10 +678,10 @@ abstract class Accessory implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -729,7 +718,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Accessory::setDeleted() @@ -772,8 +761,8 @@ abstract class Accessory implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -834,8 +823,8 @@ abstract class Accessory implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -885,7 +874,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -969,7 +958,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -985,12 +974,12 @@ abstract class Accessory implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1004,7 +993,7 @@ abstract class Accessory implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1040,12 +1029,12 @@ abstract class Accessory implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1084,12 +1073,12 @@ abstract class Accessory implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1103,8 +1092,8 @@ abstract class Accessory implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1144,8 +1133,8 @@ abstract class Accessory implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1175,7 +1164,6 @@ abstract class Accessory implements ActiveRecordInterface if ($this->isColumnModified(AccessoryTableMap::POSITION)) $criteria->add(AccessoryTableMap::POSITION, $this->position); if ($this->isColumnModified(AccessoryTableMap::CREATED_AT)) $criteria->add(AccessoryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AccessoryTableMap::UPDATED_AT)) $criteria->add(AccessoryTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1197,7 +1185,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1207,7 +1195,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1221,7 +1209,6 @@ abstract class Accessory implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1231,9 +1218,9 @@ abstract class Accessory implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Accessory (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Accessory (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1257,8 +1244,8 @@ abstract class Accessory implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Accessory Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Accessory Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1274,8 +1261,8 @@ abstract class Accessory implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\Accessory The current object (for fluent API support) * @throws PropelException */ public function setProductRelatedByProductId(ChildProduct $v = null) @@ -1294,7 +1281,6 @@ abstract class Accessory implements ActiveRecordInterface $v->addAccessoryRelatedByProductId($this); } - return $this; } @@ -1302,8 +1288,8 @@ abstract class Accessory implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProductRelatedByProductId(ConnectionInterface $con = null) @@ -1325,8 +1311,8 @@ abstract class Accessory implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\Accessory The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\Accessory The current object (for fluent API support) * @throws PropelException */ public function setProductRelatedByAccessory(ChildProduct $v = null) @@ -1345,7 +1331,6 @@ abstract class Accessory implements ActiveRecordInterface $v->addAccessoryRelatedByAccessory($this); } - return $this; } @@ -1353,8 +1338,8 @@ abstract class Accessory implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProductRelatedByAccessory(ConnectionInterface $con = null) @@ -1398,7 +1383,7 @@ abstract class Accessory implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1424,7 +1409,7 @@ abstract class Accessory implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAccessory The current object (for fluent API support) + * @return ChildAccessory The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AccessoryQuery.php b/core/lib/Thelia/Model/Base/AccessoryQuery.php index a79b73fbd..f9fca8e05 100644 --- a/core/lib/Thelia/Model/Base/AccessoryQuery.php +++ b/core/lib/Thelia/Model/Base/AccessoryQuery.php @@ -71,9 +71,9 @@ abstract class AccessoryQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AccessoryQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Accessory', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Returns a new ChildAccessoryQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAccessoryQuery */ @@ -113,7 +113,7 @@ abstract class AccessoryQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAccessory|array|mixed the result, formatted by the current formatter @@ -144,10 +144,10 @@ abstract class AccessoryQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAccessory A model object, or null if the key is not found + * @return ChildAccessory A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -174,8 +174,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAccessory|array|mixed the result, formatted by the current formatter */ @@ -195,8 +195,8 @@ abstract class AccessoryQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -217,26 +217,24 @@ abstract class AccessoryQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAccessoryQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AccessoryTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAccessoryQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AccessoryTableMap::ID, $keys, Criteria::IN); } @@ -250,11 +248,11 @@ abstract class AccessoryQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -293,11 +291,11 @@ abstract class AccessoryQuery extends ModelCriteria * * @see filterByProductRelatedByProductId() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -336,11 +334,11 @@ abstract class AccessoryQuery extends ModelCriteria * * @see filterByProductRelatedByAccessory() * - * @param mixed $accessory The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $accessory The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -377,11 +375,11 @@ abstract class AccessoryQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -418,13 +416,13 @@ abstract class AccessoryQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -461,13 +459,13 @@ abstract class AccessoryQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -497,8 +495,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -522,8 +520,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductRelatedByProductId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class AccessoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductRelatedByProductIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -572,8 +570,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -597,8 +595,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductRelatedByAccessory relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -631,11 +629,11 @@ abstract class AccessoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductRelatedByAccessoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -647,7 +645,7 @@ abstract class AccessoryQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAccessory $accessory Object to remove from the list of results + * @param ChildAccessory $accessory Object to remove from the list of results * * @return ChildAccessoryQuery The current query, for fluid interface */ @@ -663,8 +661,8 @@ abstract class AccessoryQuery extends ModelCriteria /** * Deletes all rows from the accessory table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -695,13 +693,13 @@ abstract class AccessoryQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAccessory or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAccessory object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAccessory object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -721,7 +719,6 @@ abstract class AccessoryQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AccessoryTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -740,9 +737,9 @@ abstract class AccessoryQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -752,9 +749,9 @@ abstract class AccessoryQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -764,7 +761,7 @@ abstract class AccessoryQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -774,7 +771,7 @@ abstract class AccessoryQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -784,7 +781,7 @@ abstract class AccessoryQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -794,7 +791,7 @@ abstract class AccessoryQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAccessoryQuery The current query, for fluid interface + * @return ChildAccessoryQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php index ed28b066a..c1d95f0be 100644 --- a/core/lib/Thelia/Model/Base/Address.php +++ b/core/lib/Thelia/Model/Base/Address.php @@ -36,7 +36,6 @@ abstract class Address implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AddressTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -441,9 +440,9 @@ abstract class Address implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Address The current object, for fluid interface */ @@ -493,176 +492,160 @@ abstract class Address implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [label] column value. * - * @return string + * @return string */ public function getLabel() { - return $this->label; } /** * Get the [customer_id] column value. * - * @return int + * @return int */ public function getCustomerId() { - return $this->customer_id; } /** * Get the [title_id] column value. * - * @return int + * @return int */ public function getTitleId() { - return $this->title_id; } /** * Get the [company] column value. * - * @return string + * @return string */ public function getCompany() { - return $this->company; } /** * Get the [firstname] column value. * - * @return string + * @return string */ public function getFirstname() { - return $this->firstname; } /** * Get the [lastname] column value. * - * @return string + * @return string */ public function getLastname() { - return $this->lastname; } /** * Get the [address1] column value. * - * @return string + * @return string */ public function getAddress1() { - return $this->address1; } /** * Get the [address2] column value. * - * @return string + * @return string */ public function getAddress2() { - return $this->address2; } /** * Get the [address3] column value. * - * @return string + * @return string */ public function getAddress3() { - return $this->address3; } /** * Get the [zipcode] column value. * - * @return string + * @return string */ public function getZipcode() { - return $this->zipcode; } /** * Get the [city] column value. * - * @return string + * @return string */ public function getCity() { - return $this->city; } /** * Get the [country_id] column value. * - * @return int + * @return int */ public function getCountryId() { - return $this->country_id; } /** * Get the [phone] column value. * - * @return string + * @return string */ public function getPhone() { - return $this->phone; } /** * Get the [cellphone] column value. * - * @return string + * @return string */ public function getCellphone() { - return $this->cellphone; } /** * Get the [is_default] column value. * - * @return int + * @return int */ public function getIsDefault() { - return $this->is_default; } @@ -670,8 +653,8 @@ abstract class Address implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -690,8 +673,8 @@ abstract class Address implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -709,8 +692,8 @@ abstract class Address implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setId($v) { @@ -723,15 +706,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [label] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setLabel($v) { @@ -744,15 +726,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::LABEL] = true; } - return $this; } // setLabel() /** * Set the value of [customer_id] column. * - * @param int $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCustomerId($v) { @@ -769,15 +750,14 @@ abstract class Address implements ActiveRecordInterface $this->aCustomer = null; } - return $this; } // setCustomerId() /** * Set the value of [title_id] column. * - * @param int $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setTitleId($v) { @@ -794,15 +774,14 @@ abstract class Address implements ActiveRecordInterface $this->aCustomerTitle = null; } - return $this; } // setTitleId() /** * Set the value of [company] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCompany($v) { @@ -815,15 +794,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::COMPANY] = true; } - return $this; } // setCompany() /** * Set the value of [firstname] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setFirstname($v) { @@ -836,15 +814,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::FIRSTNAME] = true; } - return $this; } // setFirstname() /** * Set the value of [lastname] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setLastname($v) { @@ -857,15 +834,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::LASTNAME] = true; } - return $this; } // setLastname() /** * Set the value of [address1] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setAddress1($v) { @@ -878,15 +854,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::ADDRESS1] = true; } - return $this; } // setAddress1() /** * Set the value of [address2] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setAddress2($v) { @@ -899,15 +874,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::ADDRESS2] = true; } - return $this; } // setAddress2() /** * Set the value of [address3] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setAddress3($v) { @@ -920,15 +894,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::ADDRESS3] = true; } - return $this; } // setAddress3() /** * Set the value of [zipcode] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setZipcode($v) { @@ -941,15 +914,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::ZIPCODE] = true; } - return $this; } // setZipcode() /** * Set the value of [city] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCity($v) { @@ -962,15 +934,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::CITY] = true; } - return $this; } // setCity() /** * Set the value of [country_id] column. * - * @param int $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCountryId($v) { @@ -987,15 +958,14 @@ abstract class Address implements ActiveRecordInterface $this->aCountry = null; } - return $this; } // setCountryId() /** * Set the value of [phone] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setPhone($v) { @@ -1008,15 +978,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::PHONE] = true; } - return $this; } // setPhone() /** * Set the value of [cellphone] column. * - * @param string $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCellphone($v) { @@ -1029,15 +998,14 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::CELLPHONE] = true; } - return $this; } // setCellphone() /** * Set the value of [is_default] column. * - * @param int $v new value - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setIsDefault($v) { @@ -1050,16 +1018,15 @@ abstract class Address implements ActiveRecordInterface $this->modifiedColumns[AddressTableMap::IS_DEFAULT] = true; } - return $this; } // setIsDefault() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -1071,16 +1038,15 @@ abstract class Address implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -1092,7 +1058,6 @@ abstract class Address implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1136,7 +1101,6 @@ abstract class Address implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AddressTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -1242,10 +1206,10 @@ abstract class Address implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1287,7 +1251,7 @@ abstract class Address implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Address::setDeleted() @@ -1330,8 +1294,8 @@ abstract class Address implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1392,8 +1356,8 @@ abstract class Address implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1486,7 +1450,7 @@ abstract class Address implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1642,7 +1606,7 @@ abstract class Address implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1658,12 +1622,12 @@ abstract class Address implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1677,7 +1641,7 @@ abstract class Address implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1749,12 +1713,12 @@ abstract class Address implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1814,12 +1778,12 @@ abstract class Address implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1833,8 +1797,8 @@ abstract class Address implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1910,8 +1874,8 @@ abstract class Address implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1965,7 +1929,6 @@ abstract class Address implements ActiveRecordInterface if ($this->isColumnModified(AddressTableMap::IS_DEFAULT)) $criteria->add(AddressTableMap::IS_DEFAULT, $this->is_default); if ($this->isColumnModified(AddressTableMap::CREATED_AT)) $criteria->add(AddressTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AddressTableMap::UPDATED_AT)) $criteria->add(AddressTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1987,7 +1950,7 @@ abstract class Address implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1997,7 +1960,7 @@ abstract class Address implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -2011,7 +1974,6 @@ abstract class Address implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -2021,9 +1983,9 @@ abstract class Address implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Address (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Address (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -2079,8 +2041,8 @@ abstract class Address implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Address Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Address Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -2096,8 +2058,8 @@ abstract class Address implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomer object. * - * @param ChildCustomer $v - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param ChildCustomer $v + * @return \Thelia\Model\Address The current object (for fluent API support) * @throws PropelException */ public function setCustomer(ChildCustomer $v = null) @@ -2116,16 +2078,14 @@ abstract class Address implements ActiveRecordInterface $v->addAddress($this); } - return $this; } - /** * Get the associated ChildCustomer object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomer The associated ChildCustomer object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomer The associated ChildCustomer object. * @throws PropelException */ public function getCustomer(ConnectionInterface $con = null) @@ -2147,8 +2107,8 @@ abstract class Address implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomerTitle object. * - * @param ChildCustomerTitle $v - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param ChildCustomerTitle $v + * @return \Thelia\Model\Address The current object (for fluent API support) * @throws PropelException */ public function setCustomerTitle(ChildCustomerTitle $v = null) @@ -2167,16 +2127,14 @@ abstract class Address implements ActiveRecordInterface $v->addAddress($this); } - return $this; } - /** * Get the associated ChildCustomerTitle object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomerTitle The associated ChildCustomerTitle object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomerTitle The associated ChildCustomerTitle object. * @throws PropelException */ public function getCustomerTitle(ConnectionInterface $con = null) @@ -2198,8 +2156,8 @@ abstract class Address implements ActiveRecordInterface /** * Declares an association between this object and a ChildCountry object. * - * @param ChildCountry $v - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param ChildCountry $v + * @return \Thelia\Model\Address The current object (for fluent API support) * @throws PropelException */ public function setCountry(ChildCountry $v = null) @@ -2218,16 +2176,14 @@ abstract class Address implements ActiveRecordInterface $v->addAddress($this); } - return $this; } - /** * Get the associated ChildCountry object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCountry The associated ChildCountry object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCountry The associated ChildCountry object. * @throws PropelException */ public function getCountry(ConnectionInterface $con = null) @@ -2246,13 +2202,12 @@ abstract class Address implements ActiveRecordInterface return $this->aCountry; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -2294,8 +2249,8 @@ abstract class Address implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2317,8 +2272,8 @@ abstract class Address implements ActiveRecordInterface * If this ChildAddress is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCart[] List of ChildCart objects * @throws PropelException */ @@ -2374,9 +2329,9 @@ abstract class Address implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $cartsRelatedByAddressDeliveryId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAddress The current object (for fluent API support) + * @param Collection $cartsRelatedByAddressDeliveryId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAddress The current object (for fluent API support) */ public function setCartsRelatedByAddressDeliveryId(Collection $cartsRelatedByAddressDeliveryId, ConnectionInterface $con = null) { @@ -2403,10 +2358,10 @@ abstract class Address implements ActiveRecordInterface /** * Returns the number of related Cart objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Cart objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Cart objects. * @throws PropelException */ public function countCartsRelatedByAddressDeliveryId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2438,8 +2393,8 @@ abstract class Address implements ActiveRecordInterface * Method called to associate a ChildCart object to this object * through the ChildCart foreign key attribute. * - * @param ChildCart $l ChildCart - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param ChildCart $l ChildCart + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function addCartRelatedByAddressDeliveryId(ChildCart $l) { @@ -2466,7 +2421,7 @@ abstract class Address implements ActiveRecordInterface /** * @param CartRelatedByAddressDeliveryId $cartRelatedByAddressDeliveryId The cartRelatedByAddressDeliveryId object to remove. - * @return ChildAddress The current object (for fluent API support) + * @return ChildAddress The current object (for fluent API support) */ public function removeCartRelatedByAddressDeliveryId($cartRelatedByAddressDeliveryId) { @@ -2495,9 +2450,9 @@ abstract class Address implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Address. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsRelatedByAddressDeliveryIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2520,9 +2475,9 @@ abstract class Address implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Address. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsRelatedByAddressDeliveryIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2562,8 +2517,8 @@ abstract class Address implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2585,8 +2540,8 @@ abstract class Address implements ActiveRecordInterface * If this ChildAddress is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCart[] List of ChildCart objects * @throws PropelException */ @@ -2642,9 +2597,9 @@ abstract class Address implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $cartsRelatedByAddressInvoiceId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAddress The current object (for fluent API support) + * @param Collection $cartsRelatedByAddressInvoiceId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAddress The current object (for fluent API support) */ public function setCartsRelatedByAddressInvoiceId(Collection $cartsRelatedByAddressInvoiceId, ConnectionInterface $con = null) { @@ -2671,10 +2626,10 @@ abstract class Address implements ActiveRecordInterface /** * Returns the number of related Cart objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Cart objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Cart objects. * @throws PropelException */ public function countCartsRelatedByAddressInvoiceId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2706,8 +2661,8 @@ abstract class Address implements ActiveRecordInterface * Method called to associate a ChildCart object to this object * through the ChildCart foreign key attribute. * - * @param ChildCart $l ChildCart - * @return \Thelia\Model\Address The current object (for fluent API support) + * @param ChildCart $l ChildCart + * @return \Thelia\Model\Address The current object (for fluent API support) */ public function addCartRelatedByAddressInvoiceId(ChildCart $l) { @@ -2734,7 +2689,7 @@ abstract class Address implements ActiveRecordInterface /** * @param CartRelatedByAddressInvoiceId $cartRelatedByAddressInvoiceId The cartRelatedByAddressInvoiceId object to remove. - * @return ChildAddress The current object (for fluent API support) + * @return ChildAddress The current object (for fluent API support) */ public function removeCartRelatedByAddressInvoiceId($cartRelatedByAddressInvoiceId) { @@ -2763,9 +2718,9 @@ abstract class Address implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Address. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsRelatedByAddressInvoiceIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2788,9 +2743,9 @@ abstract class Address implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Address. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsRelatedByAddressInvoiceIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2839,7 +2794,7 @@ abstract class Address implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2878,7 +2833,7 @@ abstract class Address implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAddress The current object (for fluent API support) + * @return ChildAddress The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AddressQuery.php b/core/lib/Thelia/Model/Base/AddressQuery.php index 40d15fd96..184c5bab8 100644 --- a/core/lib/Thelia/Model/Base/AddressQuery.php +++ b/core/lib/Thelia/Model/Base/AddressQuery.php @@ -131,9 +131,9 @@ abstract class AddressQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AddressQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Address', $modelAlias = null) { @@ -143,8 +143,8 @@ abstract class AddressQuery extends ModelCriteria /** * Returns a new ChildAddressQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAddressQuery */ @@ -173,7 +173,7 @@ abstract class AddressQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAddress|array|mixed the result, formatted by the current formatter @@ -204,10 +204,10 @@ abstract class AddressQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAddress A model object, or null if the key is not found + * @return ChildAddress A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -234,8 +234,8 @@ abstract class AddressQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAddress|array|mixed the result, formatted by the current formatter */ @@ -255,8 +255,8 @@ abstract class AddressQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -277,26 +277,24 @@ abstract class AddressQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAddressQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AddressTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAddressQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AddressTableMap::ID, $keys, Criteria::IN); } @@ -310,11 +308,11 @@ abstract class AddressQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -350,9 +348,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByLabel('%fooValue%'); // WHERE label LIKE '%fooValue%' * * - * @param string $label The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $label The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -382,11 +380,11 @@ abstract class AddressQuery extends ModelCriteria * * @see filterByCustomer() * - * @param mixed $customerId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $customerId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -425,11 +423,11 @@ abstract class AddressQuery extends ModelCriteria * * @see filterByCustomerTitle() * - * @param mixed $titleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $titleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -465,9 +463,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByCompany('%fooValue%'); // WHERE company LIKE '%fooValue%' * * - * @param string $company The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $company The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -494,9 +492,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%' * * - * @param string $firstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $firstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -523,9 +521,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%' * * - * @param string $lastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -552,9 +550,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByAddress1('%fooValue%'); // WHERE address1 LIKE '%fooValue%' * * - * @param string $address1 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address1 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -581,9 +579,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByAddress2('%fooValue%'); // WHERE address2 LIKE '%fooValue%' * * - * @param string $address2 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address2 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -610,9 +608,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByAddress3('%fooValue%'); // WHERE address3 LIKE '%fooValue%' * * - * @param string $address3 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address3 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -639,9 +637,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByZipcode('%fooValue%'); // WHERE zipcode LIKE '%fooValue%' * * - * @param string $zipcode The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $zipcode The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -668,9 +666,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByCity('%fooValue%'); // WHERE city LIKE '%fooValue%' * * - * @param string $city The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $city The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -700,11 +698,11 @@ abstract class AddressQuery extends ModelCriteria * * @see filterByCountry() * - * @param mixed $countryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $countryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -740,9 +738,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByPhone('%fooValue%'); // WHERE phone LIKE '%fooValue%' * * - * @param string $phone The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $phone The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -769,9 +767,9 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByCellphone('%fooValue%'); // WHERE cellphone LIKE '%fooValue%' * * - * @param string $cellphone The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $cellphone The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -799,11 +797,11 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByIsDefault(array('min' => 12)); // WHERE is_default > 12 * * - * @param mixed $isDefault The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $isDefault The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -840,13 +838,13 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -883,13 +881,13 @@ abstract class AddressQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -919,8 +917,8 @@ abstract class AddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Customer object * - * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -944,8 +942,8 @@ abstract class AddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Customer relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAddressQuery The current query, for fluid interface */ @@ -978,11 +976,11 @@ abstract class AddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query */ public function useCustomerQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -995,7 +993,7 @@ abstract class AddressQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\CustomerTitle object * * @param \Thelia\Model\CustomerTitle|ObjectCollection $customerTitle The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1019,8 +1017,8 @@ abstract class AddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CustomerTitle relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1053,11 +1051,11 @@ abstract class AddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query */ public function useCustomerTitleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1069,8 +1067,8 @@ abstract class AddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Country object * - * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1094,8 +1092,8 @@ abstract class AddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Country relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1128,11 +1126,11 @@ abstract class AddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query */ public function useCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1144,8 +1142,8 @@ abstract class AddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Cart object * - * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1167,8 +1165,8 @@ abstract class AddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CartRelatedByAddressDeliveryId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1201,11 +1199,11 @@ abstract class AddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query */ public function useCartRelatedByAddressDeliveryIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1217,8 +1215,8 @@ abstract class AddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Cart object * - * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1240,8 +1238,8 @@ abstract class AddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CartRelatedByAddressInvoiceId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1274,11 +1272,11 @@ abstract class AddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query */ public function useCartRelatedByAddressInvoiceIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1290,7 +1288,7 @@ abstract class AddressQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAddress $address Object to remove from the list of results + * @param ChildAddress $address Object to remove from the list of results * * @return ChildAddressQuery The current query, for fluid interface */ @@ -1306,8 +1304,8 @@ abstract class AddressQuery extends ModelCriteria /** * Deletes all rows from the address table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1338,13 +1336,13 @@ abstract class AddressQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAddress or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAddress object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAddress object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1364,7 +1362,6 @@ abstract class AddressQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AddressTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1383,9 +1380,9 @@ abstract class AddressQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1395,9 +1392,9 @@ abstract class AddressQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1407,7 +1404,7 @@ abstract class AddressQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1417,7 +1414,7 @@ abstract class AddressQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1427,7 +1424,7 @@ abstract class AddressQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1437,7 +1434,7 @@ abstract class AddressQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAddressQuery The current query, for fluid interface + * @return ChildAddressQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php index 433d47a54..cc645b526 100644 --- a/core/lib/Thelia/Model/Base/Admin.php +++ b/core/lib/Thelia/Model/Base/Admin.php @@ -29,7 +29,6 @@ abstract class Admin implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AdminTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -356,9 +355,9 @@ abstract class Admin implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Admin The current object, for fluid interface */ @@ -408,121 +407,110 @@ abstract class Admin implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [profile_id] column value. * - * @return int + * @return int */ public function getProfileId() { - return $this->profile_id; } /** * Get the [firstname] column value. * - * @return string + * @return string */ public function getFirstname() { - return $this->firstname; } /** * Get the [lastname] column value. * - * @return string + * @return string */ public function getLastname() { - return $this->lastname; } /** * Get the [login] column value. * - * @return string + * @return string */ public function getLogin() { - return $this->login; } /** * Get the [password] column value. * - * @return string + * @return string */ public function getPassword() { - return $this->password; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [algo] column value. * - * @return string + * @return string */ public function getAlgo() { - return $this->algo; } /** * Get the [salt] column value. * - * @return string + * @return string */ public function getSalt() { - return $this->salt; } /** * Get the [remember_me_token] column value. * - * @return string + * @return string */ public function getRememberMeToken() { - return $this->remember_me_token; } /** * Get the [remember_me_serial] column value. * - * @return string + * @return string */ public function getRememberMeSerial() { - return $this->remember_me_serial; } @@ -530,8 +518,8 @@ abstract class Admin implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -550,8 +538,8 @@ abstract class Admin implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -569,8 +557,8 @@ abstract class Admin implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setId($v) { @@ -583,15 +571,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [profile_id] column. * - * @param int $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setProfileId($v) { @@ -608,15 +595,14 @@ abstract class Admin implements ActiveRecordInterface $this->aProfile = null; } - return $this; } // setProfileId() /** * Set the value of [firstname] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setFirstname($v) { @@ -629,15 +615,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::FIRSTNAME] = true; } - return $this; } // setFirstname() /** * Set the value of [lastname] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setLastname($v) { @@ -650,15 +635,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::LASTNAME] = true; } - return $this; } // setLastname() /** * Set the value of [login] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setLogin($v) { @@ -671,15 +655,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::LOGIN] = true; } - return $this; } // setLogin() /** * Set the value of [password] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setPassword($v) { @@ -692,15 +675,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::PASSWORD] = true; } - return $this; } // setPassword() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setLocale($v) { @@ -713,15 +695,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [algo] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setAlgo($v) { @@ -734,15 +715,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::ALGO] = true; } - return $this; } // setAlgo() /** * Set the value of [salt] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setSalt($v) { @@ -755,15 +735,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::SALT] = true; } - return $this; } // setSalt() /** * Set the value of [remember_me_token] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setRememberMeToken($v) { @@ -776,15 +755,14 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::REMEMBER_ME_TOKEN] = true; } - return $this; } // setRememberMeToken() /** * Set the value of [remember_me_serial] column. * - * @param string $v new value - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setRememberMeSerial($v) { @@ -797,16 +775,15 @@ abstract class Admin implements ActiveRecordInterface $this->modifiedColumns[AdminTableMap::REMEMBER_ME_SERIAL] = true; } - return $this; } // setRememberMeSerial() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -818,16 +795,15 @@ abstract class Admin implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Admin The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -839,7 +815,6 @@ abstract class Admin implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -964,10 +939,10 @@ abstract class Admin implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1003,7 +978,7 @@ abstract class Admin implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Admin::setDeleted() @@ -1046,8 +1021,8 @@ abstract class Admin implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1108,8 +1083,8 @@ abstract class Admin implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1152,7 +1127,7 @@ abstract class Admin implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1278,7 +1253,7 @@ abstract class Admin implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1294,12 +1269,12 @@ abstract class Admin implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1313,7 +1288,7 @@ abstract class Admin implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1370,12 +1345,12 @@ abstract class Admin implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1418,12 +1393,12 @@ abstract class Admin implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1437,8 +1412,8 @@ abstract class Admin implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1499,8 +1474,8 @@ abstract class Admin implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1544,7 +1519,6 @@ abstract class Admin implements ActiveRecordInterface if ($this->isColumnModified(AdminTableMap::REMEMBER_ME_SERIAL)) $criteria->add(AdminTableMap::REMEMBER_ME_SERIAL, $this->remember_me_serial); if ($this->isColumnModified(AdminTableMap::CREATED_AT)) $criteria->add(AdminTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AdminTableMap::UPDATED_AT)) $criteria->add(AdminTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1566,7 +1540,7 @@ abstract class Admin implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1576,7 +1550,7 @@ abstract class Admin implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1590,7 +1564,6 @@ abstract class Admin implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1600,9 +1573,9 @@ abstract class Admin implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Admin (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Admin (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1633,8 +1606,8 @@ abstract class Admin implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Admin Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Admin Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1650,8 +1623,8 @@ abstract class Admin implements ActiveRecordInterface /** * Declares an association between this object and a ChildProfile object. * - * @param ChildProfile $v - * @return \Thelia\Model\Admin The current object (for fluent API support) + * @param ChildProfile $v + * @return \Thelia\Model\Admin The current object (for fluent API support) * @throws PropelException */ public function setProfile(ChildProfile $v = null) @@ -1670,7 +1643,6 @@ abstract class Admin implements ActiveRecordInterface $v->addAdmin($this); } - return $this; } @@ -1678,8 +1650,8 @@ abstract class Admin implements ActiveRecordInterface /** * Get the associated ChildProfile object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProfile The associated ChildProfile object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProfile The associated ChildProfile object. * @throws PropelException */ public function getProfile(ConnectionInterface $con = null) @@ -1730,7 +1702,7 @@ abstract class Admin implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1755,7 +1727,7 @@ abstract class Admin implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAdmin The current object (for fluent API support) + * @return ChildAdmin The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php index e47126369..4ec5808ed 100644 --- a/core/lib/Thelia/Model/Base/AdminLog.php +++ b/core/lib/Thelia/Model/Base/AdminLog.php @@ -9,7 +9,6 @@ use Propel\Runtime\Propel; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveRecord\ActiveRecordInterface; -use Propel\Runtime\Collection\Collection; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\BadMethodCallException; use Propel\Runtime\Exception\PropelException; @@ -27,7 +26,6 @@ abstract class AdminLog implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AdminLogTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -331,9 +329,9 @@ abstract class AdminLog implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AdminLog The current object, for fluid interface */ @@ -383,88 +381,80 @@ abstract class AdminLog implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [admin_login] column value. * - * @return string + * @return string */ public function getAdminLogin() { - return $this->admin_login; } /** * Get the [admin_firstname] column value. * - * @return string + * @return string */ public function getAdminFirstname() { - return $this->admin_firstname; } /** * Get the [admin_lastname] column value. * - * @return string + * @return string */ public function getAdminLastname() { - return $this->admin_lastname; } /** * Get the [resource] column value. * - * @return string + * @return string */ public function getResource() { - return $this->resource; } /** * Get the [action] column value. * - * @return string + * @return string */ public function getAction() { - return $this->action; } /** * Get the [message] column value. * - * @return string + * @return string */ public function getMessage() { - return $this->message; } /** * Get the [request] column value. * - * @return string + * @return string */ public function getRequest() { - return $this->request; } @@ -472,8 +462,8 @@ abstract class AdminLog implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -492,8 +482,8 @@ abstract class AdminLog implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -511,8 +501,8 @@ abstract class AdminLog implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setId($v) { @@ -525,15 +515,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [admin_login] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setAdminLogin($v) { @@ -546,15 +535,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::ADMIN_LOGIN] = true; } - return $this; } // setAdminLogin() /** * Set the value of [admin_firstname] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setAdminFirstname($v) { @@ -567,15 +555,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::ADMIN_FIRSTNAME] = true; } - return $this; } // setAdminFirstname() /** * Set the value of [admin_lastname] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setAdminLastname($v) { @@ -588,15 +575,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::ADMIN_LASTNAME] = true; } - return $this; } // setAdminLastname() /** * Set the value of [resource] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setResource($v) { @@ -609,15 +595,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::RESOURCE] = true; } - return $this; } // setResource() /** * Set the value of [action] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setAction($v) { @@ -630,15 +615,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::ACTION] = true; } - return $this; } // setAction() /** * Set the value of [message] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setMessage($v) { @@ -651,15 +635,14 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::MESSAGE] = true; } - return $this; } // setMessage() /** * Set the value of [request] column. * - * @param string $v new value - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setRequest($v) { @@ -672,16 +655,15 @@ abstract class AdminLog implements ActiveRecordInterface $this->modifiedColumns[AdminLogTableMap::REQUEST] = true; } - return $this; } // setRequest() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -693,16 +675,15 @@ abstract class AdminLog implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AdminLog The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AdminLog The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -714,7 +695,6 @@ abstract class AdminLog implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -827,10 +807,10 @@ abstract class AdminLog implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -865,7 +845,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AdminLog::setDeleted() @@ -908,8 +888,8 @@ abstract class AdminLog implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -970,8 +950,8 @@ abstract class AdminLog implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1002,7 +982,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1110,7 +1090,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1126,12 +1106,12 @@ abstract class AdminLog implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1145,7 +1125,7 @@ abstract class AdminLog implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1193,11 +1173,11 @@ abstract class AdminLog implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion * * @return array an associative array containing the field names (as keys) and field values */ @@ -1225,19 +1205,18 @@ abstract class AdminLog implements ActiveRecordInterface $result[$key] = $virtualColumn; } - return $result; } /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1251,8 +1230,8 @@ abstract class AdminLog implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1304,8 +1283,8 @@ abstract class AdminLog implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1343,7 +1322,6 @@ abstract class AdminLog implements ActiveRecordInterface if ($this->isColumnModified(AdminLogTableMap::REQUEST)) $criteria->add(AdminLogTableMap::REQUEST, $this->request); if ($this->isColumnModified(AdminLogTableMap::CREATED_AT)) $criteria->add(AdminLogTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AdminLogTableMap::UPDATED_AT)) $criteria->add(AdminLogTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1365,7 +1343,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1375,7 +1353,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1389,7 +1367,6 @@ abstract class AdminLog implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1399,9 +1376,9 @@ abstract class AdminLog implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AdminLog (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AdminLog (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1429,8 +1406,8 @@ abstract class AdminLog implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AdminLog Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AdminLog Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1472,7 +1449,7 @@ abstract class AdminLog implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1496,7 +1473,7 @@ abstract class AdminLog implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAdminLog The current object (for fluent API support) + * @return ChildAdminLog The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AdminLogQuery.php b/core/lib/Thelia/Model/Base/AdminLogQuery.php index de0a8771f..cdd5360e7 100644 --- a/core/lib/Thelia/Model/Base/AdminLogQuery.php +++ b/core/lib/Thelia/Model/Base/AdminLogQuery.php @@ -76,9 +76,9 @@ abstract class AdminLogQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AdminLogQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AdminLog', $modelAlias = null) { @@ -88,8 +88,8 @@ abstract class AdminLogQuery extends ModelCriteria /** * Returns a new ChildAdminLogQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAdminLogQuery */ @@ -118,7 +118,7 @@ abstract class AdminLogQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAdminLog|array|mixed the result, formatted by the current formatter @@ -149,10 +149,10 @@ abstract class AdminLogQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAdminLog A model object, or null if the key is not found + * @return ChildAdminLog A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -179,8 +179,8 @@ abstract class AdminLogQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAdminLog|array|mixed the result, formatted by the current formatter */ @@ -200,8 +200,8 @@ abstract class AdminLogQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -222,26 +222,24 @@ abstract class AdminLogQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAdminLogQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AdminLogTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAdminLogQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AdminLogTableMap::ID, $keys, Criteria::IN); } @@ -255,11 +253,11 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -295,9 +293,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByAdminLogin('%fooValue%'); // WHERE admin_login LIKE '%fooValue%' * * - * @param string $adminLogin The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $adminLogin The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -324,9 +322,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByAdminFirstname('%fooValue%'); // WHERE admin_firstname LIKE '%fooValue%' * * - * @param string $adminFirstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $adminFirstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -353,9 +351,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByAdminLastname('%fooValue%'); // WHERE admin_lastname LIKE '%fooValue%' * * - * @param string $adminLastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $adminLastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -382,9 +380,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByResource('%fooValue%'); // WHERE resource LIKE '%fooValue%' * * - * @param string $resource The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $resource The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -411,9 +409,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByAction('%fooValue%'); // WHERE action LIKE '%fooValue%' * * - * @param string $action The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $action The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -440,9 +438,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByMessage('%fooValue%'); // WHERE message LIKE '%fooValue%' * * - * @param string $message The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $message The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -469,9 +467,9 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByRequest('%fooValue%'); // WHERE request LIKE '%fooValue%' * * - * @param string $request The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $request The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -499,13 +497,13 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -542,13 +540,13 @@ abstract class AdminLogQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -578,7 +576,7 @@ abstract class AdminLogQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAdminLog $adminLog Object to remove from the list of results + * @param ChildAdminLog $adminLog Object to remove from the list of results * * @return ChildAdminLogQuery The current query, for fluid interface */ @@ -594,8 +592,8 @@ abstract class AdminLogQuery extends ModelCriteria /** * Deletes all rows from the admin_log table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -626,13 +624,13 @@ abstract class AdminLogQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAdminLog or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAdminLog object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAdminLog object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -652,7 +650,6 @@ abstract class AdminLogQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AdminLogTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -671,9 +668,9 @@ abstract class AdminLogQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -683,9 +680,9 @@ abstract class AdminLogQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -695,7 +692,7 @@ abstract class AdminLogQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -705,7 +702,7 @@ abstract class AdminLogQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -715,7 +712,7 @@ abstract class AdminLogQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -725,7 +722,7 @@ abstract class AdminLogQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAdminLogQuery The current query, for fluid interface + * @return ChildAdminLogQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/AdminQuery.php b/core/lib/Thelia/Model/Base/AdminQuery.php index 3b4bb9eb5..f9116dd4b 100644 --- a/core/lib/Thelia/Model/Base/AdminQuery.php +++ b/core/lib/Thelia/Model/Base/AdminQuery.php @@ -95,9 +95,9 @@ abstract class AdminQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AdminQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Admin', $modelAlias = null) { @@ -107,8 +107,8 @@ abstract class AdminQuery extends ModelCriteria /** * Returns a new ChildAdminQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAdminQuery */ @@ -137,7 +137,7 @@ abstract class AdminQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAdmin|array|mixed the result, formatted by the current formatter @@ -168,10 +168,10 @@ abstract class AdminQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAdmin A model object, or null if the key is not found + * @return ChildAdmin A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -198,8 +198,8 @@ abstract class AdminQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAdmin|array|mixed the result, formatted by the current formatter */ @@ -219,8 +219,8 @@ abstract class AdminQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -241,26 +241,24 @@ abstract class AdminQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAdminQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AdminTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAdminQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AdminTableMap::ID, $keys, Criteria::IN); } @@ -274,11 +272,11 @@ abstract class AdminQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -317,11 +315,11 @@ abstract class AdminQuery extends ModelCriteria * * @see filterByProfile() * - * @param mixed $profileId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $profileId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -357,9 +355,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%' * * - * @param string $firstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $firstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -386,9 +384,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%' * * - * @param string $lastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -415,9 +413,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByLogin('%fooValue%'); // WHERE login LIKE '%fooValue%' * * - * @param string $login The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $login The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -444,9 +442,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByPassword('%fooValue%'); // WHERE password LIKE '%fooValue%' * * - * @param string $password The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $password The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -473,9 +471,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -502,9 +500,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByAlgo('%fooValue%'); // WHERE algo LIKE '%fooValue%' * * - * @param string $algo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $algo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -531,9 +529,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterBySalt('%fooValue%'); // WHERE salt LIKE '%fooValue%' * * - * @param string $salt The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $salt The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -560,9 +558,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByRememberMeToken('%fooValue%'); // WHERE remember_me_token LIKE '%fooValue%' * * - * @param string $rememberMeToken The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $rememberMeToken The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -589,9 +587,9 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByRememberMeSerial('%fooValue%'); // WHERE remember_me_serial LIKE '%fooValue%' * * - * @param string $rememberMeSerial The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $rememberMeSerial The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -619,13 +617,13 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -662,13 +660,13 @@ abstract class AdminQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -698,8 +696,8 @@ abstract class AdminQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Profile object * - * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAdminQuery The current query, for fluid interface */ @@ -723,8 +721,8 @@ abstract class AdminQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Profile relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAdminQuery The current query, for fluid interface */ @@ -757,11 +755,11 @@ abstract class AdminQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query */ public function useProfileQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -773,7 +771,7 @@ abstract class AdminQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAdmin $admin Object to remove from the list of results + * @param ChildAdmin $admin Object to remove from the list of results * * @return ChildAdminQuery The current query, for fluid interface */ @@ -789,8 +787,8 @@ abstract class AdminQuery extends ModelCriteria /** * Deletes all rows from the admin table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -821,13 +819,13 @@ abstract class AdminQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAdmin or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAdmin object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAdmin object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -847,7 +845,6 @@ abstract class AdminQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AdminTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -866,9 +863,9 @@ abstract class AdminQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -878,9 +875,9 @@ abstract class AdminQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -890,7 +887,7 @@ abstract class AdminQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -900,7 +897,7 @@ abstract class AdminQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -910,7 +907,7 @@ abstract class AdminQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -920,7 +917,7 @@ abstract class AdminQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAdminQuery The current query, for fluid interface + * @return ChildAdminQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php index 12f79d0af..5a76d641b 100644 --- a/core/lib/Thelia/Model/Base/Area.php +++ b/core/lib/Thelia/Model/Base/Area.php @@ -32,7 +32,6 @@ abstract class Area implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AreaTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -330,9 +329,9 @@ abstract class Area implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Area The current object, for fluid interface */ @@ -382,33 +381,30 @@ abstract class Area implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Get the [postage] column value. * - * @return double + * @return double */ public function getPostage() { - return $this->postage; } @@ -416,8 +412,8 @@ abstract class Area implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -436,8 +432,8 @@ abstract class Area implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -455,8 +451,8 @@ abstract class Area implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function setId($v) { @@ -469,15 +465,14 @@ abstract class Area implements ActiveRecordInterface $this->modifiedColumns[AreaTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function setName($v) { @@ -490,15 +485,14 @@ abstract class Area implements ActiveRecordInterface $this->modifiedColumns[AreaTableMap::NAME] = true; } - return $this; } // setName() /** * Set the value of [postage] column. * - * @param double $v new value - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function setPostage($v) { @@ -511,16 +505,15 @@ abstract class Area implements ActiveRecordInterface $this->modifiedColumns[AreaTableMap::POSTAGE] = true; } - return $this; } // setPostage() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -532,16 +525,15 @@ abstract class Area implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -553,7 +545,6 @@ abstract class Area implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -651,10 +642,10 @@ abstract class Area implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -693,7 +684,7 @@ abstract class Area implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Area::setDeleted() @@ -736,8 +727,8 @@ abstract class Area implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -798,8 +789,8 @@ abstract class Area implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -865,7 +856,7 @@ abstract class Area implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -943,7 +934,7 @@ abstract class Area implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -959,12 +950,12 @@ abstract class Area implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -978,7 +969,7 @@ abstract class Area implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1011,12 +1002,12 @@ abstract class Area implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1054,12 +1045,12 @@ abstract class Area implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1073,8 +1064,8 @@ abstract class Area implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1111,8 +1102,8 @@ abstract class Area implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1140,7 +1131,6 @@ abstract class Area implements ActiveRecordInterface if ($this->isColumnModified(AreaTableMap::POSTAGE)) $criteria->add(AreaTableMap::POSTAGE, $this->postage); if ($this->isColumnModified(AreaTableMap::CREATED_AT)) $criteria->add(AreaTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AreaTableMap::UPDATED_AT)) $criteria->add(AreaTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1162,7 +1152,7 @@ abstract class Area implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1172,7 +1162,7 @@ abstract class Area implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1186,7 +1176,6 @@ abstract class Area implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1196,9 +1185,9 @@ abstract class Area implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Area (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Area (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1241,8 +1230,8 @@ abstract class Area implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Area Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Area Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1261,7 +1250,7 @@ abstract class Area implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1303,8 +1292,8 @@ abstract class Area implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1326,8 +1315,8 @@ abstract class Area implements ActiveRecordInterface * If this ChildArea is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCountry[] List of ChildCountry objects * @throws PropelException */ @@ -1383,15 +1372,14 @@ abstract class Area implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $countries A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildArea The current object (for fluent API support) + * @param Collection $countries A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildArea The current object (for fluent API support) */ public function setCountries(Collection $countries, ConnectionInterface $con = null) { $countriesToDelete = $this->getCountries(new Criteria(), $con)->diff($countries); - $this->countriesScheduledForDeletion = $countriesToDelete; foreach ($countriesToDelete as $countryRemoved) { @@ -1412,10 +1400,10 @@ abstract class Area implements ActiveRecordInterface /** * Returns the number of related Country objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Country objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Country objects. * @throws PropelException */ public function countCountries(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1447,8 +1435,8 @@ abstract class Area implements ActiveRecordInterface * Method called to associate a ChildCountry object to this object * through the ChildCountry foreign key attribute. * - * @param ChildCountry $l ChildCountry - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param ChildCountry $l ChildCountry + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function addCountry(ChildCountry $l) { @@ -1474,7 +1462,7 @@ abstract class Area implements ActiveRecordInterface } /** - * @param Country $country The country object to remove. + * @param Country $country The country object to remove. * @return ChildArea The current object (for fluent API support) */ public function removeCountry($country) @@ -1521,8 +1509,8 @@ abstract class Area implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1544,8 +1532,8 @@ abstract class Area implements ActiveRecordInterface * If this ChildArea is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects * @throws PropelException */ @@ -1601,15 +1589,14 @@ abstract class Area implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $areaDeliveryModules A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildArea The current object (for fluent API support) + * @param Collection $areaDeliveryModules A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildArea The current object (for fluent API support) */ public function setAreaDeliveryModules(Collection $areaDeliveryModules, ConnectionInterface $con = null) { $areaDeliveryModulesToDelete = $this->getAreaDeliveryModules(new Criteria(), $con)->diff($areaDeliveryModules); - $this->areaDeliveryModulesScheduledForDeletion = $areaDeliveryModulesToDelete; foreach ($areaDeliveryModulesToDelete as $areaDeliveryModuleRemoved) { @@ -1630,10 +1617,10 @@ abstract class Area implements ActiveRecordInterface /** * Returns the number of related AreaDeliveryModule objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AreaDeliveryModule objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AreaDeliveryModule objects. * @throws PropelException */ public function countAreaDeliveryModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1665,8 +1652,8 @@ abstract class Area implements ActiveRecordInterface * Method called to associate a ChildAreaDeliveryModule object to this object * through the ChildAreaDeliveryModule foreign key attribute. * - * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule - * @return \Thelia\Model\Area The current object (for fluent API support) + * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule + * @return \Thelia\Model\Area The current object (for fluent API support) */ public function addAreaDeliveryModule(ChildAreaDeliveryModule $l) { @@ -1693,7 +1680,7 @@ abstract class Area implements ActiveRecordInterface /** * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to remove. - * @return ChildArea The current object (for fluent API support) + * @return ChildArea The current object (for fluent API support) */ public function removeAreaDeliveryModule($areaDeliveryModule) { @@ -1710,7 +1697,6 @@ abstract class Area implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1722,9 +1708,9 @@ abstract class Area implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Area. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects */ public function getAreaDeliveryModulesJoinModule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1759,7 +1745,7 @@ abstract class Area implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1795,7 +1781,7 @@ abstract class Area implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildArea The current object (for fluent API support) + * @return ChildArea The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1880,7 +1866,6 @@ abstract class Area implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/AreaDeliveryModule.php b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php index 4102566c4..8b0ee90b4 100644 --- a/core/lib/Thelia/Model/Base/AreaDeliveryModule.php +++ b/core/lib/Thelia/Model/Base/AreaDeliveryModule.php @@ -31,7 +31,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AreaDeliveryModuleTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -315,9 +314,9 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AreaDeliveryModule The current object, for fluid interface */ @@ -367,33 +366,30 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [area_id] column value. * - * @return int + * @return int */ public function getAreaId() { - return $this->area_id; } /** * Get the [delivery_module_id] column value. * - * @return int + * @return int */ public function getDeliveryModuleId() { - return $this->delivery_module_id; } @@ -401,8 +397,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -421,8 +417,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -440,8 +436,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setId($v) { @@ -454,15 +450,14 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $this->modifiedColumns[AreaDeliveryModuleTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [area_id] column. * - * @param int $v new value - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setAreaId($v) { @@ -479,15 +474,14 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $this->aArea = null; } - return $this; } // setAreaId() /** * Set the value of [delivery_module_id] column. * - * @param int $v new value - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setDeliveryModuleId($v) { @@ -504,16 +498,15 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $this->aModule = null; } - return $this; } // setDeliveryModuleId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -525,16 +518,15 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -546,7 +538,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -650,10 +641,10 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -690,7 +681,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AreaDeliveryModule::setDeleted() @@ -733,8 +724,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -795,8 +786,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -846,7 +837,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -924,7 +915,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -940,12 +931,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -959,7 +950,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -992,12 +983,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1035,12 +1026,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1054,8 +1045,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1092,8 +1083,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1112,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface if ($this->isColumnModified(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID)) $criteria->add(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $this->delivery_module_id); if ($this->isColumnModified(AreaDeliveryModuleTableMap::CREATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1143,7 +1133,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1153,7 +1143,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1167,7 +1157,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1177,9 +1166,9 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AreaDeliveryModule (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AreaDeliveryModule (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1202,8 +1191,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AreaDeliveryModule Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AreaDeliveryModule Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1219,8 +1208,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Declares an association between this object and a ChildArea object. * - * @param ChildArea $v - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param ChildArea $v + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) * @throws PropelException */ public function setArea(ChildArea $v = null) @@ -1239,7 +1228,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $v->addAreaDeliveryModule($this); } - return $this; } @@ -1247,8 +1235,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Get the associated ChildArea object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildArea The associated ChildArea object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildArea The associated ChildArea object. * @throws PropelException */ public function getArea(ConnectionInterface $con = null) @@ -1270,8 +1258,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support) * @throws PropelException */ public function setModule(ChildModule $v = null) @@ -1290,7 +1278,6 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface $v->addAreaDeliveryModule($this); } - return $this; } @@ -1298,8 +1285,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModule(ConnectionInterface $con = null) @@ -1342,7 +1329,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1368,7 +1355,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAreaDeliveryModule The current object (for fluent API support) + * @return ChildAreaDeliveryModule The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php b/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php index 2d21d28e0..b4ab79284 100644 --- a/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php +++ b/core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php @@ -67,9 +67,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AreaDeliveryModuleQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AreaDeliveryModule', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Returns a new ChildAreaDeliveryModuleQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAreaDeliveryModuleQuery */ @@ -109,7 +109,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter @@ -140,10 +140,10 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAreaDeliveryModule A model object, or null if the key is not found + * @return ChildAreaDeliveryModule A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -170,8 +170,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter */ @@ -191,8 +191,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -213,26 +213,24 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $keys, Criteria::IN); } @@ -246,11 +244,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -289,11 +287,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * * @see filterByArea() * - * @param mixed $areaId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $areaId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -332,11 +330,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * * @see filterByModule() * - * @param mixed $deliveryModuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $deliveryModuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -373,13 +371,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -416,13 +414,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -452,8 +450,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Area object * - * @param \Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -477,8 +475,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Area relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -511,11 +509,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query */ public function useAreaQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -527,8 +525,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -552,8 +550,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Module relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -586,11 +584,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -602,7 +600,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAreaDeliveryModule $areaDeliveryModule Object to remove from the list of results + * @param ChildAreaDeliveryModule $areaDeliveryModule Object to remove from the list of results * * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ @@ -618,8 +616,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Deletes all rows from the area_delivery_module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -650,13 +648,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAreaDeliveryModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAreaDeliveryModule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAreaDeliveryModule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -676,7 +674,6 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AreaDeliveryModuleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -695,9 +692,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -707,9 +704,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -719,7 +716,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -729,7 +726,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -739,7 +736,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -749,7 +746,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface + * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/AreaQuery.php b/core/lib/Thelia/Model/Base/AreaQuery.php index e1033e576..f2ca14354 100644 --- a/core/lib/Thelia/Model/Base/AreaQuery.php +++ b/core/lib/Thelia/Model/Base/AreaQuery.php @@ -67,9 +67,9 @@ abstract class AreaQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AreaQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Area', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class AreaQuery extends ModelCriteria /** * Returns a new ChildAreaQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAreaQuery */ @@ -109,7 +109,7 @@ abstract class AreaQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildArea|array|mixed the result, formatted by the current formatter @@ -140,10 +140,10 @@ abstract class AreaQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildArea A model object, or null if the key is not found + * @return ChildArea A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -170,8 +170,8 @@ abstract class AreaQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildArea|array|mixed the result, formatted by the current formatter */ @@ -191,8 +191,8 @@ abstract class AreaQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -213,26 +213,24 @@ abstract class AreaQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAreaQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AreaTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAreaQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AreaTableMap::ID, $keys, Criteria::IN); } @@ -246,11 +244,11 @@ abstract class AreaQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -286,9 +284,9 @@ abstract class AreaQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -316,11 +314,11 @@ abstract class AreaQuery extends ModelCriteria * $query->filterByPostage(array('min' => 12)); // WHERE postage > 12 * * - * @param mixed $postage The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $postage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -357,13 +355,13 @@ abstract class AreaQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -400,13 +398,13 @@ abstract class AreaQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -436,8 +434,8 @@ abstract class AreaQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Country object * - * @param \Thelia\Model\Country|ObjectCollection $country the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Country|ObjectCollection $country the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -459,8 +457,8 @@ abstract class AreaQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Country relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAreaQuery The current query, for fluid interface */ @@ -493,11 +491,11 @@ abstract class AreaQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query */ public function useCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -509,8 +507,8 @@ abstract class AreaQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AreaDeliveryModule object * - * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAreaQuery The current query, for fluid interface */ @@ -532,8 +530,8 @@ abstract class AreaQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AreaDeliveryModule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAreaQuery The current query, for fluid interface */ @@ -566,11 +564,11 @@ abstract class AreaQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query */ public function useAreaDeliveryModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -582,7 +580,7 @@ abstract class AreaQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildArea $area Object to remove from the list of results + * @param ChildArea $area Object to remove from the list of results * * @return ChildAreaQuery The current query, for fluid interface */ @@ -598,8 +596,8 @@ abstract class AreaQuery extends ModelCriteria /** * Deletes all rows from the area table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -630,13 +628,13 @@ abstract class AreaQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildArea or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildArea object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildArea object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -656,7 +654,6 @@ abstract class AreaQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AreaTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -675,9 +672,9 @@ abstract class AreaQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -687,9 +684,9 @@ abstract class AreaQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -699,7 +696,7 @@ abstract class AreaQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -709,7 +706,7 @@ abstract class AreaQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -719,7 +716,7 @@ abstract class AreaQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -729,7 +726,7 @@ abstract class AreaQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAreaQuery The current query, for fluid interface + * @return ChildAreaQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php index 05d30c1ca..09a4676c1 100644 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -38,7 +38,6 @@ abstract class Attribute implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -379,9 +378,9 @@ abstract class Attribute implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Attribute The current object, for fluid interface */ @@ -431,22 +430,20 @@ abstract class Attribute implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -454,8 +451,8 @@ abstract class Attribute implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -474,8 +471,8 @@ abstract class Attribute implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -493,8 +490,8 @@ abstract class Attribute implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function setId($v) { @@ -507,15 +504,14 @@ abstract class Attribute implements ActiveRecordInterface $this->modifiedColumns[AttributeTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function setPosition($v) { @@ -528,16 +524,15 @@ abstract class Attribute implements ActiveRecordInterface $this->modifiedColumns[AttributeTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -549,16 +544,15 @@ abstract class Attribute implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -570,7 +564,6 @@ abstract class Attribute implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -665,10 +658,10 @@ abstract class Attribute implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -712,7 +705,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Attribute::setDeleted() @@ -755,8 +748,8 @@ abstract class Attribute implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -817,8 +810,8 @@ abstract class Attribute implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -944,7 +937,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1016,7 +1009,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1032,12 +1025,12 @@ abstract class Attribute implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1051,7 +1044,7 @@ abstract class Attribute implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1081,12 +1074,12 @@ abstract class Attribute implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1129,12 +1122,12 @@ abstract class Attribute implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1148,8 +1141,8 @@ abstract class Attribute implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1183,8 +1176,8 @@ abstract class Attribute implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1210,7 +1203,6 @@ abstract class Attribute implements ActiveRecordInterface if ($this->isColumnModified(AttributeTableMap::POSITION)) $criteria->add(AttributeTableMap::POSITION, $this->position); if ($this->isColumnModified(AttributeTableMap::CREATED_AT)) $criteria->add(AttributeTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AttributeTableMap::UPDATED_AT)) $criteria->add(AttributeTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1232,7 +1224,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1242,7 +1234,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1256,7 +1248,6 @@ abstract class Attribute implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1266,9 +1257,9 @@ abstract class Attribute implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Attribute (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Attribute (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1322,8 +1313,8 @@ abstract class Attribute implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Attribute Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Attribute Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1342,7 +1333,7 @@ abstract class Attribute implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1390,8 +1381,8 @@ abstract class Attribute implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1413,8 +1404,8 @@ abstract class Attribute implements ActiveRecordInterface * If this ChildAttribute is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeAv[] List of ChildAttributeAv objects * @throws PropelException */ @@ -1470,15 +1461,14 @@ abstract class Attribute implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeAvs A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttribute The current object (for fluent API support) + * @param Collection $attributeAvs A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttribute The current object (for fluent API support) */ public function setAttributeAvs(Collection $attributeAvs, ConnectionInterface $con = null) { $attributeAvsToDelete = $this->getAttributeAvs(new Criteria(), $con)->diff($attributeAvs); - $this->attributeAvsScheduledForDeletion = $attributeAvsToDelete; foreach ($attributeAvsToDelete as $attributeAvRemoved) { @@ -1499,10 +1489,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the number of related AttributeAv objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeAv objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeAv objects. * @throws PropelException */ public function countAttributeAvs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1534,8 +1524,8 @@ abstract class Attribute implements ActiveRecordInterface * Method called to associate a ChildAttributeAv object to this object * through the ChildAttributeAv foreign key attribute. * - * @param ChildAttributeAv $l ChildAttributeAv - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param ChildAttributeAv $l ChildAttributeAv + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function addAttributeAv(ChildAttributeAv $l) { @@ -1561,7 +1551,7 @@ abstract class Attribute implements ActiveRecordInterface } /** - * @param AttributeAv $attributeAv The attributeAv object to remove. + * @param AttributeAv $attributeAv The attributeAv object to remove. * @return ChildAttribute The current object (for fluent API support) */ public function removeAttributeAv($attributeAv) @@ -1608,8 +1598,8 @@ abstract class Attribute implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1631,8 +1621,8 @@ abstract class Attribute implements ActiveRecordInterface * If this ChildAttribute is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects * @throws PropelException */ @@ -1688,15 +1678,14 @@ abstract class Attribute implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeCombinations A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttribute The current object (for fluent API support) + * @param Collection $attributeCombinations A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttribute The current object (for fluent API support) */ public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null) { $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1720,10 +1709,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the number of related AttributeCombination objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeCombination objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeCombination objects. * @throws PropelException */ public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1755,8 +1744,8 @@ abstract class Attribute implements ActiveRecordInterface * Method called to associate a ChildAttributeCombination object to this object * through the ChildAttributeCombination foreign key attribute. * - * @param ChildAttributeCombination $l ChildAttributeCombination - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param ChildAttributeCombination $l ChildAttributeCombination + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function addAttributeCombination(ChildAttributeCombination $l) { @@ -1783,7 +1772,7 @@ abstract class Attribute implements ActiveRecordInterface /** * @param AttributeCombination $attributeCombination The attributeCombination object to remove. - * @return ChildAttribute The current object (for fluent API support) + * @return ChildAttribute The current object (for fluent API support) */ public function removeAttributeCombination($attributeCombination) { @@ -1800,7 +1789,6 @@ abstract class Attribute implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1812,9 +1800,9 @@ abstract class Attribute implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Attribute. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinAttributeAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1825,7 +1813,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getAttributeCombinations($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1837,9 +1824,9 @@ abstract class Attribute implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Attribute. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1879,8 +1866,8 @@ abstract class Attribute implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1902,8 +1889,8 @@ abstract class Attribute implements ActiveRecordInterface * If this ChildAttribute is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects * @throws PropelException */ @@ -1959,15 +1946,14 @@ abstract class Attribute implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeTemplates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttribute The current object (for fluent API support) + * @param Collection $attributeTemplates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttribute The current object (for fluent API support) */ public function setAttributeTemplates(Collection $attributeTemplates, ConnectionInterface $con = null) { $attributeTemplatesToDelete = $this->getAttributeTemplates(new Criteria(), $con)->diff($attributeTemplates); - $this->attributeTemplatesScheduledForDeletion = $attributeTemplatesToDelete; foreach ($attributeTemplatesToDelete as $attributeTemplateRemoved) { @@ -1988,10 +1974,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the number of related AttributeTemplate objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeTemplate objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeTemplate objects. * @throws PropelException */ public function countAttributeTemplates(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2023,8 +2009,8 @@ abstract class Attribute implements ActiveRecordInterface * Method called to associate a ChildAttributeTemplate object to this object * through the ChildAttributeTemplate foreign key attribute. * - * @param ChildAttributeTemplate $l ChildAttributeTemplate - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param ChildAttributeTemplate $l ChildAttributeTemplate + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function addAttributeTemplate(ChildAttributeTemplate $l) { @@ -2051,7 +2037,7 @@ abstract class Attribute implements ActiveRecordInterface /** * @param AttributeTemplate $attributeTemplate The attributeTemplate object to remove. - * @return ChildAttribute The current object (for fluent API support) + * @return ChildAttribute The current object (for fluent API support) */ public function removeAttributeTemplate($attributeTemplate) { @@ -2068,7 +2054,6 @@ abstract class Attribute implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2080,9 +2065,9 @@ abstract class Attribute implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Attribute. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects */ public function getAttributeTemplatesJoinTemplate($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2122,8 +2107,8 @@ abstract class Attribute implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2145,8 +2130,8 @@ abstract class Attribute implements ActiveRecordInterface * If this ChildAttribute is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeI18n[] List of ChildAttributeI18n objects * @throws PropelException */ @@ -2202,15 +2187,14 @@ abstract class Attribute implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttribute The current object (for fluent API support) + * @param Collection $attributeI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttribute The current object (for fluent API support) */ public function setAttributeI18ns(Collection $attributeI18ns, ConnectionInterface $con = null) { $attributeI18nsToDelete = $this->getAttributeI18ns(new Criteria(), $con)->diff($attributeI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2234,10 +2218,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the number of related AttributeI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeI18n objects. * @throws PropelException */ public function countAttributeI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2269,8 +2253,8 @@ abstract class Attribute implements ActiveRecordInterface * Method called to associate a ChildAttributeI18n object to this object * through the ChildAttributeI18n foreign key attribute. * - * @param ChildAttributeI18n $l ChildAttributeI18n - * @return \Thelia\Model\Attribute The current object (for fluent API support) + * @param ChildAttributeI18n $l ChildAttributeI18n + * @return \Thelia\Model\Attribute The current object (for fluent API support) */ public function addAttributeI18n(ChildAttributeI18n $l) { @@ -2300,7 +2284,7 @@ abstract class Attribute implements ActiveRecordInterface } /** - * @param AttributeI18n $attributeI18n The attributeI18n object to remove. + * @param AttributeI18n $attributeI18n The attributeI18n object to remove. * @return ChildAttribute The current object (for fluent API support) */ public function removeAttributeI18n($attributeI18n) @@ -2358,8 +2342,8 @@ abstract class Attribute implements ActiveRecordInterface * If this ChildAttribute is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildTemplate[] List of ChildTemplate objects */ @@ -2389,9 +2373,9 @@ abstract class Attribute implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $templates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttribute The current object (for fluent API support) + * @param Collection $templates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttribute The current object (for fluent API support) */ public function setTemplates(Collection $templates, ConnectionInterface $con = null) { @@ -2415,9 +2399,9 @@ abstract class Attribute implements ActiveRecordInterface * Gets the number of ChildTemplate objects related by a many-to-many relationship * to the current object by way of the attribute_template cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildTemplate objects */ @@ -2445,7 +2429,7 @@ abstract class Attribute implements ActiveRecordInterface * Associate a ChildTemplate object to this object * through the attribute_template cross reference table. * - * @param ChildTemplate $template The ChildAttributeTemplate object to relate + * @param ChildTemplate $template The ChildAttributeTemplate object to relate * @return ChildAttribute The current object (for fluent API support) */ public function addTemplate(ChildTemplate $template) @@ -2463,7 +2447,7 @@ abstract class Attribute implements ActiveRecordInterface } /** - * @param Template $template The template object to add. + * @param Template $template The template object to add. */ protected function doAddTemplate($template) { @@ -2482,7 +2466,7 @@ abstract class Attribute implements ActiveRecordInterface * Remove a ChildTemplate object to this object * through the attribute_template cross reference table. * - * @param ChildTemplate $template The ChildAttributeTemplate object to relate + * @param ChildTemplate $template The ChildAttributeTemplate object to relate * @return ChildAttribute The current object (for fluent API support) */ public function removeTemplate(ChildTemplate $template) @@ -2524,7 +2508,7 @@ abstract class Attribute implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2582,7 +2566,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAttribute The current object (for fluent API support) + * @return ChildAttribute The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2596,9 +2580,9 @@ abstract class Attribute implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildAttribute The current object (for fluent API support) + * @return ChildAttribute The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2610,7 +2594,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2620,8 +2604,8 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2654,10 +2638,10 @@ abstract class Attribute implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildAttribute The current object (for fluent API support) + * @return ChildAttribute The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2682,7 +2666,7 @@ abstract class Attribute implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2690,7 +2674,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2701,7 +2684,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2714,7 +2696,6 @@ abstract class Attribute implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2725,7 +2706,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2738,7 +2718,6 @@ abstract class Attribute implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2749,7 +2728,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2762,7 +2740,6 @@ abstract class Attribute implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2773,7 +2750,6 @@ abstract class Attribute implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2862,7 +2838,6 @@ abstract class Attribute implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php index 57eddd579..73d2085c8 100644 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -34,7 +34,6 @@ abstract class AttributeAv implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeAvTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -351,9 +350,9 @@ abstract class AttributeAv implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AttributeAv The current object, for fluid interface */ @@ -403,33 +402,30 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [attribute_id] column value. * - * @return int + * @return int */ public function getAttributeId() { - return $this->attribute_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -437,8 +433,8 @@ abstract class AttributeAv implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +453,8 @@ abstract class AttributeAv implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -476,8 +472,8 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function setId($v) { @@ -490,15 +486,14 @@ abstract class AttributeAv implements ActiveRecordInterface $this->modifiedColumns[AttributeAvTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [attribute_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function setAttributeId($v) { @@ -515,15 +510,14 @@ abstract class AttributeAv implements ActiveRecordInterface $this->aAttribute = null; } - return $this; } // setAttributeId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function setPosition($v) { @@ -536,16 +530,15 @@ abstract class AttributeAv implements ActiveRecordInterface $this->modifiedColumns[AttributeAvTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -557,16 +550,15 @@ abstract class AttributeAv implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -578,7 +570,6 @@ abstract class AttributeAv implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -679,10 +670,10 @@ abstract class AttributeAv implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -722,7 +713,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AttributeAv::setDeleted() @@ -765,8 +756,8 @@ abstract class AttributeAv implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -827,8 +818,8 @@ abstract class AttributeAv implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -905,7 +896,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -983,7 +974,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -999,12 +990,12 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1018,7 +1009,7 @@ abstract class AttributeAv implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1051,12 +1042,12 @@ abstract class AttributeAv implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1097,12 +1088,12 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1116,8 +1107,8 @@ abstract class AttributeAv implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1154,8 +1145,8 @@ abstract class AttributeAv implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1183,7 +1174,6 @@ abstract class AttributeAv implements ActiveRecordInterface if ($this->isColumnModified(AttributeAvTableMap::POSITION)) $criteria->add(AttributeAvTableMap::POSITION, $this->position); if ($this->isColumnModified(AttributeAvTableMap::CREATED_AT)) $criteria->add(AttributeAvTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AttributeAvTableMap::UPDATED_AT)) $criteria->add(AttributeAvTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1205,7 +1195,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1215,7 +1205,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1229,7 +1219,6 @@ abstract class AttributeAv implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1239,9 +1228,9 @@ abstract class AttributeAv implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AttributeAv (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AttributeAv (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1284,8 +1273,8 @@ abstract class AttributeAv implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AttributeAv Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AttributeAv Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1301,8 +1290,8 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttribute object. * - * @param ChildAttribute $v - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param ChildAttribute $v + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) * @throws PropelException */ public function setAttribute(ChildAttribute $v = null) @@ -1321,7 +1310,6 @@ abstract class AttributeAv implements ActiveRecordInterface $v->addAttributeAv($this); } - return $this; } @@ -1329,8 +1317,8 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Get the associated ChildAttribute object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttribute The associated ChildAttribute object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttribute The associated ChildAttribute object. * @throws PropelException */ public function getAttribute(ConnectionInterface $con = null) @@ -1355,7 +1343,7 @@ abstract class AttributeAv implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1397,8 +1385,8 @@ abstract class AttributeAv implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1420,8 +1408,8 @@ abstract class AttributeAv implements ActiveRecordInterface * If this ChildAttributeAv is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects * @throws PropelException */ @@ -1477,15 +1465,14 @@ abstract class AttributeAv implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeCombinations A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttributeAv The current object (for fluent API support) + * @param Collection $attributeCombinations A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttributeAv The current object (for fluent API support) */ public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null) { $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1509,10 +1496,10 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Returns the number of related AttributeCombination objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeCombination objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeCombination objects. * @throws PropelException */ public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1544,8 +1531,8 @@ abstract class AttributeAv implements ActiveRecordInterface * Method called to associate a ChildAttributeCombination object to this object * through the ChildAttributeCombination foreign key attribute. * - * @param ChildAttributeCombination $l ChildAttributeCombination - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param ChildAttributeCombination $l ChildAttributeCombination + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function addAttributeCombination(ChildAttributeCombination $l) { @@ -1572,7 +1559,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * @param AttributeCombination $attributeCombination The attributeCombination object to remove. - * @return ChildAttributeAv The current object (for fluent API support) + * @return ChildAttributeAv The current object (for fluent API support) */ public function removeAttributeCombination($attributeCombination) { @@ -1589,7 +1576,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1601,9 +1587,9 @@ abstract class AttributeAv implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in AttributeAv. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinAttribute($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1614,7 +1600,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getAttributeCombinations($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1626,9 +1611,9 @@ abstract class AttributeAv implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in AttributeAv. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1668,8 +1653,8 @@ abstract class AttributeAv implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1691,8 +1676,8 @@ abstract class AttributeAv implements ActiveRecordInterface * If this ChildAttributeAv is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeAvI18n[] List of ChildAttributeAvI18n objects * @throws PropelException */ @@ -1748,15 +1733,14 @@ abstract class AttributeAv implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeAvI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildAttributeAv The current object (for fluent API support) + * @param Collection $attributeAvI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildAttributeAv The current object (for fluent API support) */ public function setAttributeAvI18ns(Collection $attributeAvI18ns, ConnectionInterface $con = null) { $attributeAvI18nsToDelete = $this->getAttributeAvI18ns(new Criteria(), $con)->diff($attributeAvI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1780,10 +1764,10 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Returns the number of related AttributeAvI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeAvI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeAvI18n objects. * @throws PropelException */ public function countAttributeAvI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1815,8 +1799,8 @@ abstract class AttributeAv implements ActiveRecordInterface * Method called to associate a ChildAttributeAvI18n object to this object * through the ChildAttributeAvI18n foreign key attribute. * - * @param ChildAttributeAvI18n $l ChildAttributeAvI18n - * @return \Thelia\Model\AttributeAv The current object (for fluent API support) + * @param ChildAttributeAvI18n $l ChildAttributeAvI18n + * @return \Thelia\Model\AttributeAv The current object (for fluent API support) */ public function addAttributeAvI18n(ChildAttributeAvI18n $l) { @@ -1846,7 +1830,7 @@ abstract class AttributeAv implements ActiveRecordInterface } /** - * @param AttributeAvI18n $attributeAvI18n The attributeAvI18n object to remove. + * @param AttributeAvI18n $attributeAvI18n The attributeAvI18n object to remove. * @return ChildAttributeAv The current object (for fluent API support) */ public function removeAttributeAvI18n($attributeAvI18n) @@ -1888,7 +1872,7 @@ abstract class AttributeAv implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1929,7 +1913,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAttributeAv The current object (for fluent API support) + * @return ChildAttributeAv The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1943,9 +1927,9 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildAttributeAv The current object (for fluent API support) + * @return ChildAttributeAv The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1957,7 +1941,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1967,8 +1951,8 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeAvI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2001,10 +1985,10 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildAttributeAv The current object (for fluent API support) + * @return ChildAttributeAv The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2029,7 +2013,7 @@ abstract class AttributeAv implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeAvI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2037,7 +2021,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2048,7 +2031,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2061,7 +2043,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2072,7 +2053,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2085,7 +2065,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2096,7 +2075,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2109,7 +2087,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2120,7 +2097,6 @@ abstract class AttributeAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2209,7 +2185,6 @@ abstract class AttributeAv implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php index e6ba4dd03..6f044307d 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -26,7 +26,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeAvI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AttributeAvI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->aAttributeAv = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeAvI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeAvI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeAvI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeAvI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeAvI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeAvI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AttributeAvI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface if ($this->isColumnModified(AttributeAvI18nTableMap::DESCRIPTION)) $criteria->add(AttributeAvI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(AttributeAvI18nTableMap::CHAPO)) $criteria->add(AttributeAvI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(AttributeAvI18nTableMap::POSTSCRIPTUM)) $criteria->add(AttributeAvI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AttributeAvI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AttributeAvI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AttributeAvI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AttributeAvI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttributeAv object. * - * @param ChildAttributeAv $v - * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) + * @param ChildAttributeAv $v + * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support) * @throws PropelException */ public function setAttributeAv(ChildAttributeAv $v = null) @@ -1247,16 +1231,14 @@ abstract class AttributeAvI18n implements ActiveRecordInterface $v->addAttributeAvI18n($this); } - return $this; } - /** * Get the associated ChildAttributeAv object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttributeAv The associated ChildAttributeAv object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttributeAv The associated ChildAttributeAv object. * @throws PropelException */ public function getAttributeAv(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php index df90b3baa..0d5116f8d 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php @@ -67,9 +67,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeAvI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeAvI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Returns a new ChildAttributeAvI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeAvI18nQuery */ @@ -140,10 +140,10 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttributeAvI18n A model object, or null if the key is not found + * @return ChildAttributeAvI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttributeAvI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * * @see filterByAttributeAv() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\AttributeAv object * * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class AttributeAvI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query */ public function useAttributeAvQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttributeAvI18n $attributeAvI18n Object to remove from the list of results + * @param ChildAttributeAvI18n $attributeAvI18n Object to remove from the list of results * * @return ChildAttributeAvI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Deletes all rows from the attribute_av_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class AttributeAvI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttributeAvI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttributeAvI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttributeAvI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class AttributeAvI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeAvI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php index d0227b7c9..8c0af8c07 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeAvQuery.php @@ -72,9 +72,9 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeAvQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeAv', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Returns a new ChildAttributeAvQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeAvQuery */ @@ -114,7 +114,7 @@ abstract class AttributeAvQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeAv|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class AttributeAvQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttributeAv A model object, or null if the key is not found + * @return ChildAttributeAv A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttributeAv|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class AttributeAvQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeAvQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AttributeAvTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeAvQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AttributeAvTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class AttributeAvQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class AttributeAvQuery extends ModelCriteria * * @see filterByAttribute() * - * @param mixed $attributeId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $attributeId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -335,11 +333,11 @@ abstract class AttributeAvQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -376,13 +374,13 @@ abstract class AttributeAvQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -419,13 +417,13 @@ abstract class AttributeAvQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -455,8 +453,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Attribute object * - * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -480,8 +478,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Attribute relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -514,11 +512,11 @@ abstract class AttributeAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query */ public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -530,8 +528,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeCombination object * - * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -553,8 +551,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeCombination relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -587,11 +585,11 @@ abstract class AttributeAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query */ public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -603,8 +601,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeAvI18n object * - * @param \Thelia\Model\AttributeAvI18n|ObjectCollection $attributeAvI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeAvI18n|ObjectCollection $attributeAvI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -626,8 +624,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeAvI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -660,11 +658,11 @@ abstract class AttributeAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeAvI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeAvI18nQuery A secondary query class using the current class as primary query */ public function useAttributeAvI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -676,7 +674,7 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttributeAv $attributeAv Object to remove from the list of results + * @param ChildAttributeAv $attributeAv Object to remove from the list of results * * @return ChildAttributeAvQuery The current query, for fluid interface */ @@ -692,8 +690,8 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Deletes all rows from the attribute_av table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -724,13 +722,13 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttributeAv or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttributeAv object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttributeAv object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -750,7 +748,6 @@ abstract class AttributeAvQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeAvTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -769,9 +766,9 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -781,9 +778,9 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -793,7 +790,7 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -803,7 +800,7 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -813,7 +810,7 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -823,7 +820,7 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -835,11 +832,11 @@ abstract class AttributeAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -854,10 +851,10 @@ abstract class AttributeAvQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeAvQuery The current query, for fluid interface + * @return ChildAttributeAvQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -874,11 +871,11 @@ abstract class AttributeAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeAvI18nQuery A secondary query class using the current class as primary query + * @return ChildAttributeAvI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php index 44dc93257..ce5507889 100644 --- a/core/lib/Thelia/Model/Base/AttributeCombination.php +++ b/core/lib/Thelia/Model/Base/AttributeCombination.php @@ -33,7 +33,6 @@ abstract class AttributeCombination implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeCombinationTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -322,9 +321,9 @@ abstract class AttributeCombination implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AttributeCombination The current object, for fluid interface */ @@ -374,33 +373,30 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the [attribute_id] column value. * - * @return int + * @return int */ public function getAttributeId() { - return $this->attribute_id; } /** * Get the [attribute_av_id] column value. * - * @return int + * @return int */ public function getAttributeAvId() { - return $this->attribute_av_id; } /** * Get the [product_sale_elements_id] column value. * - * @return int + * @return int */ public function getProductSaleElementsId() { - return $this->product_sale_elements_id; } @@ -408,8 +404,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -428,8 +424,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -447,8 +443,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Set the value of [attribute_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) */ public function setAttributeId($v) { @@ -465,15 +461,14 @@ abstract class AttributeCombination implements ActiveRecordInterface $this->aAttribute = null; } - return $this; } // setAttributeId() /** * Set the value of [attribute_av_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) */ public function setAttributeAvId($v) { @@ -490,15 +485,14 @@ abstract class AttributeCombination implements ActiveRecordInterface $this->aAttributeAv = null; } - return $this; } // setAttributeAvId() /** * Set the value of [product_sale_elements_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) */ public function setProductSaleElementsId($v) { @@ -515,16 +509,15 @@ abstract class AttributeCombination implements ActiveRecordInterface $this->aProductSaleElements = null; } - return $this; } // setProductSaleElementsId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -536,16 +529,15 @@ abstract class AttributeCombination implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -557,7 +549,6 @@ abstract class AttributeCombination implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -664,10 +655,10 @@ abstract class AttributeCombination implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -705,7 +696,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AttributeCombination::setDeleted() @@ -748,8 +739,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -810,8 +801,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -868,7 +859,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -878,7 +869,6 @@ abstract class AttributeCombination implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) { $modifiedColumns[':p' . $index++] = '`ATTRIBUTE_ID`'; @@ -935,7 +925,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -951,12 +941,12 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -970,7 +960,7 @@ abstract class AttributeCombination implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1003,12 +993,12 @@ abstract class AttributeCombination implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1049,12 +1039,12 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1068,8 +1058,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1106,8 +1096,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1135,7 +1125,6 @@ abstract class AttributeCombination implements ActiveRecordInterface if ($this->isColumnModified(AttributeCombinationTableMap::PRODUCT_SALE_ELEMENTS_ID)) $criteria->add(AttributeCombinationTableMap::PRODUCT_SALE_ELEMENTS_ID, $this->product_sale_elements_id); if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) $criteria->add(AttributeCombinationTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AttributeCombinationTableMap::UPDATED_AT)) $criteria->add(AttributeCombinationTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1175,7 +1164,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1191,7 +1180,6 @@ abstract class AttributeCombination implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getAttributeId()) && (null === $this->getAttributeAvId()) && (null === $this->getProductSaleElementsId()); } @@ -1201,9 +1189,9 @@ abstract class AttributeCombination implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AttributeCombination (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AttributeCombination (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1226,8 +1214,8 @@ abstract class AttributeCombination implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AttributeCombination Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AttributeCombination Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1243,8 +1231,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttribute object. * - * @param ChildAttribute $v - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param ChildAttribute $v + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) * @throws PropelException */ public function setAttribute(ChildAttribute $v = null) @@ -1263,7 +1251,6 @@ abstract class AttributeCombination implements ActiveRecordInterface $v->addAttributeCombination($this); } - return $this; } @@ -1271,8 +1258,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the associated ChildAttribute object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttribute The associated ChildAttribute object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttribute The associated ChildAttribute object. * @throws PropelException */ public function getAttribute(ConnectionInterface $con = null) @@ -1294,8 +1281,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttributeAv object. * - * @param ChildAttributeAv $v - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param ChildAttributeAv $v + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) * @throws PropelException */ public function setAttributeAv(ChildAttributeAv $v = null) @@ -1314,7 +1301,6 @@ abstract class AttributeCombination implements ActiveRecordInterface $v->addAttributeCombination($this); } - return $this; } @@ -1322,8 +1308,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the associated ChildAttributeAv object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttributeAv The associated ChildAttributeAv object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttributeAv The associated ChildAttributeAv object. * @throws PropelException */ public function getAttributeAv(ConnectionInterface $con = null) @@ -1345,8 +1331,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Declares an association between this object and a ChildProductSaleElements object. * - * @param ChildProductSaleElements $v - * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) + * @param ChildProductSaleElements $v + * @return \Thelia\Model\AttributeCombination The current object (for fluent API support) * @throws PropelException */ public function setProductSaleElements(ChildProductSaleElements $v = null) @@ -1365,7 +1351,6 @@ abstract class AttributeCombination implements ActiveRecordInterface $v->addAttributeCombination($this); } - return $this; } @@ -1373,8 +1358,8 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Get the associated ChildProductSaleElements object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProductSaleElements The associated ChildProductSaleElements object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProductSaleElements The associated ChildProductSaleElements object. * @throws PropelException */ public function getProductSaleElements(ConnectionInterface $con = null) @@ -1417,7 +1402,7 @@ abstract class AttributeCombination implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1444,7 +1429,7 @@ abstract class AttributeCombination implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAttributeCombination The current object (for fluent API support) + * @return ChildAttributeCombination The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php index d77286e11..9f93d1f96 100644 --- a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php @@ -71,9 +71,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeCombinationQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeCombination', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Returns a new ChildAttributeCombinationQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeCombinationQuery */ @@ -144,10 +144,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttributeCombination A model object, or null if the key is not found + * @return ChildAttributeCombination A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -176,8 +176,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttributeCombination|array|mixed the result, formatted by the current formatter */ @@ -197,8 +197,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -219,7 +219,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -235,7 +235,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -268,11 +268,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see filterByAttribute() * - * @param mixed $attributeId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $attributeId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -311,11 +311,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see filterByAttributeAv() * - * @param mixed $attributeAvId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $attributeAvId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -354,11 +354,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see filterByProductSaleElements() * - * @param mixed $productSaleElementsId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productSaleElementsId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -395,13 +395,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -438,13 +438,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -474,8 +474,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Attribute object * - * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -499,8 +499,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Attribute relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -533,11 +533,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query */ public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -550,7 +550,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\AttributeAv object * * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -574,8 +574,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -608,11 +608,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query */ public function useAttributeAvQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -625,7 +625,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ProductSaleElements object * * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -649,8 +649,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductSaleElements relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -683,11 +683,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query */ public function useProductSaleElementsQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -699,7 +699,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttributeCombination $attributeCombination Object to remove from the list of results + * @param ChildAttributeCombination $attributeCombination Object to remove from the list of results * * @return ChildAttributeCombinationQuery The current query, for fluid interface */ @@ -718,8 +718,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Deletes all rows from the attribute_combination table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -750,13 +750,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttributeCombination or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttributeCombination object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttributeCombination object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -776,7 +776,6 @@ abstract class AttributeCombinationQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeCombinationTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -795,9 +794,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -807,9 +806,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -819,7 +818,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -829,7 +828,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -839,7 +838,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -849,7 +848,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAttributeCombinationQuery The current query, for fluid interface + * @return ChildAttributeCombinationQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php index 6c42fded2..e8a9035d8 100644 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -26,7 +26,6 @@ abstract class AttributeI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class AttributeI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AttributeI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->aAttribute = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class AttributeI18n implements ActiveRecordInterface $this->modifiedColumns[AttributeI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class AttributeI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class AttributeI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AttributeI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class AttributeI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class AttributeI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class AttributeI18n implements ActiveRecordInterface if ($this->isColumnModified(AttributeI18nTableMap::DESCRIPTION)) $criteria->add(AttributeI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(AttributeI18nTableMap::CHAPO)) $criteria->add(AttributeI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(AttributeI18nTableMap::POSTSCRIPTUM)) $criteria->add(AttributeI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class AttributeI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AttributeI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AttributeI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class AttributeI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AttributeI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AttributeI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttribute object. * - * @param ChildAttribute $v - * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) + * @param ChildAttribute $v + * @return \Thelia\Model\AttributeI18n The current object (for fluent API support) * @throws PropelException */ public function setAttribute(ChildAttribute $v = null) @@ -1247,16 +1231,14 @@ abstract class AttributeI18n implements ActiveRecordInterface $v->addAttributeI18n($this); } - return $this; } - /** * Get the associated ChildAttribute object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttribute The associated ChildAttribute object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttribute The associated ChildAttribute object. * @throws PropelException */ public function getAttribute(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class AttributeI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/AttributeI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeI18nQuery.php index 5b7f05df5..c7141046f 100644 --- a/core/lib/Thelia/Model/Base/AttributeI18nQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeI18nQuery.php @@ -67,9 +67,9 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Returns a new ChildAttributeI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeI18nQuery */ @@ -140,10 +140,10 @@ abstract class AttributeI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttributeI18n A model object, or null if the key is not found + * @return ChildAttributeI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttributeI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class AttributeI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class AttributeI18nQuery extends ModelCriteria * * @see filterByAttribute() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class AttributeI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class AttributeI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class AttributeI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class AttributeI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class AttributeI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Attribute object * - * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Attribute relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class AttributeI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query */ public function useAttributeQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttributeI18n $attributeI18n Object to remove from the list of results + * @param ChildAttributeI18n $attributeI18n Object to remove from the list of results * * @return ChildAttributeI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Deletes all rows from the attribute_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class AttributeI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttributeI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttributeI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttributeI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class AttributeI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php index a2f2b6915..8481dd96f 100644 --- a/core/lib/Thelia/Model/Base/AttributeQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeQuery.php @@ -72,9 +72,9 @@ abstract class AttributeQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Attribute', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Returns a new ChildAttributeQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeQuery */ @@ -114,7 +114,7 @@ abstract class AttributeQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAttribute|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class AttributeQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttribute A model object, or null if the key is not found + * @return ChildAttribute A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttribute|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class AttributeQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AttributeTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AttributeTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class AttributeQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -292,11 +290,11 @@ abstract class AttributeQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -333,13 +331,13 @@ abstract class AttributeQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -376,13 +374,13 @@ abstract class AttributeQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -412,8 +410,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeAv object * - * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -435,8 +433,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -469,11 +467,11 @@ abstract class AttributeQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query */ public function useAttributeAvQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -485,8 +483,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeCombination object * - * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -508,8 +506,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeCombination relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -542,11 +540,11 @@ abstract class AttributeQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query */ public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -558,8 +556,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeTemplate object * - * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -581,8 +579,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeTemplate relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -615,11 +613,11 @@ abstract class AttributeQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query */ public function useAttributeTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -631,8 +629,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeI18n object * - * @param \Thelia\Model\AttributeI18n|ObjectCollection $attributeI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeI18n|ObjectCollection $attributeI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -654,8 +652,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -688,11 +686,11 @@ abstract class AttributeQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeI18nQuery A secondary query class using the current class as primary query */ public function useAttributeI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -705,8 +703,8 @@ abstract class AttributeQuery extends ModelCriteria * Filter the query by a related Template object * using the attribute_template table as cross reference * - * @param Template $template the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Template $template the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -721,7 +719,7 @@ abstract class AttributeQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttribute $attribute Object to remove from the list of results + * @param ChildAttribute $attribute Object to remove from the list of results * * @return ChildAttributeQuery The current query, for fluid interface */ @@ -737,8 +735,8 @@ abstract class AttributeQuery extends ModelCriteria /** * Deletes all rows from the attribute table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -769,13 +767,13 @@ abstract class AttributeQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttribute or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttribute object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttribute object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -795,7 +793,6 @@ abstract class AttributeQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -814,9 +811,9 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -826,9 +823,9 @@ abstract class AttributeQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -838,7 +835,7 @@ abstract class AttributeQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -848,7 +845,7 @@ abstract class AttributeQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -858,7 +855,7 @@ abstract class AttributeQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -868,7 +865,7 @@ abstract class AttributeQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -880,11 +877,11 @@ abstract class AttributeQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -899,10 +896,10 @@ abstract class AttributeQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeQuery The current query, for fluid interface + * @return ChildAttributeQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -919,11 +916,11 @@ abstract class AttributeQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildAttributeI18nQuery A secondary query class using the current class as primary query + * @return ChildAttributeI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/AttributeTemplate.php b/core/lib/Thelia/Model/Base/AttributeTemplate.php index 144510c25..8f05b01cf 100644 --- a/core/lib/Thelia/Model/Base/AttributeTemplate.php +++ b/core/lib/Thelia/Model/Base/AttributeTemplate.php @@ -31,7 +31,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeTemplateTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -321,9 +320,9 @@ abstract class AttributeTemplate implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return AttributeTemplate The current object, for fluid interface */ @@ -373,44 +372,40 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [attribute_id] column value. * - * @return int + * @return int */ public function getAttributeId() { - return $this->attribute_id; } /** * Get the [template_id] column value. * - * @return int + * @return int */ public function getTemplateId() { - return $this->template_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -418,8 +413,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -438,8 +433,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +452,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setId($v) { @@ -471,15 +466,14 @@ abstract class AttributeTemplate implements ActiveRecordInterface $this->modifiedColumns[AttributeTemplateTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [attribute_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setAttributeId($v) { @@ -496,15 +490,14 @@ abstract class AttributeTemplate implements ActiveRecordInterface $this->aAttribute = null; } - return $this; } // setAttributeId() /** * Set the value of [template_id] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setTemplateId($v) { @@ -521,15 +514,14 @@ abstract class AttributeTemplate implements ActiveRecordInterface $this->aTemplate = null; } - return $this; } // setTemplateId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setPosition($v) { @@ -542,16 +534,15 @@ abstract class AttributeTemplate implements ActiveRecordInterface $this->modifiedColumns[AttributeTemplateTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -563,16 +554,15 @@ abstract class AttributeTemplate implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -584,7 +574,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -691,10 +680,10 @@ abstract class AttributeTemplate implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -731,7 +720,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see AttributeTemplate::setDeleted() @@ -774,8 +763,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -836,8 +825,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -887,7 +876,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -971,7 +960,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -987,12 +976,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1006,7 +995,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1042,12 +1031,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1086,12 +1075,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1105,8 +1094,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1146,8 +1135,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1177,7 +1166,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface if ($this->isColumnModified(AttributeTemplateTableMap::POSITION)) $criteria->add(AttributeTemplateTableMap::POSITION, $this->position); if ($this->isColumnModified(AttributeTemplateTableMap::CREATED_AT)) $criteria->add(AttributeTemplateTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(AttributeTemplateTableMap::UPDATED_AT)) $criteria->add(AttributeTemplateTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1199,7 +1187,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1209,7 +1197,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1223,7 +1211,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1233,9 +1220,9 @@ abstract class AttributeTemplate implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\AttributeTemplate (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\AttributeTemplate (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1259,8 +1246,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\AttributeTemplate Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\AttributeTemplate Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1276,8 +1263,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Declares an association between this object and a ChildAttribute object. * - * @param ChildAttribute $v - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param ChildAttribute $v + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) * @throws PropelException */ public function setAttribute(ChildAttribute $v = null) @@ -1296,7 +1283,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface $v->addAttributeTemplate($this); } - return $this; } @@ -1304,8 +1290,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Get the associated ChildAttribute object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAttribute The associated ChildAttribute object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAttribute The associated ChildAttribute object. * @throws PropelException */ public function getAttribute(ConnectionInterface $con = null) @@ -1327,8 +1313,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Declares an association between this object and a ChildTemplate object. * - * @param ChildTemplate $v - * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) + * @param ChildTemplate $v + * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support) * @throws PropelException */ public function setTemplate(ChildTemplate $v = null) @@ -1347,7 +1333,6 @@ abstract class AttributeTemplate implements ActiveRecordInterface $v->addAttributeTemplate($this); } - return $this; } @@ -1355,8 +1340,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Get the associated ChildTemplate object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTemplate The associated ChildTemplate object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTemplate The associated ChildTemplate object. * @throws PropelException */ public function getTemplate(ConnectionInterface $con = null) @@ -1400,7 +1385,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1426,7 +1411,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildAttributeTemplate The current object (for fluent API support) + * @return ChildAttributeTemplate The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/AttributeTemplateQuery.php b/core/lib/Thelia/Model/Base/AttributeTemplateQuery.php index bbfd77ebb..0cc79c76a 100644 --- a/core/lib/Thelia/Model/Base/AttributeTemplateQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeTemplateQuery.php @@ -71,9 +71,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\AttributeTemplateQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeTemplate', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Returns a new ChildAttributeTemplateQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildAttributeTemplateQuery */ @@ -113,7 +113,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeTemplate|array|mixed the result, formatted by the current formatter @@ -144,10 +144,10 @@ abstract class AttributeTemplateQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildAttributeTemplate A model object, or null if the key is not found + * @return ChildAttributeTemplate A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -174,8 +174,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildAttributeTemplate|array|mixed the result, formatted by the current formatter */ @@ -195,8 +195,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -217,26 +217,24 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(AttributeTemplateTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(AttributeTemplateTableMap::ID, $keys, Criteria::IN); } @@ -250,11 +248,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -293,11 +291,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * * @see filterByAttribute() * - * @param mixed $attributeId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $attributeId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -336,11 +334,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * * @see filterByTemplate() * - * @param mixed $templateId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $templateId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -377,11 +375,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -418,13 +416,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -461,13 +459,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -497,8 +495,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Attribute object * - * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -522,8 +520,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Attribute relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query */ public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -572,8 +570,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Template object * - * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -597,8 +595,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Template relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -631,11 +629,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query */ public function useTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -647,7 +645,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildAttributeTemplate $attributeTemplate Object to remove from the list of results + * @param ChildAttributeTemplate $attributeTemplate Object to remove from the list of results * * @return ChildAttributeTemplateQuery The current query, for fluid interface */ @@ -663,8 +661,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Deletes all rows from the attribute_template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -695,13 +693,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildAttributeTemplate or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildAttributeTemplate object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildAttributeTemplate object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -721,7 +719,6 @@ abstract class AttributeTemplateQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - AttributeTemplateTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -740,9 +737,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -752,9 +749,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -764,7 +761,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -774,7 +771,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -784,7 +781,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -794,7 +791,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildAttributeTemplateQuery The current query, for fluid interface + * @return ChildAttributeTemplateQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php index 3d86fb87f..1d50f13d7 100644 --- a/core/lib/Thelia/Model/Base/Cart.php +++ b/core/lib/Thelia/Model/Base/Cart.php @@ -36,7 +36,6 @@ abstract class Cart implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CartTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -380,9 +379,9 @@ abstract class Cart implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Cart The current object, for fluid interface */ @@ -432,77 +431,70 @@ abstract class Cart implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [token] column value. * - * @return string + * @return string */ public function getToken() { - return $this->token; } /** * Get the [customer_id] column value. * - * @return int + * @return int */ public function getCustomerId() { - return $this->customer_id; } /** * Get the [address_delivery_id] column value. * - * @return int + * @return int */ public function getAddressDeliveryId() { - return $this->address_delivery_id; } /** * Get the [address_invoice_id] column value. * - * @return int + * @return int */ public function getAddressInvoiceId() { - return $this->address_invoice_id; } /** * Get the [currency_id] column value. * - * @return int + * @return int */ public function getCurrencyId() { - return $this->currency_id; } /** * Get the [discount] column value. * - * @return double + * @return double */ public function getDiscount() { - return $this->discount; } @@ -510,8 +502,8 @@ abstract class Cart implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -530,8 +522,8 @@ abstract class Cart implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -549,8 +541,8 @@ abstract class Cart implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setId($v) { @@ -563,15 +555,14 @@ abstract class Cart implements ActiveRecordInterface $this->modifiedColumns[CartTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [token] column. * - * @param string $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setToken($v) { @@ -584,15 +575,14 @@ abstract class Cart implements ActiveRecordInterface $this->modifiedColumns[CartTableMap::TOKEN] = true; } - return $this; } // setToken() /** * Set the value of [customer_id] column. * - * @param int $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setCustomerId($v) { @@ -609,15 +599,14 @@ abstract class Cart implements ActiveRecordInterface $this->aCustomer = null; } - return $this; } // setCustomerId() /** * Set the value of [address_delivery_id] column. * - * @param int $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setAddressDeliveryId($v) { @@ -634,15 +623,14 @@ abstract class Cart implements ActiveRecordInterface $this->aAddressRelatedByAddressDeliveryId = null; } - return $this; } // setAddressDeliveryId() /** * Set the value of [address_invoice_id] column. * - * @param int $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setAddressInvoiceId($v) { @@ -659,15 +647,14 @@ abstract class Cart implements ActiveRecordInterface $this->aAddressRelatedByAddressInvoiceId = null; } - return $this; } // setAddressInvoiceId() /** * Set the value of [currency_id] column. * - * @param int $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setCurrencyId($v) { @@ -684,15 +671,14 @@ abstract class Cart implements ActiveRecordInterface $this->aCurrency = null; } - return $this; } // setCurrencyId() /** * Set the value of [discount] column. * - * @param double $v new value - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setDiscount($v) { @@ -705,16 +691,15 @@ abstract class Cart implements ActiveRecordInterface $this->modifiedColumns[CartTableMap::DISCOUNT] = true; } - return $this; } // setDiscount() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -726,16 +711,15 @@ abstract class Cart implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -747,7 +731,6 @@ abstract class Cart implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -791,7 +774,6 @@ abstract class Cart implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CartTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -873,10 +855,10 @@ abstract class Cart implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -917,7 +899,7 @@ abstract class Cart implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Cart::setDeleted() @@ -960,8 +942,8 @@ abstract class Cart implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1022,8 +1004,8 @@ abstract class Cart implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1104,7 +1086,7 @@ abstract class Cart implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1206,7 +1188,7 @@ abstract class Cart implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1222,12 +1204,12 @@ abstract class Cart implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1241,7 +1223,7 @@ abstract class Cart implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1286,12 +1268,12 @@ abstract class Cart implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1342,12 +1324,12 @@ abstract class Cart implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1361,8 +1343,8 @@ abstract class Cart implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1411,8 +1393,8 @@ abstract class Cart implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1448,7 +1430,6 @@ abstract class Cart implements ActiveRecordInterface if ($this->isColumnModified(CartTableMap::DISCOUNT)) $criteria->add(CartTableMap::DISCOUNT, $this->discount); if ($this->isColumnModified(CartTableMap::CREATED_AT)) $criteria->add(CartTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CartTableMap::UPDATED_AT)) $criteria->add(CartTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1470,7 +1451,7 @@ abstract class Cart implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1480,7 +1461,7 @@ abstract class Cart implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1494,7 +1475,6 @@ abstract class Cart implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1504,9 +1484,9 @@ abstract class Cart implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Cart (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Cart (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1547,8 +1527,8 @@ abstract class Cart implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Cart Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Cart Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1564,8 +1544,8 @@ abstract class Cart implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomer object. * - * @param ChildCustomer $v - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param ChildCustomer $v + * @return \Thelia\Model\Cart The current object (for fluent API support) * @throws PropelException */ public function setCustomer(ChildCustomer $v = null) @@ -1584,7 +1564,6 @@ abstract class Cart implements ActiveRecordInterface $v->addCart($this); } - return $this; } @@ -1592,8 +1571,8 @@ abstract class Cart implements ActiveRecordInterface /** * Get the associated ChildCustomer object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomer The associated ChildCustomer object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomer The associated ChildCustomer object. * @throws PropelException */ public function getCustomer(ConnectionInterface $con = null) @@ -1615,8 +1594,8 @@ abstract class Cart implements ActiveRecordInterface /** * Declares an association between this object and a ChildAddress object. * - * @param ChildAddress $v - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param ChildAddress $v + * @return \Thelia\Model\Cart The current object (for fluent API support) * @throws PropelException */ public function setAddressRelatedByAddressDeliveryId(ChildAddress $v = null) @@ -1635,7 +1614,6 @@ abstract class Cart implements ActiveRecordInterface $v->addCartRelatedByAddressDeliveryId($this); } - return $this; } @@ -1643,8 +1621,8 @@ abstract class Cart implements ActiveRecordInterface /** * Get the associated ChildAddress object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAddress The associated ChildAddress object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAddress The associated ChildAddress object. * @throws PropelException */ public function getAddressRelatedByAddressDeliveryId(ConnectionInterface $con = null) @@ -1666,8 +1644,8 @@ abstract class Cart implements ActiveRecordInterface /** * Declares an association between this object and a ChildAddress object. * - * @param ChildAddress $v - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param ChildAddress $v + * @return \Thelia\Model\Cart The current object (for fluent API support) * @throws PropelException */ public function setAddressRelatedByAddressInvoiceId(ChildAddress $v = null) @@ -1686,7 +1664,6 @@ abstract class Cart implements ActiveRecordInterface $v->addCartRelatedByAddressInvoiceId($this); } - return $this; } @@ -1694,8 +1671,8 @@ abstract class Cart implements ActiveRecordInterface /** * Get the associated ChildAddress object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildAddress The associated ChildAddress object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildAddress The associated ChildAddress object. * @throws PropelException */ public function getAddressRelatedByAddressInvoiceId(ConnectionInterface $con = null) @@ -1717,8 +1694,8 @@ abstract class Cart implements ActiveRecordInterface /** * Declares an association between this object and a ChildCurrency object. * - * @param ChildCurrency $v - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param ChildCurrency $v + * @return \Thelia\Model\Cart The current object (for fluent API support) * @throws PropelException */ public function setCurrency(ChildCurrency $v = null) @@ -1737,7 +1714,6 @@ abstract class Cart implements ActiveRecordInterface $v->addCart($this); } - return $this; } @@ -1745,8 +1721,8 @@ abstract class Cart implements ActiveRecordInterface /** * Get the associated ChildCurrency object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCurrency The associated ChildCurrency object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCurrency The associated ChildCurrency object. * @throws PropelException */ public function getCurrency(ConnectionInterface $con = null) @@ -1771,7 +1747,7 @@ abstract class Cart implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1810,8 +1786,8 @@ abstract class Cart implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1833,8 +1809,8 @@ abstract class Cart implements ActiveRecordInterface * If this ChildCart is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCartItem[] List of ChildCartItem objects * @throws PropelException */ @@ -1890,15 +1866,14 @@ abstract class Cart implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $cartItems A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCart The current object (for fluent API support) + * @param Collection $cartItems A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCart The current object (for fluent API support) */ public function setCartItems(Collection $cartItems, ConnectionInterface $con = null) { $cartItemsToDelete = $this->getCartItems(new Criteria(), $con)->diff($cartItems); - $this->cartItemsScheduledForDeletion = $cartItemsToDelete; foreach ($cartItemsToDelete as $cartItemRemoved) { @@ -1919,10 +1894,10 @@ abstract class Cart implements ActiveRecordInterface /** * Returns the number of related CartItem objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CartItem objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CartItem objects. * @throws PropelException */ public function countCartItems(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1954,8 +1929,8 @@ abstract class Cart implements ActiveRecordInterface * Method called to associate a ChildCartItem object to this object * through the ChildCartItem foreign key attribute. * - * @param ChildCartItem $l ChildCartItem - * @return \Thelia\Model\Cart The current object (for fluent API support) + * @param ChildCartItem $l ChildCartItem + * @return \Thelia\Model\Cart The current object (for fluent API support) */ public function addCartItem(ChildCartItem $l) { @@ -1981,7 +1956,7 @@ abstract class Cart implements ActiveRecordInterface } /** - * @param CartItem $cartItem The cartItem object to remove. + * @param CartItem $cartItem The cartItem object to remove. * @return ChildCart The current object (for fluent API support) */ public function removeCartItem($cartItem) @@ -1999,7 +1974,6 @@ abstract class Cart implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2011,9 +1985,9 @@ abstract class Cart implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Cart. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2024,7 +1998,6 @@ abstract class Cart implements ActiveRecordInterface return $this->getCartItems($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2036,9 +2009,9 @@ abstract class Cart implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Cart. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2078,7 +2051,7 @@ abstract class Cart implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2112,7 +2085,7 @@ abstract class Cart implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCart The current object (for fluent API support) + * @return ChildCart The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2197,7 +2170,6 @@ abstract class Cart implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php index dcbba1ea6..23a8f34b3 100644 --- a/core/lib/Thelia/Model/Base/CartItem.php +++ b/core/lib/Thelia/Model/Base/CartItem.php @@ -33,7 +33,6 @@ abstract class CartItem implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CartItemTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -372,9 +371,9 @@ abstract class CartItem implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CartItem The current object, for fluid interface */ @@ -424,77 +423,70 @@ abstract class CartItem implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [cart_id] column value. * - * @return int + * @return int */ public function getCartId() { - return $this->cart_id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [quantity] column value. * - * @return double + * @return double */ public function getQuantity() { - return $this->quantity; } /** * Get the [product_sale_elements_id] column value. * - * @return int + * @return int */ public function getProductSaleElementsId() { - return $this->product_sale_elements_id; } /** * Get the [price] column value. * - * @return double + * @return double */ public function getPrice() { - return $this->price; } /** * Get the [promo_price] column value. * - * @return double + * @return double */ public function getPromoPrice() { - return $this->promo_price; } @@ -502,8 +494,8 @@ abstract class CartItem implements ActiveRecordInterface * Get the [optionally formatted] temporal [price_end_of_life] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -521,11 +513,10 @@ abstract class CartItem implements ActiveRecordInterface /** * Get the [promo] column value. * - * @return int + * @return int */ public function getPromo() { - return $this->promo; } @@ -533,8 +524,8 @@ abstract class CartItem implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -553,8 +544,8 @@ abstract class CartItem implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -572,8 +563,8 @@ abstract class CartItem implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setId($v) { @@ -586,15 +577,14 @@ abstract class CartItem implements ActiveRecordInterface $this->modifiedColumns[CartItemTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [cart_id] column. * - * @param int $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setCartId($v) { @@ -611,15 +601,14 @@ abstract class CartItem implements ActiveRecordInterface $this->aCart = null; } - return $this; } // setCartId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setProductId($v) { @@ -636,15 +625,14 @@ abstract class CartItem implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [quantity] column. * - * @param double $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setQuantity($v) { @@ -657,15 +645,14 @@ abstract class CartItem implements ActiveRecordInterface $this->modifiedColumns[CartItemTableMap::QUANTITY] = true; } - return $this; } // setQuantity() /** * Set the value of [product_sale_elements_id] column. * - * @param int $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setProductSaleElementsId($v) { @@ -682,15 +669,14 @@ abstract class CartItem implements ActiveRecordInterface $this->aProductSaleElements = null; } - return $this; } // setProductSaleElementsId() /** * Set the value of [price] column. * - * @param double $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setPrice($v) { @@ -703,15 +689,14 @@ abstract class CartItem implements ActiveRecordInterface $this->modifiedColumns[CartItemTableMap::PRICE] = true; } - return $this; } // setPrice() /** * Set the value of [promo_price] column. * - * @param double $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setPromoPrice($v) { @@ -724,16 +709,15 @@ abstract class CartItem implements ActiveRecordInterface $this->modifiedColumns[CartItemTableMap::PROMO_PRICE] = true; } - return $this; } // setPromoPrice() /** * Sets the value of [price_end_of_life] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setPriceEndOfLife($v) { @@ -745,15 +729,14 @@ abstract class CartItem implements ActiveRecordInterface } } // if either are not null - return $this; } // setPriceEndOfLife() /** * Set the value of [promo] column. * - * @param int $v new value - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setPromo($v) { @@ -766,16 +749,15 @@ abstract class CartItem implements ActiveRecordInterface $this->modifiedColumns[CartItemTableMap::PROMO] = true; } - return $this; } // setPromo() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -787,16 +769,15 @@ abstract class CartItem implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CartItem The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -808,7 +789,6 @@ abstract class CartItem implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -852,7 +832,6 @@ abstract class CartItem implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CartItemTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -940,10 +919,10 @@ abstract class CartItem implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -981,7 +960,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CartItem::setDeleted() @@ -1024,8 +1003,8 @@ abstract class CartItem implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1086,8 +1065,8 @@ abstract class CartItem implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1144,7 +1123,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1258,7 +1237,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1274,12 +1253,12 @@ abstract class CartItem implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1293,7 +1272,7 @@ abstract class CartItem implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1344,12 +1323,12 @@ abstract class CartItem implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1396,12 +1375,12 @@ abstract class CartItem implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1415,8 +1394,8 @@ abstract class CartItem implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1471,8 +1450,8 @@ abstract class CartItem implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1512,7 +1491,6 @@ abstract class CartItem implements ActiveRecordInterface if ($this->isColumnModified(CartItemTableMap::PROMO)) $criteria->add(CartItemTableMap::PROMO, $this->promo); if ($this->isColumnModified(CartItemTableMap::CREATED_AT)) $criteria->add(CartItemTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CartItemTableMap::UPDATED_AT)) $criteria->add(CartItemTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1534,7 +1512,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1544,7 +1522,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1558,7 +1536,6 @@ abstract class CartItem implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1568,9 +1545,9 @@ abstract class CartItem implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CartItem (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CartItem (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1599,8 +1576,8 @@ abstract class CartItem implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CartItem Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CartItem Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1616,8 +1593,8 @@ abstract class CartItem implements ActiveRecordInterface /** * Declares an association between this object and a ChildCart object. * - * @param ChildCart $v - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param ChildCart $v + * @return \Thelia\Model\CartItem The current object (for fluent API support) * @throws PropelException */ public function setCart(ChildCart $v = null) @@ -1636,16 +1613,14 @@ abstract class CartItem implements ActiveRecordInterface $v->addCartItem($this); } - return $this; } - /** * Get the associated ChildCart object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCart The associated ChildCart object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCart The associated ChildCart object. * @throws PropelException */ public function getCart(ConnectionInterface $con = null) @@ -1667,8 +1642,8 @@ abstract class CartItem implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\CartItem The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1687,16 +1662,14 @@ abstract class CartItem implements ActiveRecordInterface $v->addCartItem($this); } - return $this; } - /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1718,8 +1691,8 @@ abstract class CartItem implements ActiveRecordInterface /** * Declares an association between this object and a ChildProductSaleElements object. * - * @param ChildProductSaleElements $v - * @return \Thelia\Model\CartItem The current object (for fluent API support) + * @param ChildProductSaleElements $v + * @return \Thelia\Model\CartItem The current object (for fluent API support) * @throws PropelException */ public function setProductSaleElements(ChildProductSaleElements $v = null) @@ -1738,16 +1711,14 @@ abstract class CartItem implements ActiveRecordInterface $v->addCartItem($this); } - return $this; } - /** * Get the associated ChildProductSaleElements object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProductSaleElements The associated ChildProductSaleElements object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProductSaleElements The associated ChildProductSaleElements object. * @throws PropelException */ public function getProductSaleElements(ConnectionInterface $con = null) @@ -1797,7 +1768,7 @@ abstract class CartItem implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1824,7 +1795,7 @@ abstract class CartItem implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCartItem The current object (for fluent API support) + * @return ChildCartItem The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1909,7 +1880,6 @@ abstract class CartItem implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/CartItemQuery.php b/core/lib/Thelia/Model/Base/CartItemQuery.php index 9e7e675d1..129b1f4c6 100644 --- a/core/lib/Thelia/Model/Base/CartItemQuery.php +++ b/core/lib/Thelia/Model/Base/CartItemQuery.php @@ -95,9 +95,9 @@ abstract class CartItemQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CartItemQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CartItem', $modelAlias = null) { @@ -107,8 +107,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Returns a new ChildCartItemQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCartItemQuery */ @@ -137,7 +137,7 @@ abstract class CartItemQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCartItem|array|mixed the result, formatted by the current formatter @@ -168,10 +168,10 @@ abstract class CartItemQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCartItem A model object, or null if the key is not found + * @return ChildCartItem A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -198,8 +198,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCartItem|array|mixed the result, formatted by the current formatter */ @@ -219,8 +219,8 @@ abstract class CartItemQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -241,26 +241,24 @@ abstract class CartItemQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCartItemQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CartItemTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCartItemQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CartItemTableMap::ID, $keys, Criteria::IN); } @@ -274,11 +272,11 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -317,11 +315,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see filterByCart() * - * @param mixed $cartId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $cartId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -360,11 +358,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -401,11 +399,11 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12 * * - * @param mixed $quantity The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $quantity The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -444,11 +442,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see filterByProductSaleElements() * - * @param mixed $productSaleElementsId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productSaleElementsId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -485,11 +483,11 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByPrice(array('min' => 12)); // WHERE price > 12 * * - * @param mixed $price The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $price The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -526,11 +524,11 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByPromoPrice(array('min' => 12)); // WHERE promo_price > 12 * * - * @param mixed $promoPrice The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $promoPrice The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -567,13 +565,13 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByPriceEndOfLife(array('max' => 'yesterday')); // WHERE price_end_of_life > '2011-03-13' * * - * @param mixed $priceEndOfLife The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $priceEndOfLife The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -610,11 +608,11 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12 * * - * @param mixed $promo The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $promo The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -651,13 +649,13 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -694,13 +692,13 @@ abstract class CartItemQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -730,8 +728,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Cart object * - * @param \Thelia\Model\Cart|ObjectCollection $cart The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Cart|ObjectCollection $cart The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -755,8 +753,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Cart relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -789,11 +787,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query */ public function useCartQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -805,8 +803,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -830,8 +828,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -864,11 +862,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -881,7 +879,7 @@ abstract class CartItemQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ProductSaleElements object * * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -905,8 +903,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductSaleElements relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -939,11 +937,11 @@ abstract class CartItemQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query */ public function useProductSaleElementsQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -955,7 +953,7 @@ abstract class CartItemQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCartItem $cartItem Object to remove from the list of results + * @param ChildCartItem $cartItem Object to remove from the list of results * * @return ChildCartItemQuery The current query, for fluid interface */ @@ -971,8 +969,8 @@ abstract class CartItemQuery extends ModelCriteria /** * Deletes all rows from the cart_item table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1003,13 +1001,13 @@ abstract class CartItemQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCartItem or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCartItem object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCartItem object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1029,7 +1027,6 @@ abstract class CartItemQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CartItemTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1048,9 +1045,9 @@ abstract class CartItemQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1060,9 +1057,9 @@ abstract class CartItemQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1072,7 +1069,7 @@ abstract class CartItemQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1082,7 +1079,7 @@ abstract class CartItemQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1092,7 +1089,7 @@ abstract class CartItemQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1102,7 +1099,7 @@ abstract class CartItemQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCartItemQuery The current query, for fluid interface + * @return ChildCartItemQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/CartQuery.php b/core/lib/Thelia/Model/Base/CartQuery.php index 9fbd97a12..b2c941fc5 100644 --- a/core/lib/Thelia/Model/Base/CartQuery.php +++ b/core/lib/Thelia/Model/Base/CartQuery.php @@ -95,9 +95,9 @@ abstract class CartQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CartQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Cart', $modelAlias = null) { @@ -107,8 +107,8 @@ abstract class CartQuery extends ModelCriteria /** * Returns a new ChildCartQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCartQuery */ @@ -137,7 +137,7 @@ abstract class CartQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCart|array|mixed the result, formatted by the current formatter @@ -168,10 +168,10 @@ abstract class CartQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCart A model object, or null if the key is not found + * @return ChildCart A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -198,8 +198,8 @@ abstract class CartQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCart|array|mixed the result, formatted by the current formatter */ @@ -219,8 +219,8 @@ abstract class CartQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -241,26 +241,24 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCartQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CartTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCartQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CartTableMap::ID, $keys, Criteria::IN); } @@ -274,11 +272,11 @@ abstract class CartQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -314,9 +312,9 @@ abstract class CartQuery extends ModelCriteria * $query->filterByToken('%fooValue%'); // WHERE token LIKE '%fooValue%' * * - * @param string $token The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $token The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -346,11 +344,11 @@ abstract class CartQuery extends ModelCriteria * * @see filterByCustomer() * - * @param mixed $customerId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $customerId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -389,11 +387,11 @@ abstract class CartQuery extends ModelCriteria * * @see filterByAddressRelatedByAddressDeliveryId() * - * @param mixed $addressDeliveryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $addressDeliveryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -432,11 +430,11 @@ abstract class CartQuery extends ModelCriteria * * @see filterByAddressRelatedByAddressInvoiceId() * - * @param mixed $addressInvoiceId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $addressInvoiceId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -475,11 +473,11 @@ abstract class CartQuery extends ModelCriteria * * @see filterByCurrency() * - * @param mixed $currencyId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $currencyId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -516,11 +514,11 @@ abstract class CartQuery extends ModelCriteria * $query->filterByDiscount(array('min' => 12)); // WHERE discount > 12 * * - * @param mixed $discount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $discount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -557,13 +555,13 @@ abstract class CartQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -600,13 +598,13 @@ abstract class CartQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -636,8 +634,8 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Customer object * - * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -661,8 +659,8 @@ abstract class CartQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Customer relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartQuery The current query, for fluid interface */ @@ -695,11 +693,11 @@ abstract class CartQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query */ public function useCustomerQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -711,8 +709,8 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Address object * - * @param \Thelia\Model\Address|ObjectCollection $address The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Address|ObjectCollection $address The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -736,8 +734,8 @@ abstract class CartQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AddressRelatedByAddressDeliveryId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartQuery The current query, for fluid interface */ @@ -770,11 +768,11 @@ abstract class CartQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query */ public function useAddressRelatedByAddressDeliveryIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -786,8 +784,8 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Address object * - * @param \Thelia\Model\Address|ObjectCollection $address The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Address|ObjectCollection $address The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -811,8 +809,8 @@ abstract class CartQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AddressRelatedByAddressInvoiceId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartQuery The current query, for fluid interface */ @@ -845,11 +843,11 @@ abstract class CartQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query */ public function useAddressRelatedByAddressInvoiceIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -861,8 +859,8 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Currency object * - * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -886,8 +884,8 @@ abstract class CartQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Currency relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartQuery The current query, for fluid interface */ @@ -920,11 +918,11 @@ abstract class CartQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query */ public function useCurrencyQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -936,8 +934,8 @@ abstract class CartQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CartItem object * - * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCartQuery The current query, for fluid interface */ @@ -959,8 +957,8 @@ abstract class CartQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CartItem relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCartQuery The current query, for fluid interface */ @@ -993,11 +991,11 @@ abstract class CartQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query */ public function useCartItemQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1009,7 +1007,7 @@ abstract class CartQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCart $cart Object to remove from the list of results + * @param ChildCart $cart Object to remove from the list of results * * @return ChildCartQuery The current query, for fluid interface */ @@ -1025,8 +1023,8 @@ abstract class CartQuery extends ModelCriteria /** * Deletes all rows from the cart table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1057,13 +1055,13 @@ abstract class CartQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCart or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCart object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCart object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1083,7 +1081,6 @@ abstract class CartQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CartTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1102,9 +1099,9 @@ abstract class CartQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1114,9 +1111,9 @@ abstract class CartQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1126,7 +1123,7 @@ abstract class CartQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1136,7 +1133,7 @@ abstract class CartQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1146,7 +1143,7 @@ abstract class CartQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1156,7 +1153,7 @@ abstract class CartQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCartQuery The current query, for fluid interface + * @return ChildCartQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index dc15b8fad..19220876b 100644 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -43,7 +43,6 @@ abstract class Category implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -190,7 +189,6 @@ abstract class Category implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -460,9 +458,9 @@ abstract class Category implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Category The current object, for fluid interface */ @@ -512,44 +510,40 @@ abstract class Category implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [parent] column value. * - * @return int + * @return int */ public function getParent() { - return $this->parent; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -557,8 +551,8 @@ abstract class Category implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -577,8 +571,8 @@ abstract class Category implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -596,11 +590,10 @@ abstract class Category implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -608,8 +601,8 @@ abstract class Category implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -627,19 +620,18 @@ abstract class Category implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setId($v) { @@ -652,15 +644,14 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [parent] column. * - * @param int $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setParent($v) { @@ -673,15 +664,14 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::PARENT] = true; } - return $this; } // setParent() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setVisible($v) { @@ -694,15 +684,14 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setPosition($v) { @@ -715,16 +704,15 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -736,16 +724,15 @@ abstract class Category implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -757,15 +744,14 @@ abstract class Category implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setVersion($v) { @@ -778,16 +764,15 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -799,15 +784,14 @@ abstract class Category implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -820,7 +804,6 @@ abstract class Category implements ActiveRecordInterface $this->modifiedColumns[CategoryTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -864,7 +847,6 @@ abstract class Category implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -937,10 +919,10 @@ abstract class Category implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -988,7 +970,7 @@ abstract class Category implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Category::setDeleted() @@ -1031,8 +1013,8 @@ abstract class Category implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1105,8 +1087,8 @@ abstract class Category implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1266,7 +1248,7 @@ abstract class Category implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1368,7 +1350,7 @@ abstract class Category implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1384,12 +1366,12 @@ abstract class Category implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1403,7 +1385,7 @@ abstract class Category implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1448,12 +1430,12 @@ abstract class Category implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1507,12 +1489,12 @@ abstract class Category implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1526,8 +1508,8 @@ abstract class Category implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1576,8 +1558,8 @@ abstract class Category implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1613,7 +1595,6 @@ abstract class Category implements ActiveRecordInterface if ($this->isColumnModified(CategoryTableMap::VERSION)) $criteria->add(CategoryTableMap::VERSION, $this->version); if ($this->isColumnModified(CategoryTableMap::VERSION_CREATED_AT)) $criteria->add(CategoryTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(CategoryTableMap::VERSION_CREATED_BY)) $criteria->add(CategoryTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1635,7 +1616,7 @@ abstract class Category implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1645,7 +1626,7 @@ abstract class Category implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1659,7 +1640,6 @@ abstract class Category implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1669,9 +1649,9 @@ abstract class Category implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Category (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Category (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1742,8 +1722,8 @@ abstract class Category implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Category Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Category Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1756,13 +1736,12 @@ abstract class Category implements ActiveRecordInterface return $copyObj; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1816,8 +1795,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1839,8 +1818,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductCategory[] List of ChildProductCategory objects * @throws PropelException */ @@ -1896,9 +1875,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productCategories A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $productCategories A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setProductCategories(Collection $productCategories, ConnectionInterface $con = null) { @@ -1928,10 +1907,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related ProductCategory objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductCategory objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductCategory objects. * @throws PropelException */ public function countProductCategories(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1963,8 +1942,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildProductCategory object to this object * through the ChildProductCategory foreign key attribute. * - * @param ChildProductCategory $l ChildProductCategory - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildProductCategory $l ChildProductCategory + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addProductCategory(ChildProductCategory $l) { @@ -1991,7 +1970,7 @@ abstract class Category implements ActiveRecordInterface /** * @param ProductCategory $productCategory The productCategory object to remove. - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function removeProductCategory($productCategory) { @@ -2020,9 +1999,9 @@ abstract class Category implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Category. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductCategory[] List of ChildProductCategory objects */ public function getProductCategoriesJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2062,8 +2041,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2085,8 +2064,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryImage[] List of ChildCategoryImage objects * @throws PropelException */ @@ -2142,9 +2121,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryImages A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $categoryImages A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setCategoryImages(Collection $categoryImages, ConnectionInterface $con = null) { @@ -2171,10 +2150,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related CategoryImage objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryImage objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryImage objects. * @throws PropelException */ public function countCategoryImages(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2206,8 +2185,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildCategoryImage object to this object * through the ChildCategoryImage foreign key attribute. * - * @param ChildCategoryImage $l ChildCategoryImage - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildCategoryImage $l ChildCategoryImage + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addCategoryImage(ChildCategoryImage $l) { @@ -2280,8 +2259,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2303,8 +2282,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryDocument[] List of ChildCategoryDocument objects * @throws PropelException */ @@ -2360,9 +2339,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryDocuments A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $categoryDocuments A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setCategoryDocuments(Collection $categoryDocuments, ConnectionInterface $con = null) { @@ -2389,10 +2368,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related CategoryDocument objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryDocument objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryDocument objects. * @throws PropelException */ public function countCategoryDocuments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2424,8 +2403,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildCategoryDocument object to this object * through the ChildCategoryDocument foreign key attribute. * - * @param ChildCategoryDocument $l ChildCategoryDocument - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildCategoryDocument $l ChildCategoryDocument + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addCategoryDocument(ChildCategoryDocument $l) { @@ -2452,7 +2431,7 @@ abstract class Category implements ActiveRecordInterface /** * @param CategoryDocument $categoryDocument The categoryDocument object to remove. - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function removeCategoryDocument($categoryDocument) { @@ -2498,8 +2477,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2521,8 +2500,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects * @throws PropelException */ @@ -2578,9 +2557,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryAssociatedContents A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $categoryAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setCategoryAssociatedContents(Collection $categoryAssociatedContents, ConnectionInterface $con = null) { @@ -2607,10 +2586,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related CategoryAssociatedContent objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryAssociatedContent objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryAssociatedContent objects. * @throws PropelException */ public function countCategoryAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2642,8 +2621,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildCategoryAssociatedContent object to this object * through the ChildCategoryAssociatedContent foreign key attribute. * - * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addCategoryAssociatedContent(ChildCategoryAssociatedContent $l) { @@ -2670,7 +2649,7 @@ abstract class Category implements ActiveRecordInterface /** * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to remove. - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function removeCategoryAssociatedContent($categoryAssociatedContent) { @@ -2699,9 +2678,9 @@ abstract class Category implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Category. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects */ public function getCategoryAssociatedContentsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2741,8 +2720,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2764,8 +2743,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryI18n[] List of ChildCategoryI18n objects * @throws PropelException */ @@ -2821,9 +2800,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $categoryI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setCategoryI18ns(Collection $categoryI18ns, ConnectionInterface $con = null) { @@ -2853,10 +2832,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related CategoryI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryI18n objects. * @throws PropelException */ public function countCategoryI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2888,8 +2867,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildCategoryI18n object to this object * through the ChildCategoryI18n foreign key attribute. * - * @param ChildCategoryI18n $l ChildCategoryI18n - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildCategoryI18n $l ChildCategoryI18n + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addCategoryI18n(ChildCategoryI18n $l) { @@ -2919,7 +2898,7 @@ abstract class Category implements ActiveRecordInterface } /** - * @param CategoryI18n $categoryI18n The categoryI18n object to remove. + * @param CategoryI18n $categoryI18n The categoryI18n object to remove. * @return ChildCategory The current object (for fluent API support) */ public function removeCategoryI18n($categoryI18n) @@ -2966,8 +2945,8 @@ abstract class Category implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2989,8 +2968,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryVersion[] List of ChildCategoryVersion objects * @throws PropelException */ @@ -3046,9 +3025,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $categoryVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setCategoryVersions(Collection $categoryVersions, ConnectionInterface $con = null) { @@ -3078,10 +3057,10 @@ abstract class Category implements ActiveRecordInterface /** * Returns the number of related CategoryVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryVersion objects. * @throws PropelException */ public function countCategoryVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3113,8 +3092,8 @@ abstract class Category implements ActiveRecordInterface * Method called to associate a ChildCategoryVersion object to this object * through the ChildCategoryVersion foreign key attribute. * - * @param ChildCategoryVersion $l ChildCategoryVersion - * @return \Thelia\Model\Category The current object (for fluent API support) + * @param ChildCategoryVersion $l ChildCategoryVersion + * @return \Thelia\Model\Category The current object (for fluent API support) */ public function addCategoryVersion(ChildCategoryVersion $l) { @@ -3141,7 +3120,7 @@ abstract class Category implements ActiveRecordInterface /** * @param CategoryVersion $categoryVersion The categoryVersion object to remove. - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function removeCategoryVersion($categoryVersion) { @@ -3198,8 +3177,8 @@ abstract class Category implements ActiveRecordInterface * If this ChildCategory is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildProduct[] List of ChildProduct objects */ @@ -3229,9 +3208,9 @@ abstract class Category implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $products A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) + * @param Collection $products A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) */ public function setProducts(Collection $products, ConnectionInterface $con = null) { @@ -3255,9 +3234,9 @@ abstract class Category implements ActiveRecordInterface * Gets the number of ChildProduct objects related by a many-to-many relationship * to the current object by way of the product_category cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildProduct objects */ @@ -3285,7 +3264,7 @@ abstract class Category implements ActiveRecordInterface * Associate a ChildProduct object to this object * through the product_category cross reference table. * - * @param ChildProduct $product The ChildProductCategory object to relate + * @param ChildProduct $product The ChildProductCategory object to relate * @return ChildCategory The current object (for fluent API support) */ public function addProduct(ChildProduct $product) @@ -3303,7 +3282,7 @@ abstract class Category implements ActiveRecordInterface } /** - * @param Product $product The product object to add. + * @param Product $product The product object to add. */ protected function doAddProduct($product) { @@ -3322,7 +3301,7 @@ abstract class Category implements ActiveRecordInterface * Remove a ChildProduct object to this object * through the product_category cross reference table. * - * @param ChildProduct $product The ChildProductCategory object to relate + * @param ChildProduct $product The ChildProductCategory object to relate * @return ChildCategory The current object (for fluent API support) */ public function removeProduct(ChildProduct $product) @@ -3370,7 +3349,7 @@ abstract class Category implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3440,9 +3419,9 @@ abstract class Category implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -3454,7 +3433,7 @@ abstract class Category implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -3464,8 +3443,8 @@ abstract class Category implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -3498,10 +3477,10 @@ abstract class Category implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -3526,7 +3505,7 @@ abstract class Category implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -3534,7 +3513,6 @@ abstract class Category implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -3545,7 +3523,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -3558,7 +3535,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -3569,7 +3545,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -3582,7 +3557,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -3593,7 +3567,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -3606,7 +3579,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -3617,7 +3589,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -3630,7 +3601,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [meta_title] column value. * @@ -3641,7 +3611,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaTitle(); } - /** * Set the value of [meta_title] column. * @@ -3654,7 +3623,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [meta_description] column value. * @@ -3665,7 +3633,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaDescription(); } - /** * Set the value of [meta_description] column. * @@ -3678,7 +3645,6 @@ abstract class Category implements ActiveRecordInterface return $this; } - /** * Get the [meta_keywords] column value. * @@ -3689,7 +3655,6 @@ abstract class Category implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaKeywords(); } - /** * Set the value of [meta_keywords] column. * @@ -3719,7 +3684,7 @@ abstract class Category implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -3741,9 +3706,9 @@ abstract class Category implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildCategoryVersion A version object + * @return ChildCategoryVersion A version object */ public function addVersion($con = null) { @@ -3768,10 +3733,10 @@ abstract class Category implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -3787,9 +3752,9 @@ abstract class Category implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildCategoryVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildCategoryVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildCategory The current object (for fluent API support) */ @@ -3812,9 +3777,9 @@ abstract class Category implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -3832,9 +3797,9 @@ abstract class Category implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -3844,10 +3809,10 @@ abstract class Category implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildCategoryVersion A version object + * @return ChildCategoryVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -3860,9 +3825,9 @@ abstract class Category implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildCategoryVersion objects + * @return ObjectCollection A list of ChildCategoryVersion objects */ public function getAllVersions($con = null) { @@ -3882,12 +3847,12 @@ abstract class Category implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -3907,13 +3872,13 @@ abstract class Category implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -3933,12 +3898,12 @@ abstract class Category implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -3975,7 +3940,7 @@ abstract class Category implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\CategoryVersion[] List of \Thelia\Model\CategoryVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) @@ -3991,7 +3956,7 @@ abstract class Category implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCategory The current object (for fluent API support) + * @return ChildCategory The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php index 4d754da4e..37ca71c40 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -31,7 +31,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryAssociatedContentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -321,9 +320,9 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryAssociatedContent The current object, for fluid interface */ @@ -373,44 +372,40 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [category_id] column value. * - * @return int + * @return int */ public function getCategoryId() { - return $this->category_id; } /** * Get the [content_id] column value. * - * @return int + * @return int */ public function getContentId() { - return $this->content_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -418,8 +413,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -438,8 +433,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +452,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setId($v) { @@ -471,15 +466,14 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $this->modifiedColumns[CategoryAssociatedContentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [category_id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setCategoryId($v) { @@ -496,15 +490,14 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setCategoryId() /** * Set the value of [content_id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setContentId($v) { @@ -521,15 +514,14 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setContentId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setPosition($v) { @@ -542,16 +534,15 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $this->modifiedColumns[CategoryAssociatedContentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -563,16 +554,15 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -584,7 +574,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -691,10 +680,10 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -731,7 +720,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryAssociatedContent::setDeleted() @@ -774,8 +763,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -836,8 +825,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -887,7 +876,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -971,7 +960,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -987,12 +976,12 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1006,7 +995,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1042,12 +1031,12 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1086,12 +1075,12 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1105,8 +1094,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1146,8 +1135,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1177,7 +1166,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface if ($this->isColumnModified(CategoryAssociatedContentTableMap::POSITION)) $criteria->add(CategoryAssociatedContentTableMap::POSITION, $this->position); if ($this->isColumnModified(CategoryAssociatedContentTableMap::CREATED_AT)) $criteria->add(CategoryAssociatedContentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CategoryAssociatedContentTableMap::UPDATED_AT)) $criteria->add(CategoryAssociatedContentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1199,7 +1187,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1209,7 +1197,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1223,7 +1211,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1233,9 +1220,9 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryAssociatedContent (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryAssociatedContent (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1259,8 +1246,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryAssociatedContent Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryAssociatedContent Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1276,8 +1263,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1296,7 +1283,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $v->addCategoryAssociatedContent($this); } - return $this; } @@ -1304,8 +1290,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1327,8 +1313,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1347,7 +1333,6 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface $v->addCategoryAssociatedContent($this); } - return $this; } @@ -1355,8 +1340,8 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1400,7 +1385,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1426,7 +1411,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCategoryAssociatedContent The current object (for fluent API support) + * @return ChildCategoryAssociatedContent The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php index dd5238d83..fa76cb167 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php @@ -71,9 +71,9 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryAssociatedContentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryAssociatedContent', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Returns a new ChildCategoryAssociatedContentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryAssociatedContentQuery */ @@ -113,7 +113,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryAssociatedContent|array|mixed the result, formatted by the current formatter @@ -144,10 +144,10 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryAssociatedContent A model object, or null if the key is not found + * @return ChildCategoryAssociatedContent A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -174,8 +174,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryAssociatedContent|array|mixed the result, formatted by the current formatter */ @@ -195,8 +195,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -217,26 +217,24 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $keys, Criteria::IN); } @@ -250,11 +248,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -293,11 +291,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $categoryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $categoryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -336,11 +334,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $contentId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -377,11 +375,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -418,13 +416,13 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -461,13 +459,13 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -497,8 +495,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -522,8 +520,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -572,8 +570,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -597,8 +595,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -631,11 +629,11 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -647,7 +645,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryAssociatedContent $categoryAssociatedContent Object to remove from the list of results + * @param ChildCategoryAssociatedContent $categoryAssociatedContent Object to remove from the list of results * * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ @@ -663,8 +661,8 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Deletes all rows from the category_associated_content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -695,13 +693,13 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryAssociatedContent or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryAssociatedContent object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -721,7 +719,6 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryAssociatedContentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -740,9 +737,9 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -752,9 +749,9 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -764,7 +761,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -774,7 +771,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -784,7 +781,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -794,7 +791,7 @@ abstract class CategoryAssociatedContentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php index 035f4d0ff..1d6ddf2e7 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -32,7 +32,6 @@ abstract class CategoryDocument implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryDocumentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class CategoryDocument implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryDocument The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [category_id] column value. * - * @return int + * @return int */ public function getCategoryId() { - return $this->category_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class CategoryDocument implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [category_id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setCategoryId($v) { @@ -518,15 +512,14 @@ abstract class CategoryDocument implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setCategoryId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class CategoryDocument implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class CategoryDocument implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class CategoryDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class CategoryDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class CategoryDocument implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryDocument::setDeleted() @@ -790,8 +779,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class CategoryDocument implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class CategoryDocument implements ActiveRecordInterface if ($this->isColumnModified(CategoryDocumentTableMap::POSITION)) $criteria->add(CategoryDocumentTableMap::POSITION, $this->position); if ($this->isColumnModified(CategoryDocumentTableMap::CREATED_AT)) $criteria->add(CategoryDocumentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CategoryDocumentTableMap::UPDATED_AT)) $criteria->add(CategoryDocumentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class CategoryDocument implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class CategoryDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryDocument (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryDocument (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryDocument Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryDocument Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1336,16 +1323,14 @@ abstract class CategoryDocument implements ActiveRecordInterface $v->addCategoryDocument($this); } - return $this; } - /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class CategoryDocument implements ActiveRecordInterface return $this->aCategory; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * If this ChildCategoryDocument is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryDocumentI18n[] List of ChildCategoryDocumentI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class CategoryDocument implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryDocumentI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategoryDocument The current object (for fluent API support) + * @param Collection $categoryDocumentI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategoryDocument The current object (for fluent API support) */ public function setCategoryDocumentI18ns(Collection $categoryDocumentI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Returns the number of related CategoryDocumentI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryDocumentI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryDocumentI18n objects. * @throws PropelException */ public function countCategoryDocumentI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class CategoryDocument implements ActiveRecordInterface * Method called to associate a ChildCategoryDocumentI18n object to this object * through the ChildCategoryDocumentI18n foreign key attribute. * - * @param ChildCategoryDocumentI18n $l ChildCategoryDocumentI18n - * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) + * @param ChildCategoryDocumentI18n $l ChildCategoryDocumentI18n + * @return \Thelia\Model\CategoryDocument The current object (for fluent API support) */ public function addCategoryDocumentI18n(ChildCategoryDocumentI18n $l) { @@ -1587,7 +1571,7 @@ abstract class CategoryDocument implements ActiveRecordInterface } /** - * @param CategoryDocumentI18n $categoryDocumentI18n The categoryDocumentI18n object to remove. + * @param CategoryDocumentI18n $categoryDocumentI18n The categoryDocumentI18n object to remove. * @return ChildCategoryDocument The current object (for fluent API support) */ public function removeCategoryDocumentI18n($categoryDocumentI18n) @@ -1630,7 +1614,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCategoryDocument The current object (for fluent API support) + * @return ChildCategoryDocument The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCategoryDocument The current object (for fluent API support) + * @return ChildCategoryDocument The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryDocumentI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCategoryDocument The current object (for fluent API support) + * @return ChildCategoryDocument The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class CategoryDocument implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryDocumentI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php index 15f3fcab5..e7cf35e8e 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -26,7 +26,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryDocumentI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryDocumentI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->aCategoryDocument = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryDocumentI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryDocumentI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryDocumentI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface if ($this->isColumnModified(CategoryDocumentI18nTableMap::DESCRIPTION)) $criteria->add(CategoryDocumentI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CategoryDocumentI18nTableMap::CHAPO)) $criteria->add(CategoryDocumentI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(CategoryDocumentI18nTableMap::POSTSCRIPTUM)) $criteria->add(CategoryDocumentI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryDocumentI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryDocumentI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryDocumentI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryDocumentI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategoryDocument object. * - * @param ChildCategoryDocument $v - * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) + * @param ChildCategoryDocument $v + * @return \Thelia\Model\CategoryDocumentI18n The current object (for fluent API support) * @throws PropelException */ public function setCategoryDocument(ChildCategoryDocument $v = null) @@ -1247,16 +1231,14 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface $v->addCategoryDocumentI18n($this); } - return $this; } - /** * Get the associated ChildCategoryDocument object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategoryDocument The associated ChildCategoryDocument object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategoryDocument The associated ChildCategoryDocument object. * @throws PropelException */ public function getCategoryDocument(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php index d9dc050aa..2695037d8 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php @@ -67,9 +67,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryDocumentI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryDocumentI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Returns a new ChildCategoryDocumentI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryDocumentI18nQuery */ @@ -140,10 +140,10 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryDocumentI18n A model object, or null if the key is not found + * @return ChildCategoryDocumentI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryDocumentI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * * @see filterByCategoryDocument() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\CategoryDocument object * * @param \Thelia\Model\CategoryDocument|ObjectCollection $categoryDocument The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryDocumentQuery A secondary query class using the current class as primary query */ public function useCategoryDocumentQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryDocumentI18n $categoryDocumentI18n Object to remove from the list of results + * @param ChildCategoryDocumentI18n $categoryDocumentI18n Object to remove from the list of results * * @return ChildCategoryDocumentI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Deletes all rows from the category_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class CategoryDocumentI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryDocumentI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php index 55fb01406..be4b142c6 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php @@ -72,9 +72,9 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryDocumentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryDocument', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Returns a new ChildCategoryDocumentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryDocumentQuery */ @@ -114,7 +114,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryDocument|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class CategoryDocumentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryDocument A model object, or null if the key is not found + * @return ChildCategoryDocument A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryDocument|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CategoryDocumentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CategoryDocumentTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $categoryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $categoryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class CategoryDocumentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryDocumentI18n object * - * @param \Thelia\Model\CategoryDocumentI18n|ObjectCollection $categoryDocumentI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryDocumentI18n|ObjectCollection $categoryDocumentI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryDocumentI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryDocumentI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryDocumentI18nQuery A secondary query class using the current class as primary query */ public function useCategoryDocumentI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryDocument $categoryDocument Object to remove from the list of results + * @param ChildCategoryDocument $categoryDocument Object to remove from the list of results * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Deletes all rows from the category_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class CategoryDocumentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryDocumentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class CategoryDocumentQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryDocumentQuery The current query, for fluid interface + * @return ChildCategoryDocumentQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryDocumentI18nQuery A secondary query class using the current class as primary query + * @return ChildCategoryDocumentI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php index 42db8b43f..538d27d4c 100644 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -26,7 +26,6 @@ abstract class CategoryI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class CategoryI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryI18n The current object, for fluid interface */ @@ -395,107 +394,98 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Get the [meta_title] column value. * - * @return string + * @return string */ public function getMetaTitle() { - return $this->meta_title; } /** * Get the [meta_description] column value. * - * @return string + * @return string */ public function getMetaDescription() { - return $this->meta_description; } /** * Get the [meta_keywords] column value. * - * @return string + * @return string */ public function getMetaKeywords() { - return $this->meta_keywords; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setId($v) { @@ -512,15 +502,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -533,15 +522,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -554,15 +542,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -575,15 +562,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -596,15 +582,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -617,15 +602,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() /** * Set the value of [meta_title] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setMetaTitle($v) { @@ -638,15 +622,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::META_TITLE] = true; } - return $this; } // setMetaTitle() /** * Set the value of [meta_description] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setMetaDescription($v) { @@ -659,15 +642,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::META_DESCRIPTION] = true; } - return $this; } // setMetaDescription() /** * Set the value of [meta_keywords] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) */ public function setMetaKeywords($v) { @@ -680,7 +662,6 @@ abstract class CategoryI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryI18nTableMap::META_KEYWORDS] = true; } - return $this; } // setMetaKeywords() @@ -724,7 +705,6 @@ abstract class CategoryI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -791,10 +771,10 @@ abstract class CategoryI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -830,7 +810,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryI18n::setDeleted() @@ -873,8 +853,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -924,8 +904,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -968,7 +948,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1059,7 +1039,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1075,12 +1055,12 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1094,7 +1074,7 @@ abstract class CategoryI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1139,12 +1119,12 @@ abstract class CategoryI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1183,12 +1163,12 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1202,8 +1182,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1252,8 +1232,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1289,7 +1269,6 @@ abstract class CategoryI18n implements ActiveRecordInterface if ($this->isColumnModified(CategoryI18nTableMap::META_TITLE)) $criteria->add(CategoryI18nTableMap::META_TITLE, $this->meta_title); if ($this->isColumnModified(CategoryI18nTableMap::META_DESCRIPTION)) $criteria->add(CategoryI18nTableMap::META_DESCRIPTION, $this->meta_description); if ($this->isColumnModified(CategoryI18nTableMap::META_KEYWORDS)) $criteria->add(CategoryI18nTableMap::META_KEYWORDS, $this->meta_keywords); - return $criteria; } @@ -1327,7 +1306,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1342,7 +1321,6 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1352,9 +1330,9 @@ abstract class CategoryI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1381,8 +1359,8 @@ abstract class CategoryI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1398,8 +1376,8 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\CategoryI18n The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1418,16 +1396,14 @@ abstract class CategoryI18n implements ActiveRecordInterface $v->addCategoryI18n($this); } - return $this; } - /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1475,7 +1451,7 @@ abstract class CategoryI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CategoryI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryI18nQuery.php index 68a692f2d..90658580f 100644 --- a/core/lib/Thelia/Model/Base/CategoryI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryI18nQuery.php @@ -79,9 +79,9 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryI18n', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Returns a new ChildCategoryI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryI18nQuery */ @@ -152,10 +152,10 @@ abstract class CategoryI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryI18n A model object, or null if the key is not found + * @return ChildCategoryI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryI18n|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class CategoryI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class CategoryI18nQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -312,9 +312,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -341,9 +341,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -370,9 +370,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -399,9 +399,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -428,9 +428,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -457,9 +457,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByMetaTitle('%fooValue%'); // WHERE meta_title LIKE '%fooValue%' * * - * @param string $metaTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -486,9 +486,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByMetaDescription('%fooValue%'); // WHERE meta_description LIKE '%fooValue%' * * - * @param string $metaDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -515,9 +515,9 @@ abstract class CategoryI18nQuery extends ModelCriteria * $query->filterByMetaKeywords('%fooValue%'); // WHERE meta_keywords LIKE '%fooValue%' * * - * @param string $metaKeywords The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaKeywords The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -538,8 +538,8 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -563,8 +563,8 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -597,11 +597,11 @@ abstract class CategoryI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -613,7 +613,7 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryI18n $categoryI18n Object to remove from the list of results + * @param ChildCategoryI18n $categoryI18n Object to remove from the list of results * * @return ChildCategoryI18nQuery The current query, for fluid interface */ @@ -631,8 +631,8 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Deletes all rows from the category_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -663,13 +663,13 @@ abstract class CategoryI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -689,7 +689,6 @@ abstract class CategoryI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php index f2bfdacf4..9d4cfcf8e 100644 --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -32,7 +32,6 @@ abstract class CategoryImage implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryImageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class CategoryImage implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryImage The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [category_id] column value. * - * @return int + * @return int */ public function getCategoryId() { - return $this->category_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class CategoryImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class CategoryImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class CategoryImage implements ActiveRecordInterface $this->modifiedColumns[CategoryImageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [category_id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setCategoryId($v) { @@ -518,15 +512,14 @@ abstract class CategoryImage implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setCategoryId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class CategoryImage implements ActiveRecordInterface $this->modifiedColumns[CategoryImageTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class CategoryImage implements ActiveRecordInterface $this->modifiedColumns[CategoryImageTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class CategoryImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class CategoryImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class CategoryImage implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryImage::setDeleted() @@ -790,8 +779,8 @@ abstract class CategoryImage implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class CategoryImage implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class CategoryImage implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class CategoryImage implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class CategoryImage implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class CategoryImage implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class CategoryImage implements ActiveRecordInterface if ($this->isColumnModified(CategoryImageTableMap::POSITION)) $criteria->add(CategoryImageTableMap::POSITION, $this->position); if ($this->isColumnModified(CategoryImageTableMap::CREATED_AT)) $criteria->add(CategoryImageTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CategoryImageTableMap::UPDATED_AT)) $criteria->add(CategoryImageTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class CategoryImage implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class CategoryImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryImage (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryImage (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class CategoryImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryImage Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryImage Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1336,16 +1323,14 @@ abstract class CategoryImage implements ActiveRecordInterface $v->addCategoryImage($this); } - return $this; } - /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class CategoryImage implements ActiveRecordInterface return $this->aCategory; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class CategoryImage implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class CategoryImage implements ActiveRecordInterface * If this ChildCategoryImage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryImageI18n[] List of ChildCategoryImageI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class CategoryImage implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryImageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategoryImage The current object (for fluent API support) + * @param Collection $categoryImageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategoryImage The current object (for fluent API support) */ public function setCategoryImageI18ns(Collection $categoryImageI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Returns the number of related CategoryImageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryImageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryImageI18n objects. * @throws PropelException */ public function countCategoryImageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class CategoryImage implements ActiveRecordInterface * Method called to associate a ChildCategoryImageI18n object to this object * through the ChildCategoryImageI18n foreign key attribute. * - * @param ChildCategoryImageI18n $l ChildCategoryImageI18n - * @return \Thelia\Model\CategoryImage The current object (for fluent API support) + * @param ChildCategoryImageI18n $l ChildCategoryImageI18n + * @return \Thelia\Model\CategoryImage The current object (for fluent API support) */ public function addCategoryImageI18n(ChildCategoryImageI18n $l) { @@ -1587,7 +1571,7 @@ abstract class CategoryImage implements ActiveRecordInterface } /** - * @param CategoryImageI18n $categoryImageI18n The categoryImageI18n object to remove. + * @param CategoryImageI18n $categoryImageI18n The categoryImageI18n object to remove. * @return ChildCategoryImage The current object (for fluent API support) */ public function removeCategoryImageI18n($categoryImageI18n) @@ -1630,7 +1614,7 @@ abstract class CategoryImage implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCategoryImage The current object (for fluent API support) + * @return ChildCategoryImage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCategoryImage The current object (for fluent API support) + * @return ChildCategoryImage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryImageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCategoryImage The current object (for fluent API support) + * @return ChildCategoryImage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class CategoryImage implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryImageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php index 968d6c1b2..fbc5c27ad 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -26,7 +26,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryImageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryImageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->aCategoryImage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryImageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryImageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryImageI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryImageI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $this->modifiedColumns[CategoryImageI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryImageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryImageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface if ($this->isColumnModified(CategoryImageI18nTableMap::DESCRIPTION)) $criteria->add(CategoryImageI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CategoryImageI18nTableMap::CHAPO)) $criteria->add(CategoryImageI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(CategoryImageI18nTableMap::POSTSCRIPTUM)) $criteria->add(CategoryImageI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryImageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryImageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryImageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryImageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategoryImage object. * - * @param ChildCategoryImage $v - * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) + * @param ChildCategoryImage $v + * @return \Thelia\Model\CategoryImageI18n The current object (for fluent API support) * @throws PropelException */ public function setCategoryImage(ChildCategoryImage $v = null) @@ -1247,16 +1231,14 @@ abstract class CategoryImageI18n implements ActiveRecordInterface $v->addCategoryImageI18n($this); } - return $this; } - /** * Get the associated ChildCategoryImage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategoryImage The associated ChildCategoryImage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategoryImage The associated ChildCategoryImage object. * @throws PropelException */ public function getCategoryImage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php index 424a478cf..01623914b 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php @@ -67,9 +67,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryImageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryImageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Returns a new ChildCategoryImageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryImageI18nQuery */ @@ -140,10 +140,10 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryImageI18n A model object, or null if the key is not found + * @return ChildCategoryImageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryImageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * * @see filterByCategoryImage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\CategoryImage object * * @param \Thelia\Model\CategoryImage|ObjectCollection $categoryImage The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class CategoryImageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryImageQuery A secondary query class using the current class as primary query */ public function useCategoryImageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryImageI18n $categoryImageI18n Object to remove from the list of results + * @param ChildCategoryImageI18n $categoryImageI18n Object to remove from the list of results * * @return ChildCategoryImageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Deletes all rows from the category_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class CategoryImageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class CategoryImageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryImageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CategoryImageQuery.php b/core/lib/Thelia/Model/Base/CategoryImageQuery.php index af219e055..96f0d9d5f 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryImageQuery.php @@ -72,9 +72,9 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryImageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryImage', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Returns a new ChildCategoryImageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryImageQuery */ @@ -114,7 +114,7 @@ abstract class CategoryImageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryImage|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class CategoryImageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryImage A model object, or null if the key is not found + * @return ChildCategoryImage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryImage|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class CategoryImageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryImageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CategoryImageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryImageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CategoryImageTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class CategoryImageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class CategoryImageQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $categoryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $categoryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class CategoryImageQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class CategoryImageQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class CategoryImageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class CategoryImageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class CategoryImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryImageI18n object * - * @param \Thelia\Model\CategoryImageI18n|ObjectCollection $categoryImageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryImageI18n|ObjectCollection $categoryImageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryImageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class CategoryImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryImageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryImageI18nQuery A secondary query class using the current class as primary query */ public function useCategoryImageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryImage $categoryImage Object to remove from the list of results + * @param ChildCategoryImage $categoryImage Object to remove from the list of results * * @return ChildCategoryImageQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Deletes all rows from the category_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class CategoryImageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryImageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class CategoryImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class CategoryImageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryImageQuery The current query, for fluid interface + * @return ChildCategoryImageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class CategoryImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryImageI18nQuery A secondary query class using the current class as primary query + * @return ChildCategoryImageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php index 5cd4bc8f9..b8e79fb22 100644 --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -107,9 +107,9 @@ abstract class CategoryQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Category', $modelAlias = null) { @@ -119,8 +119,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Returns a new ChildCategoryQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryQuery */ @@ -149,7 +149,7 @@ abstract class CategoryQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCategory|array|mixed the result, formatted by the current formatter @@ -180,10 +180,10 @@ abstract class CategoryQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategory A model object, or null if the key is not found + * @return ChildCategory A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -210,8 +210,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategory|array|mixed the result, formatted by the current formatter */ @@ -231,8 +231,8 @@ abstract class CategoryQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -253,26 +253,24 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CategoryTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CategoryTableMap::ID, $keys, Criteria::IN); } @@ -286,11 +284,11 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -327,11 +325,11 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByParent(array('min' => 12)); // WHERE parent > 12 * * - * @param mixed $parent The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $parent The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -368,11 +366,11 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -409,11 +407,11 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -450,13 +448,13 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -493,13 +491,13 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -536,11 +534,11 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -577,13 +575,13 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -619,9 +617,9 @@ abstract class CategoryQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -642,8 +640,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductCategory object * - * @param \Thelia\Model\ProductCategory|ObjectCollection $productCategory the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductCategory|ObjectCollection $productCategory the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -665,8 +663,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductCategory relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -699,11 +697,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductCategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductCategoryQuery A secondary query class using the current class as primary query */ public function useProductCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -715,8 +713,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryImage object * - * @param \Thelia\Model\CategoryImage|ObjectCollection $categoryImage the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryImage|ObjectCollection $categoryImage the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -738,8 +736,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -772,11 +770,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryImageQuery A secondary query class using the current class as primary query */ public function useCategoryImageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -788,8 +786,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryDocument object * - * @param \Thelia\Model\CategoryDocument|ObjectCollection $categoryDocument the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryDocument|ObjectCollection $categoryDocument the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -811,8 +809,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -845,11 +843,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryDocumentQuery A secondary query class using the current class as primary query */ public function useCategoryDocumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -861,8 +859,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryAssociatedContent object * - * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -884,8 +882,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryAssociatedContent relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -918,11 +916,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query */ public function useCategoryAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -934,8 +932,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryI18n object * - * @param \Thelia\Model\CategoryI18n|ObjectCollection $categoryI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryI18n|ObjectCollection $categoryI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -957,8 +955,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -991,11 +989,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryI18nQuery A secondary query class using the current class as primary query */ public function useCategoryI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -1007,8 +1005,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryVersion object * - * @param \Thelia\Model\CategoryVersion|ObjectCollection $categoryVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryVersion|ObjectCollection $categoryVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -1030,8 +1028,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -1064,11 +1062,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryVersionQuery A secondary query class using the current class as primary query */ public function useCategoryVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1081,8 +1079,8 @@ abstract class CategoryQuery extends ModelCriteria * Filter the query by a related Product object * using the product_category table as cross reference * - * @param Product $product the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Product $product the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -1097,7 +1095,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategory $category Object to remove from the list of results + * @param ChildCategory $category Object to remove from the list of results * * @return ChildCategoryQuery The current query, for fluid interface */ @@ -1113,8 +1111,8 @@ abstract class CategoryQuery extends ModelCriteria /** * Deletes all rows from the category table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1145,13 +1143,13 @@ abstract class CategoryQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategory or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategory object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategory object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1171,7 +1169,6 @@ abstract class CategoryQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1190,11 +1187,11 @@ abstract class CategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1209,10 +1206,10 @@ abstract class CategoryQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1229,11 +1226,11 @@ abstract class CategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCategoryI18nQuery A secondary query class using the current class as primary query + * @return ChildCategoryI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1249,7 +1246,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1257,7 +1254,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1265,7 +1262,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } @@ -1275,9 +1272,9 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1287,9 +1284,9 @@ abstract class CategoryQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1299,7 +1296,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1309,7 +1306,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1319,7 +1316,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1329,7 +1326,7 @@ abstract class CategoryQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCategoryQuery The current query, for fluid interface + * @return ChildCategoryQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php index 69d67b252..f0108ef10 100644 --- a/core/lib/Thelia/Model/Base/CategoryVersion.php +++ b/core/lib/Thelia/Model/Base/CategoryVersion.php @@ -28,7 +28,6 @@ abstract class CategoryVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CategoryVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -345,9 +344,9 @@ abstract class CategoryVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CategoryVersion The current object, for fluid interface */ @@ -397,44 +396,40 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [parent] column value. * - * @return int + * @return int */ public function getParent() { - return $this->parent; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -442,8 +437,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -462,8 +457,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -481,11 +476,10 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -493,8 +487,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -512,19 +506,18 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setId($v) { @@ -541,15 +534,14 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setId() /** * Set the value of [parent] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setParent($v) { @@ -562,15 +554,14 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->modifiedColumns[CategoryVersionTableMap::PARENT] = true; } - return $this; } // setParent() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setVisible($v) { @@ -583,15 +574,14 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->modifiedColumns[CategoryVersionTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setPosition($v) { @@ -604,16 +594,15 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->modifiedColumns[CategoryVersionTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -625,16 +614,15 @@ abstract class CategoryVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -646,15 +634,14 @@ abstract class CategoryVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -667,16 +654,15 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->modifiedColumns[CategoryVersionTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -688,15 +674,14 @@ abstract class CategoryVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -709,7 +694,6 @@ abstract class CategoryVersion implements ActiveRecordInterface $this->modifiedColumns[CategoryVersionTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -753,7 +737,6 @@ abstract class CategoryVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -829,10 +812,10 @@ abstract class CategoryVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -868,7 +851,7 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CategoryVersion::setDeleted() @@ -911,8 +894,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -962,8 +945,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1006,7 +989,7 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1097,7 +1080,7 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1113,12 +1096,12 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1132,7 +1115,7 @@ abstract class CategoryVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1177,12 +1160,12 @@ abstract class CategoryVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1221,12 +1204,12 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1240,8 +1223,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1290,8 +1273,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1327,7 +1310,6 @@ abstract class CategoryVersion implements ActiveRecordInterface if ($this->isColumnModified(CategoryVersionTableMap::VERSION)) $criteria->add(CategoryVersionTableMap::VERSION, $this->version); if ($this->isColumnModified(CategoryVersionTableMap::VERSION_CREATED_AT)) $criteria->add(CategoryVersionTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(CategoryVersionTableMap::VERSION_CREATED_BY)) $criteria->add(CategoryVersionTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1365,7 +1347,7 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1380,7 +1362,6 @@ abstract class CategoryVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1390,9 +1371,9 @@ abstract class CategoryVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CategoryVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CategoryVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1419,8 +1400,8 @@ abstract class CategoryVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CategoryVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1436,8 +1417,8 @@ abstract class CategoryVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\CategoryVersion The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1456,16 +1437,14 @@ abstract class CategoryVersion implements ActiveRecordInterface $v->addCategoryVersion($this); } - return $this; } - /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1513,7 +1492,7 @@ abstract class CategoryVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CategoryVersionQuery.php b/core/lib/Thelia/Model/Base/CategoryVersionQuery.php index a51640003..4448e60e0 100644 --- a/core/lib/Thelia/Model/Base/CategoryVersionQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryVersionQuery.php @@ -79,9 +79,9 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CategoryVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CategoryVersion', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Returns a new ChildCategoryVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCategoryVersionQuery */ @@ -152,10 +152,10 @@ abstract class CategoryVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCategoryVersion A model object, or null if the key is not found + * @return ChildCategoryVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCategoryVersion|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class CategoryVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -313,11 +313,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByParent(array('min' => 12)); // WHERE parent > 12 * * - * @param mixed $parent The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $parent The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -354,11 +354,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -395,11 +395,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -436,13 +436,13 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -479,13 +479,13 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -522,11 +522,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -563,13 +563,13 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -605,9 +605,9 @@ abstract class CategoryVersionQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -628,8 +628,8 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -653,8 +653,8 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -687,11 +687,11 @@ abstract class CategoryVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -703,7 +703,7 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCategoryVersion $categoryVersion Object to remove from the list of results + * @param ChildCategoryVersion $categoryVersion Object to remove from the list of results * * @return ChildCategoryVersionQuery The current query, for fluid interface */ @@ -721,8 +721,8 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Deletes all rows from the category_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -753,13 +753,13 @@ abstract class CategoryVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCategoryVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCategoryVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCategoryVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -779,7 +779,6 @@ abstract class CategoryVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CategoryVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php index 2868accd3..41ce820c2 100644 --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -30,7 +30,6 @@ abstract class Config implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ConfigTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -358,9 +357,9 @@ abstract class Config implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Config The current object, for fluid interface */ @@ -410,55 +409,50 @@ abstract class Config implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Get the [value] column value. * - * @return string + * @return string */ public function getValue() { - return $this->value; } /** * Get the [secured] column value. * - * @return int + * @return int */ public function getSecured() { - return $this->secured; } /** * Get the [hidden] column value. * - * @return int + * @return int */ public function getHidden() { - return $this->hidden; } @@ -466,8 +460,8 @@ abstract class Config implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -486,8 +480,8 @@ abstract class Config implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -505,8 +499,8 @@ abstract class Config implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setId($v) { @@ -519,15 +513,14 @@ abstract class Config implements ActiveRecordInterface $this->modifiedColumns[ConfigTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setName($v) { @@ -540,15 +533,14 @@ abstract class Config implements ActiveRecordInterface $this->modifiedColumns[ConfigTableMap::NAME] = true; } - return $this; } // setName() /** * Set the value of [value] column. * - * @param string $v new value - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setValue($v) { @@ -561,15 +553,14 @@ abstract class Config implements ActiveRecordInterface $this->modifiedColumns[ConfigTableMap::VALUE] = true; } - return $this; } // setValue() /** * Set the value of [secured] column. * - * @param int $v new value - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setSecured($v) { @@ -582,15 +573,14 @@ abstract class Config implements ActiveRecordInterface $this->modifiedColumns[ConfigTableMap::SECURED] = true; } - return $this; } // setSecured() /** * Set the value of [hidden] column. * - * @param int $v new value - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setHidden($v) { @@ -603,16 +593,15 @@ abstract class Config implements ActiveRecordInterface $this->modifiedColumns[ConfigTableMap::HIDDEN] = true; } - return $this; } // setHidden() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -624,16 +613,15 @@ abstract class Config implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -645,7 +633,6 @@ abstract class Config implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -693,7 +680,6 @@ abstract class Config implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ConfigTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -757,10 +743,10 @@ abstract class Config implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -797,7 +783,7 @@ abstract class Config implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Config::setDeleted() @@ -840,8 +826,8 @@ abstract class Config implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -902,8 +888,8 @@ abstract class Config implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -951,7 +937,7 @@ abstract class Config implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1041,7 +1027,7 @@ abstract class Config implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1057,12 +1043,12 @@ abstract class Config implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1076,7 +1062,7 @@ abstract class Config implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1115,12 +1101,12 @@ abstract class Config implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1157,12 +1143,12 @@ abstract class Config implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1176,8 +1162,8 @@ abstract class Config implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1220,8 +1206,8 @@ abstract class Config implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1253,7 +1239,6 @@ abstract class Config implements ActiveRecordInterface if ($this->isColumnModified(ConfigTableMap::HIDDEN)) $criteria->add(ConfigTableMap::HIDDEN, $this->hidden); if ($this->isColumnModified(ConfigTableMap::CREATED_AT)) $criteria->add(ConfigTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ConfigTableMap::UPDATED_AT)) $criteria->add(ConfigTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1275,7 +1260,7 @@ abstract class Config implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1285,7 +1270,7 @@ abstract class Config implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1299,7 +1284,6 @@ abstract class Config implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1309,9 +1293,9 @@ abstract class Config implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Config (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Config (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1350,8 +1334,8 @@ abstract class Config implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Config Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Config Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1370,7 +1354,7 @@ abstract class Config implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class Config implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class Config implements ActiveRecordInterface * If this ChildConfig is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildConfigI18n[] List of ChildConfigI18n objects * @throws PropelException */ @@ -1489,15 +1473,14 @@ abstract class Config implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $configI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildConfig The current object (for fluent API support) + * @param Collection $configI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildConfig The current object (for fluent API support) */ public function setConfigI18ns(Collection $configI18ns, ConnectionInterface $con = null) { $configI18nsToDelete = $this->getConfigI18ns(new Criteria(), $con)->diff($configI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1521,10 +1504,10 @@ abstract class Config implements ActiveRecordInterface /** * Returns the number of related ConfigI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ConfigI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ConfigI18n objects. * @throws PropelException */ public function countConfigI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1539,8 @@ abstract class Config implements ActiveRecordInterface * Method called to associate a ChildConfigI18n object to this object * through the ChildConfigI18n foreign key attribute. * - * @param ChildConfigI18n $l ChildConfigI18n - * @return \Thelia\Model\Config The current object (for fluent API support) + * @param ChildConfigI18n $l ChildConfigI18n + * @return \Thelia\Model\Config The current object (for fluent API support) */ public function addConfigI18n(ChildConfigI18n $l) { @@ -1587,7 +1570,7 @@ abstract class Config implements ActiveRecordInterface } /** - * @param ConfigI18n $configI18n The configI18n object to remove. + * @param ConfigI18n $configI18n The configI18n object to remove. * @return ChildConfig The current object (for fluent API support) */ public function removeConfigI18n($configI18n) @@ -1632,7 +1615,7 @@ abstract class Config implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1666,7 +1649,7 @@ abstract class Config implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildConfig The current object (for fluent API support) + * @return ChildConfig The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1680,9 +1663,9 @@ abstract class Config implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildConfig The current object (for fluent API support) + * @return ChildConfig The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1694,7 +1677,7 @@ abstract class Config implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1704,8 +1687,8 @@ abstract class Config implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildConfigI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1738,10 +1721,10 @@ abstract class Config implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildConfig The current object (for fluent API support) + * @return ChildConfig The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1766,7 +1749,7 @@ abstract class Config implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildConfigI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -1774,7 +1757,6 @@ abstract class Config implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -1785,7 +1767,6 @@ abstract class Config implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -1798,7 +1779,6 @@ abstract class Config implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -1809,7 +1789,6 @@ abstract class Config implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -1822,7 +1801,6 @@ abstract class Config implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -1833,7 +1811,6 @@ abstract class Config implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -1846,7 +1823,6 @@ abstract class Config implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -1857,7 +1833,6 @@ abstract class Config implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -1946,7 +1921,6 @@ abstract class Config implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php index b2bbc6160..d0b928c91 100644 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -26,7 +26,6 @@ abstract class ConfigI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ConfigI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ConfigI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ConfigI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->aConfig = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->modifiedColumns[ConfigI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->modifiedColumns[ConfigI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->modifiedColumns[ConfigI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->modifiedColumns[ConfigI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ConfigI18n implements ActiveRecordInterface $this->modifiedColumns[ConfigI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ConfigI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ConfigI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ConfigI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ConfigI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ConfigI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ConfigI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ConfigI18n implements ActiveRecordInterface if ($this->isColumnModified(ConfigI18nTableMap::DESCRIPTION)) $criteria->add(ConfigI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ConfigI18nTableMap::CHAPO)) $criteria->add(ConfigI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ConfigI18nTableMap::POSTSCRIPTUM)) $criteria->add(ConfigI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ConfigI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ConfigI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ConfigI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ConfigI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ConfigI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ConfigI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildConfig object. * - * @param ChildConfig $v - * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) + * @param ChildConfig $v + * @return \Thelia\Model\ConfigI18n The current object (for fluent API support) * @throws PropelException */ public function setConfig(ChildConfig $v = null) @@ -1247,16 +1231,14 @@ abstract class ConfigI18n implements ActiveRecordInterface $v->addConfigI18n($this); } - return $this; } - /** * Get the associated ChildConfig object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildConfig The associated ChildConfig object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildConfig The associated ChildConfig object. * @throws PropelException */ public function getConfig(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ConfigI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ConfigI18nQuery.php b/core/lib/Thelia/Model/Base/ConfigI18nQuery.php index b10bb1da3..4d9c07df2 100644 --- a/core/lib/Thelia/Model/Base/ConfigI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ConfigI18nQuery.php @@ -67,9 +67,9 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ConfigI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ConfigI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Returns a new ChildConfigI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildConfigI18nQuery */ @@ -140,10 +140,10 @@ abstract class ConfigI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildConfigI18n A model object, or null if the key is not found + * @return ChildConfigI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildConfigI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ConfigI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ConfigI18nQuery extends ModelCriteria * * @see filterByConfig() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ConfigI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ConfigI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ConfigI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ConfigI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ConfigI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Config object * - * @param \Thelia\Model\Config|ObjectCollection $config The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Config|ObjectCollection $config The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Config relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ConfigI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ConfigQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ConfigQuery A secondary query class using the current class as primary query */ public function useConfigQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildConfigI18n $configI18n Object to remove from the list of results + * @param ChildConfigI18n $configI18n Object to remove from the list of results * * @return ChildConfigI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Deletes all rows from the config_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ConfigI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildConfigI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildConfigI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildConfigI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ConfigI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ConfigI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php index d219bb4a2..9d8d2c1b4 100644 --- a/core/lib/Thelia/Model/Base/ConfigQuery.php +++ b/core/lib/Thelia/Model/Base/ConfigQuery.php @@ -72,9 +72,9 @@ abstract class ConfigQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ConfigQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Config', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ConfigQuery extends ModelCriteria /** * Returns a new ChildConfigQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildConfigQuery */ @@ -114,7 +114,7 @@ abstract class ConfigQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildConfig|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ConfigQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildConfig A model object, or null if the key is not found + * @return ChildConfig A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ConfigQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildConfig|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ConfigQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ConfigQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildConfigQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ConfigTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildConfigQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ConfigTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -291,9 +289,9 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -320,9 +318,9 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterByValue('%fooValue%'); // WHERE value LIKE '%fooValue%' * * - * @param string $value The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $value The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -350,11 +348,11 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterBySecured(array('min' => 12)); // WHERE secured > 12 * * - * @param mixed $secured The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $secured The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -391,11 +389,11 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterByHidden(array('min' => 12)); // WHERE hidden > 12 * * - * @param mixed $hidden The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $hidden The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -432,13 +430,13 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -475,13 +473,13 @@ abstract class ConfigQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -511,8 +509,8 @@ abstract class ConfigQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ConfigI18n object * - * @param \Thelia\Model\ConfigI18n|ObjectCollection $configI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ConfigI18n|ObjectCollection $configI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildConfigQuery The current query, for fluid interface */ @@ -534,8 +532,8 @@ abstract class ConfigQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ConfigI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildConfigQuery The current query, for fluid interface */ @@ -568,11 +566,11 @@ abstract class ConfigQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ConfigI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ConfigI18nQuery A secondary query class using the current class as primary query */ public function useConfigI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -584,7 +582,7 @@ abstract class ConfigQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildConfig $config Object to remove from the list of results + * @param ChildConfig $config Object to remove from the list of results * * @return ChildConfigQuery The current query, for fluid interface */ @@ -600,8 +598,8 @@ abstract class ConfigQuery extends ModelCriteria /** * Deletes all rows from the config table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -632,13 +630,13 @@ abstract class ConfigQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildConfig or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildConfig object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildConfig object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -658,7 +656,6 @@ abstract class ConfigQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ConfigTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -677,9 +674,9 @@ abstract class ConfigQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -689,9 +686,9 @@ abstract class ConfigQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -701,7 +698,7 @@ abstract class ConfigQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -711,7 +708,7 @@ abstract class ConfigQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -721,7 +718,7 @@ abstract class ConfigQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -731,7 +728,7 @@ abstract class ConfigQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -743,11 +740,11 @@ abstract class ConfigQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -762,10 +759,10 @@ abstract class ConfigQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildConfigQuery The current query, for fluid interface + * @return ChildConfigQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -782,11 +779,11 @@ abstract class ConfigQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildConfigI18nQuery A secondary query class using the current class as primary query + * @return ChildConfigI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index 67951239b..992b5e757 100644 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -45,7 +45,6 @@ abstract class Content implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -192,7 +191,6 @@ abstract class Content implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -468,9 +466,9 @@ abstract class Content implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Content The current object, for fluid interface */ @@ -520,33 +518,30 @@ abstract class Content implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -554,8 +549,8 @@ abstract class Content implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -574,8 +569,8 @@ abstract class Content implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -593,11 +588,10 @@ abstract class Content implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -605,8 +599,8 @@ abstract class Content implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -624,19 +618,18 @@ abstract class Content implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setId($v) { @@ -649,15 +642,14 @@ abstract class Content implements ActiveRecordInterface $this->modifiedColumns[ContentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setVisible($v) { @@ -670,15 +662,14 @@ abstract class Content implements ActiveRecordInterface $this->modifiedColumns[ContentTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setPosition($v) { @@ -691,16 +682,15 @@ abstract class Content implements ActiveRecordInterface $this->modifiedColumns[ContentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -712,16 +702,15 @@ abstract class Content implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -733,15 +722,14 @@ abstract class Content implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setVersion($v) { @@ -754,16 +742,15 @@ abstract class Content implements ActiveRecordInterface $this->modifiedColumns[ContentTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -775,15 +762,14 @@ abstract class Content implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -796,7 +782,6 @@ abstract class Content implements ActiveRecordInterface $this->modifiedColumns[ContentTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -840,7 +825,6 @@ abstract class Content implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ContentTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -910,10 +894,10 @@ abstract class Content implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -963,7 +947,7 @@ abstract class Content implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Content::setDeleted() @@ -1006,8 +990,8 @@ abstract class Content implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1080,8 +1064,8 @@ abstract class Content implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1258,7 +1242,7 @@ abstract class Content implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1354,7 +1338,7 @@ abstract class Content implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1370,12 +1354,12 @@ abstract class Content implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1389,7 +1373,7 @@ abstract class Content implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1431,12 +1415,12 @@ abstract class Content implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1492,12 +1476,12 @@ abstract class Content implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1511,8 +1495,8 @@ abstract class Content implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1558,8 +1542,8 @@ abstract class Content implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1593,7 +1577,6 @@ abstract class Content implements ActiveRecordInterface if ($this->isColumnModified(ContentTableMap::VERSION)) $criteria->add(ContentTableMap::VERSION, $this->version); if ($this->isColumnModified(ContentTableMap::VERSION_CREATED_AT)) $criteria->add(ContentTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(ContentTableMap::VERSION_CREATED_BY)) $criteria->add(ContentTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1615,7 +1598,7 @@ abstract class Content implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1625,7 +1608,7 @@ abstract class Content implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1639,7 +1622,6 @@ abstract class Content implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1649,9 +1631,9 @@ abstract class Content implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Content (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Content (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1727,8 +1709,8 @@ abstract class Content implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Content Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Content Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1747,7 +1729,7 @@ abstract class Content implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1804,8 +1786,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1827,8 +1809,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentFolder[] List of ChildContentFolder objects * @throws PropelException */ @@ -1884,15 +1866,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentFolders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $contentFolders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setContentFolders(Collection $contentFolders, ConnectionInterface $con = null) { $contentFoldersToDelete = $this->getContentFolders(new Criteria(), $con)->diff($contentFolders); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1916,10 +1897,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ContentFolder objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentFolder objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentFolder objects. * @throws PropelException */ public function countContentFolders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1951,8 +1932,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildContentFolder object to this object * through the ChildContentFolder foreign key attribute. * - * @param ChildContentFolder $l ChildContentFolder - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildContentFolder $l ChildContentFolder + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addContentFolder(ChildContentFolder $l) { @@ -1979,7 +1960,7 @@ abstract class Content implements ActiveRecordInterface /** * @param ContentFolder $contentFolder The contentFolder object to remove. - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeContentFolder($contentFolder) { @@ -1996,7 +1977,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2008,9 +1988,9 @@ abstract class Content implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Content. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildContentFolder[] List of ChildContentFolder objects */ public function getContentFoldersJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2050,8 +2030,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2073,8 +2053,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentImage[] List of ChildContentImage objects * @throws PropelException */ @@ -2130,15 +2110,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentImages A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $contentImages A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setContentImages(Collection $contentImages, ConnectionInterface $con = null) { $contentImagesToDelete = $this->getContentImages(new Criteria(), $con)->diff($contentImages); - $this->contentImagesScheduledForDeletion = $contentImagesToDelete; foreach ($contentImagesToDelete as $contentImageRemoved) { @@ -2159,10 +2138,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ContentImage objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentImage objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentImage objects. * @throws PropelException */ public function countContentImages(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2194,8 +2173,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildContentImage object to this object * through the ChildContentImage foreign key attribute. * - * @param ChildContentImage $l ChildContentImage - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildContentImage $l ChildContentImage + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addContentImage(ChildContentImage $l) { @@ -2268,8 +2247,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2291,8 +2270,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentDocument[] List of ChildContentDocument objects * @throws PropelException */ @@ -2348,15 +2327,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentDocuments A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $contentDocuments A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setContentDocuments(Collection $contentDocuments, ConnectionInterface $con = null) { $contentDocumentsToDelete = $this->getContentDocuments(new Criteria(), $con)->diff($contentDocuments); - $this->contentDocumentsScheduledForDeletion = $contentDocumentsToDelete; foreach ($contentDocumentsToDelete as $contentDocumentRemoved) { @@ -2377,10 +2355,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ContentDocument objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentDocument objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentDocument objects. * @throws PropelException */ public function countContentDocuments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2412,8 +2390,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildContentDocument object to this object * through the ChildContentDocument foreign key attribute. * - * @param ChildContentDocument $l ChildContentDocument - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildContentDocument $l ChildContentDocument + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addContentDocument(ChildContentDocument $l) { @@ -2440,7 +2418,7 @@ abstract class Content implements ActiveRecordInterface /** * @param ContentDocument $contentDocument The contentDocument object to remove. - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeContentDocument($contentDocument) { @@ -2486,8 +2464,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2509,8 +2487,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects * @throws PropelException */ @@ -2566,15 +2544,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productAssociatedContents A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $productAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setProductAssociatedContents(Collection $productAssociatedContents, ConnectionInterface $con = null) { $productAssociatedContentsToDelete = $this->getProductAssociatedContents(new Criteria(), $con)->diff($productAssociatedContents); - $this->productAssociatedContentsScheduledForDeletion = $productAssociatedContentsToDelete; foreach ($productAssociatedContentsToDelete as $productAssociatedContentRemoved) { @@ -2595,10 +2572,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ProductAssociatedContent objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductAssociatedContent objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductAssociatedContent objects. * @throws PropelException */ public function countProductAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2630,8 +2607,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildProductAssociatedContent object to this object * through the ChildProductAssociatedContent foreign key attribute. * - * @param ChildProductAssociatedContent $l ChildProductAssociatedContent - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildProductAssociatedContent $l ChildProductAssociatedContent + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addProductAssociatedContent(ChildProductAssociatedContent $l) { @@ -2658,7 +2635,7 @@ abstract class Content implements ActiveRecordInterface /** * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to remove. - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeProductAssociatedContent($productAssociatedContent) { @@ -2675,7 +2652,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2687,9 +2663,9 @@ abstract class Content implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Content. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects */ public function getProductAssociatedContentsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2729,8 +2705,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2752,8 +2728,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects * @throws PropelException */ @@ -2809,15 +2785,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categoryAssociatedContents A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $categoryAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setCategoryAssociatedContents(Collection $categoryAssociatedContents, ConnectionInterface $con = null) { $categoryAssociatedContentsToDelete = $this->getCategoryAssociatedContents(new Criteria(), $con)->diff($categoryAssociatedContents); - $this->categoryAssociatedContentsScheduledForDeletion = $categoryAssociatedContentsToDelete; foreach ($categoryAssociatedContentsToDelete as $categoryAssociatedContentRemoved) { @@ -2838,10 +2813,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related CategoryAssociatedContent objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CategoryAssociatedContent objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryAssociatedContent objects. * @throws PropelException */ public function countCategoryAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2873,8 +2848,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildCategoryAssociatedContent object to this object * through the ChildCategoryAssociatedContent foreign key attribute. * - * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addCategoryAssociatedContent(ChildCategoryAssociatedContent $l) { @@ -2901,7 +2876,7 @@ abstract class Content implements ActiveRecordInterface /** * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to remove. - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeCategoryAssociatedContent($categoryAssociatedContent) { @@ -2918,7 +2893,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2930,9 +2904,9 @@ abstract class Content implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Content. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects */ public function getCategoryAssociatedContentsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2972,8 +2946,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2995,8 +2969,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentI18n[] List of ChildContentI18n objects * @throws PropelException */ @@ -3052,15 +3026,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $contentI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setContentI18ns(Collection $contentI18ns, ConnectionInterface $con = null) { $contentI18nsToDelete = $this->getContentI18ns(new Criteria(), $con)->diff($contentI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -3084,10 +3057,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ContentI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentI18n objects. * @throws PropelException */ public function countContentI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3119,8 +3092,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildContentI18n object to this object * through the ChildContentI18n foreign key attribute. * - * @param ChildContentI18n $l ChildContentI18n - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildContentI18n $l ChildContentI18n + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addContentI18n(ChildContentI18n $l) { @@ -3150,7 +3123,7 @@ abstract class Content implements ActiveRecordInterface } /** - * @param ContentI18n $contentI18n The contentI18n object to remove. + * @param ContentI18n $contentI18n The contentI18n object to remove. * @return ChildContent The current object (for fluent API support) */ public function removeContentI18n($contentI18n) @@ -3197,8 +3170,8 @@ abstract class Content implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3220,8 +3193,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentVersion[] List of ChildContentVersion objects * @throws PropelException */ @@ -3277,15 +3250,14 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $contentVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setContentVersions(Collection $contentVersions, ConnectionInterface $con = null) { $contentVersionsToDelete = $this->getContentVersions(new Criteria(), $con)->diff($contentVersions); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -3309,10 +3281,10 @@ abstract class Content implements ActiveRecordInterface /** * Returns the number of related ContentVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentVersion objects. * @throws PropelException */ public function countContentVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3344,8 +3316,8 @@ abstract class Content implements ActiveRecordInterface * Method called to associate a ChildContentVersion object to this object * through the ChildContentVersion foreign key attribute. * - * @param ChildContentVersion $l ChildContentVersion - * @return \Thelia\Model\Content The current object (for fluent API support) + * @param ChildContentVersion $l ChildContentVersion + * @return \Thelia\Model\Content The current object (for fluent API support) */ public function addContentVersion(ChildContentVersion $l) { @@ -3372,7 +3344,7 @@ abstract class Content implements ActiveRecordInterface /** * @param ContentVersion $contentVersion The contentVersion object to remove. - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeContentVersion($contentVersion) { @@ -3429,8 +3401,8 @@ abstract class Content implements ActiveRecordInterface * If this ChildContent is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildFolder[] List of ChildFolder objects */ @@ -3460,9 +3432,9 @@ abstract class Content implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) + * @param Collection $folders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) */ public function setFolders(Collection $folders, ConnectionInterface $con = null) { @@ -3486,9 +3458,9 @@ abstract class Content implements ActiveRecordInterface * Gets the number of ChildFolder objects related by a many-to-many relationship * to the current object by way of the content_folder cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildFolder objects */ @@ -3516,7 +3488,7 @@ abstract class Content implements ActiveRecordInterface * Associate a ChildFolder object to this object * through the content_folder cross reference table. * - * @param ChildFolder $folder The ChildContentFolder object to relate + * @param ChildFolder $folder The ChildContentFolder object to relate * @return ChildContent The current object (for fluent API support) */ public function addFolder(ChildFolder $folder) @@ -3534,7 +3506,7 @@ abstract class Content implements ActiveRecordInterface } /** - * @param Folder $folder The folder object to add. + * @param Folder $folder The folder object to add. */ protected function doAddFolder($folder) { @@ -3553,7 +3525,7 @@ abstract class Content implements ActiveRecordInterface * Remove a ChildFolder object to this object * through the content_folder cross reference table. * - * @param ChildFolder $folder The ChildContentFolder object to relate + * @param ChildFolder $folder The ChildContentFolder object to relate * @return ChildContent The current object (for fluent API support) */ public function removeFolder(ChildFolder $folder) @@ -3600,7 +3572,7 @@ abstract class Content implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3676,7 +3648,7 @@ abstract class Content implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -3690,9 +3662,9 @@ abstract class Content implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -3704,7 +3676,7 @@ abstract class Content implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -3714,8 +3686,8 @@ abstract class Content implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildContentI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -3748,10 +3720,10 @@ abstract class Content implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -3776,7 +3748,7 @@ abstract class Content implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildContentI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -3784,7 +3756,6 @@ abstract class Content implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -3795,7 +3766,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -3808,7 +3778,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -3819,7 +3788,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -3832,7 +3800,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -3843,7 +3810,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -3856,7 +3822,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -3867,7 +3832,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -3880,7 +3844,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [meta_title] column value. * @@ -3891,7 +3854,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaTitle(); } - /** * Set the value of [meta_title] column. * @@ -3904,7 +3866,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [meta_description] column value. * @@ -3915,7 +3876,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaDescription(); } - /** * Set the value of [meta_description] column. * @@ -3928,7 +3888,6 @@ abstract class Content implements ActiveRecordInterface return $this; } - /** * Get the [meta_keywords] column value. * @@ -3939,7 +3898,6 @@ abstract class Content implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaKeywords(); } - /** * Set the value of [meta_keywords] column. * @@ -3969,7 +3927,7 @@ abstract class Content implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -3991,9 +3949,9 @@ abstract class Content implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildContentVersion A version object + * @return ChildContentVersion A version object */ public function addVersion($con = null) { @@ -4017,10 +3975,10 @@ abstract class Content implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildContent The current object (for fluent API support) + * @return ChildContent The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -4036,9 +3994,9 @@ abstract class Content implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildContentVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildContentVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildContent The current object (for fluent API support) */ @@ -4060,9 +4018,9 @@ abstract class Content implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -4080,9 +4038,9 @@ abstract class Content implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -4092,10 +4050,10 @@ abstract class Content implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildContentVersion A version object + * @return ChildContentVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -4108,9 +4066,9 @@ abstract class Content implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildContentVersion objects + * @return ObjectCollection A list of ChildContentVersion objects */ public function getAllVersions($con = null) { @@ -4130,12 +4088,12 @@ abstract class Content implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -4155,13 +4113,13 @@ abstract class Content implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -4181,12 +4139,12 @@ abstract class Content implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -4223,7 +4181,7 @@ abstract class Content implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\ContentVersion[] List of \Thelia\Model\ContentVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) @@ -4310,7 +4268,6 @@ abstract class Content implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php index cf4e8464a..7595e7d2c 100644 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -32,7 +32,6 @@ abstract class ContentDocument implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentDocumentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ContentDocument implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentDocument The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [content_id] column value. * - * @return int + * @return int */ public function getContentId() { - return $this->content_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class ContentDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class ContentDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class ContentDocument implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [content_id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setContentId($v) { @@ -518,15 +512,14 @@ abstract class ContentDocument implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setContentId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class ContentDocument implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class ContentDocument implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class ContentDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class ContentDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class ContentDocument implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentDocument::setDeleted() @@ -790,8 +779,8 @@ abstract class ContentDocument implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class ContentDocument implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class ContentDocument implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class ContentDocument implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class ContentDocument implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class ContentDocument implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class ContentDocument implements ActiveRecordInterface if ($this->isColumnModified(ContentDocumentTableMap::POSITION)) $criteria->add(ContentDocumentTableMap::POSITION, $this->position); if ($this->isColumnModified(ContentDocumentTableMap::CREATED_AT)) $criteria->add(ContentDocumentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ContentDocumentTableMap::UPDATED_AT)) $criteria->add(ContentDocumentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class ContentDocument implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class ContentDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentDocument (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentDocument (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class ContentDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentDocument Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentDocument Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1336,16 +1323,14 @@ abstract class ContentDocument implements ActiveRecordInterface $v->addContentDocument($this); } - return $this; } - /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class ContentDocument implements ActiveRecordInterface return $this->aContent; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class ContentDocument implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class ContentDocument implements ActiveRecordInterface * If this ChildContentDocument is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentDocumentI18n[] List of ChildContentDocumentI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class ContentDocument implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentDocumentI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContentDocument The current object (for fluent API support) + * @param Collection $contentDocumentI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContentDocument The current object (for fluent API support) */ public function setContentDocumentI18ns(Collection $contentDocumentI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Returns the number of related ContentDocumentI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentDocumentI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentDocumentI18n objects. * @throws PropelException */ public function countContentDocumentI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class ContentDocument implements ActiveRecordInterface * Method called to associate a ChildContentDocumentI18n object to this object * through the ChildContentDocumentI18n foreign key attribute. * - * @param ChildContentDocumentI18n $l ChildContentDocumentI18n - * @return \Thelia\Model\ContentDocument The current object (for fluent API support) + * @param ChildContentDocumentI18n $l ChildContentDocumentI18n + * @return \Thelia\Model\ContentDocument The current object (for fluent API support) */ public function addContentDocumentI18n(ChildContentDocumentI18n $l) { @@ -1587,7 +1571,7 @@ abstract class ContentDocument implements ActiveRecordInterface } /** - * @param ContentDocumentI18n $contentDocumentI18n The contentDocumentI18n object to remove. + * @param ContentDocumentI18n $contentDocumentI18n The contentDocumentI18n object to remove. * @return ChildContentDocument The current object (for fluent API support) */ public function removeContentDocumentI18n($contentDocumentI18n) @@ -1630,7 +1614,7 @@ abstract class ContentDocument implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildContentDocument The current object (for fluent API support) + * @return ChildContentDocument The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildContentDocument The current object (for fluent API support) + * @return ChildContentDocument The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildContentDocumentI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildContentDocument The current object (for fluent API support) + * @return ChildContentDocument The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class ContentDocument implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildContentDocumentI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php index e3f7a6a42..af0b1fada 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -26,7 +26,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentDocumentI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentDocumentI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->aContentDocument = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentDocumentI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ContentDocumentI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentDocumentI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface if ($this->isColumnModified(ContentDocumentI18nTableMap::DESCRIPTION)) $criteria->add(ContentDocumentI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ContentDocumentI18nTableMap::CHAPO)) $criteria->add(ContentDocumentI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ContentDocumentI18nTableMap::POSTSCRIPTUM)) $criteria->add(ContentDocumentI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentDocumentI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentDocumentI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentDocumentI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentDocumentI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildContentDocument object. * - * @param ChildContentDocument $v - * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) + * @param ChildContentDocument $v + * @return \Thelia\Model\ContentDocumentI18n The current object (for fluent API support) * @throws PropelException */ public function setContentDocument(ChildContentDocument $v = null) @@ -1247,16 +1231,14 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface $v->addContentDocumentI18n($this); } - return $this; } - /** * Get the associated ChildContentDocument object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContentDocument The associated ChildContentDocument object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContentDocument The associated ChildContentDocument object. * @throws PropelException */ public function getContentDocument(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php index 67ef58154..518e12083 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php @@ -67,9 +67,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentDocumentI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentDocumentI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Returns a new ChildContentDocumentI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentDocumentI18nQuery */ @@ -140,10 +140,10 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentDocumentI18n A model object, or null if the key is not found + * @return ChildContentDocumentI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentDocumentI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * * @see filterByContentDocument() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ContentDocument object * * @param \Thelia\Model\ContentDocument|ObjectCollection $contentDocument The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentDocumentQuery A secondary query class using the current class as primary query */ public function useContentDocumentQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentDocumentI18n $contentDocumentI18n Object to remove from the list of results + * @param ChildContentDocumentI18n $contentDocumentI18n Object to remove from the list of results * * @return ChildContentDocumentI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Deletes all rows from the content_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ContentDocumentI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentDocumentI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php index f6e09b426..8018a0f92 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php @@ -72,9 +72,9 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentDocumentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentDocument', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Returns a new ChildContentDocumentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentDocumentQuery */ @@ -114,7 +114,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildContentDocument|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ContentDocumentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentDocument A model object, or null if the key is not found + * @return ChildContentDocument A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentDocument|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ContentDocumentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ContentDocumentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ContentDocumentTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $contentId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class ContentDocumentQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class ContentDocumentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class ContentDocumentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentDocumentI18n object * - * @param \Thelia\Model\ContentDocumentI18n|ObjectCollection $contentDocumentI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentDocumentI18n|ObjectCollection $contentDocumentI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentDocumentI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentDocumentI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentDocumentI18nQuery A secondary query class using the current class as primary query */ public function useContentDocumentI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentDocument $contentDocument Object to remove from the list of results + * @param ChildContentDocument $contentDocument Object to remove from the list of results * * @return ChildContentDocumentQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Deletes all rows from the content_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class ContentDocumentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentDocumentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class ContentDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class ContentDocumentQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentDocumentQuery The current query, for fluid interface + * @return ChildContentDocumentQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentDocumentI18nQuery A secondary query class using the current class as primary query + * @return ChildContentDocumentI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php index f58fcd62c..b7d481cc0 100644 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -31,7 +31,6 @@ abstract class ContentFolder implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentFolderTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -315,9 +314,9 @@ abstract class ContentFolder implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentFolder The current object, for fluid interface */ @@ -367,33 +366,30 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Get the [content_id] column value. * - * @return int + * @return int */ public function getContentId() { - return $this->content_id; } /** * Get the [folder_id] column value. * - * @return int + * @return int */ public function getFolderId() { - return $this->folder_id; } /** * Get the [default_folder] column value. * - * @return boolean + * @return boolean */ public function getDefaultFolder() { - return $this->default_folder; } @@ -401,8 +397,8 @@ abstract class ContentFolder implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -421,8 +417,8 @@ abstract class ContentFolder implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -440,8 +436,8 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Set the value of [content_id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) */ public function setContentId($v) { @@ -458,15 +454,14 @@ abstract class ContentFolder implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setContentId() /** * Set the value of [folder_id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) */ public function setFolderId($v) { @@ -483,7 +478,6 @@ abstract class ContentFolder implements ActiveRecordInterface $this->aFolder = null; } - return $this; } // setFolderId() @@ -494,8 +488,8 @@ abstract class ContentFolder implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) */ public function setDefaultFolder($v) { @@ -512,16 +506,15 @@ abstract class ContentFolder implements ActiveRecordInterface $this->modifiedColumns[ContentFolderTableMap::DEFAULT_FOLDER] = true; } - return $this; } // setDefaultFolder() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -533,16 +526,15 @@ abstract class ContentFolder implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -554,7 +546,6 @@ abstract class ContentFolder implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -658,10 +649,10 @@ abstract class ContentFolder implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -698,7 +689,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentFolder::setDeleted() @@ -741,8 +732,8 @@ abstract class ContentFolder implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -803,8 +794,8 @@ abstract class ContentFolder implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -854,7 +845,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -864,7 +855,6 @@ abstract class ContentFolder implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(ContentFolderTableMap::CONTENT_ID)) { $modifiedColumns[':p' . $index++] = '`CONTENT_ID`'; @@ -921,7 +911,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -937,12 +927,12 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -956,7 +946,7 @@ abstract class ContentFolder implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +979,12 @@ abstract class ContentFolder implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1032,12 +1022,12 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1051,8 +1041,8 @@ abstract class ContentFolder implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1089,8 +1079,8 @@ abstract class ContentFolder implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1118,7 +1108,6 @@ abstract class ContentFolder implements ActiveRecordInterface if ($this->isColumnModified(ContentFolderTableMap::DEFAULT_FOLDER)) $criteria->add(ContentFolderTableMap::DEFAULT_FOLDER, $this->default_folder); if ($this->isColumnModified(ContentFolderTableMap::CREATED_AT)) $criteria->add(ContentFolderTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ContentFolderTableMap::UPDATED_AT)) $criteria->add(ContentFolderTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1156,7 +1145,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1171,7 +1160,6 @@ abstract class ContentFolder implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getContentId()) && (null === $this->getFolderId()); } @@ -1181,9 +1169,9 @@ abstract class ContentFolder implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentFolder (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentFolder (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1206,8 +1194,8 @@ abstract class ContentFolder implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentFolder Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentFolder Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1223,8 +1211,8 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1243,7 +1231,6 @@ abstract class ContentFolder implements ActiveRecordInterface $v->addContentFolder($this); } - return $this; } @@ -1251,8 +1238,8 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1274,8 +1261,8 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolder object. * - * @param ChildFolder $v - * @return \Thelia\Model\ContentFolder The current object (for fluent API support) + * @param ChildFolder $v + * @return \Thelia\Model\ContentFolder The current object (for fluent API support) * @throws PropelException */ public function setFolder(ChildFolder $v = null) @@ -1294,7 +1281,6 @@ abstract class ContentFolder implements ActiveRecordInterface $v->addContentFolder($this); } - return $this; } @@ -1302,8 +1288,8 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Get the associated ChildFolder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolder The associated ChildFolder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolder The associated ChildFolder object. * @throws PropelException */ public function getFolder(ConnectionInterface $con = null) @@ -1346,7 +1332,7 @@ abstract class ContentFolder implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1372,7 +1358,7 @@ abstract class ContentFolder implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildContentFolder The current object (for fluent API support) + * @return ChildContentFolder The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/ContentFolderQuery.php b/core/lib/Thelia/Model/Base/ContentFolderQuery.php index 4aa4e26df..f405f3a70 100644 --- a/core/lib/Thelia/Model/Base/ContentFolderQuery.php +++ b/core/lib/Thelia/Model/Base/ContentFolderQuery.php @@ -67,9 +67,9 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentFolderQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentFolder', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Returns a new ChildContentFolderQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentFolderQuery */ @@ -140,10 +140,10 @@ abstract class ContentFolderQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentFolder A model object, or null if the key is not found + * @return ChildContentFolder A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentFolder|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ContentFolderQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ContentFolderQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $contentId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -303,11 +303,11 @@ abstract class ContentFolderQuery extends ModelCriteria * * @see filterByFolder() * - * @param mixed $folderId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $folderId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -343,12 +343,12 @@ abstract class ContentFolderQuery extends ModelCriteria * $query->filterByDefaultFolder('yes'); // WHERE default_folder = true * * - * @param boolean|string $defaultFolder The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $defaultFolder The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -371,13 +371,13 @@ abstract class ContentFolderQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -414,13 +414,13 @@ abstract class ContentFolderQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -450,8 +450,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -475,8 +475,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -509,11 +509,11 @@ abstract class ContentFolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -525,8 +525,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Folder object * - * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -550,8 +550,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Folder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -584,11 +584,11 @@ abstract class ContentFolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query */ public function useFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -600,7 +600,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentFolder $contentFolder Object to remove from the list of results + * @param ChildContentFolder $contentFolder Object to remove from the list of results * * @return ChildContentFolderQuery The current query, for fluid interface */ @@ -618,8 +618,8 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Deletes all rows from the content_folder table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -650,13 +650,13 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentFolder or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentFolder object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentFolder object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -676,7 +676,6 @@ abstract class ContentFolderQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentFolderTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -695,9 +694,9 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -707,9 +706,9 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -719,7 +718,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -729,7 +728,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -739,7 +738,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -749,7 +748,7 @@ abstract class ContentFolderQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildContentFolderQuery The current query, for fluid interface + * @return ChildContentFolderQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php index 904f88911..9fabb1b29 100644 --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -26,7 +26,6 @@ abstract class ContentI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ContentI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentI18n The current object, for fluid interface */ @@ -395,107 +394,98 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Get the [meta_title] column value. * - * @return string + * @return string */ public function getMetaTitle() { - return $this->meta_title; } /** * Get the [meta_description] column value. * - * @return string + * @return string */ public function getMetaDescription() { - return $this->meta_description; } /** * Get the [meta_keywords] column value. * - * @return string + * @return string */ public function getMetaKeywords() { - return $this->meta_keywords; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setId($v) { @@ -512,15 +502,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -533,15 +522,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -554,15 +542,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -575,15 +562,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -596,15 +582,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -617,15 +602,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() /** * Set the value of [meta_title] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setMetaTitle($v) { @@ -638,15 +622,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::META_TITLE] = true; } - return $this; } // setMetaTitle() /** * Set the value of [meta_description] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setMetaDescription($v) { @@ -659,15 +642,14 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::META_DESCRIPTION] = true; } - return $this; } // setMetaDescription() /** * Set the value of [meta_keywords] column. * - * @param string $v new value - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) */ public function setMetaKeywords($v) { @@ -680,7 +662,6 @@ abstract class ContentI18n implements ActiveRecordInterface $this->modifiedColumns[ContentI18nTableMap::META_KEYWORDS] = true; } - return $this; } // setMetaKeywords() @@ -724,7 +705,6 @@ abstract class ContentI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ContentI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -791,10 +771,10 @@ abstract class ContentI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -830,7 +810,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentI18n::setDeleted() @@ -873,8 +853,8 @@ abstract class ContentI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -924,8 +904,8 @@ abstract class ContentI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -968,7 +948,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1059,7 +1039,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1075,12 +1055,12 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1094,7 +1074,7 @@ abstract class ContentI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1139,12 +1119,12 @@ abstract class ContentI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1183,12 +1163,12 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1202,8 +1182,8 @@ abstract class ContentI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1252,8 +1232,8 @@ abstract class ContentI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1289,7 +1269,6 @@ abstract class ContentI18n implements ActiveRecordInterface if ($this->isColumnModified(ContentI18nTableMap::META_TITLE)) $criteria->add(ContentI18nTableMap::META_TITLE, $this->meta_title); if ($this->isColumnModified(ContentI18nTableMap::META_DESCRIPTION)) $criteria->add(ContentI18nTableMap::META_DESCRIPTION, $this->meta_description); if ($this->isColumnModified(ContentI18nTableMap::META_KEYWORDS)) $criteria->add(ContentI18nTableMap::META_KEYWORDS, $this->meta_keywords); - return $criteria; } @@ -1327,7 +1306,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1342,7 +1321,6 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1352,9 +1330,9 @@ abstract class ContentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1381,8 +1359,8 @@ abstract class ContentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1398,8 +1376,8 @@ abstract class ContentI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ContentI18n The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ContentI18n The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1418,16 +1396,14 @@ abstract class ContentI18n implements ActiveRecordInterface $v->addContentI18n($this); } - return $this; } - /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1475,7 +1451,7 @@ abstract class ContentI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ContentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentI18nQuery.php index c2b1dc15b..3632883c2 100644 --- a/core/lib/Thelia/Model/Base/ContentI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ContentI18nQuery.php @@ -79,9 +79,9 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentI18n', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Returns a new ChildContentI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentI18nQuery */ @@ -152,10 +152,10 @@ abstract class ContentI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentI18n A model object, or null if the key is not found + * @return ChildContentI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentI18n|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class ContentI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class ContentI18nQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -312,9 +312,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -341,9 +341,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -370,9 +370,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -399,9 +399,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -428,9 +428,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -457,9 +457,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByMetaTitle('%fooValue%'); // WHERE meta_title LIKE '%fooValue%' * * - * @param string $metaTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -486,9 +486,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByMetaDescription('%fooValue%'); // WHERE meta_description LIKE '%fooValue%' * * - * @param string $metaDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -515,9 +515,9 @@ abstract class ContentI18nQuery extends ModelCriteria * $query->filterByMetaKeywords('%fooValue%'); // WHERE meta_keywords LIKE '%fooValue%' * * - * @param string $metaKeywords The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaKeywords The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -538,8 +538,8 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -563,8 +563,8 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -597,11 +597,11 @@ abstract class ContentI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -613,7 +613,7 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentI18n $contentI18n Object to remove from the list of results + * @param ChildContentI18n $contentI18n Object to remove from the list of results * * @return ChildContentI18nQuery The current query, for fluid interface */ @@ -631,8 +631,8 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Deletes all rows from the content_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -663,13 +663,13 @@ abstract class ContentI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -689,7 +689,6 @@ abstract class ContentI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php index 62fad409f..0b1085a2f 100644 --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -32,7 +32,6 @@ abstract class ContentImage implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentImageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ContentImage implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentImage The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class ContentImage implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [content_id] column value. * - * @return int + * @return int */ public function getContentId() { - return $this->content_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class ContentImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class ContentImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class ContentImage implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class ContentImage implements ActiveRecordInterface $this->modifiedColumns[ContentImageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [content_id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setContentId($v) { @@ -518,15 +512,14 @@ abstract class ContentImage implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setContentId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class ContentImage implements ActiveRecordInterface $this->modifiedColumns[ContentImageTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class ContentImage implements ActiveRecordInterface $this->modifiedColumns[ContentImageTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class ContentImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class ContentImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class ContentImage implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentImage::setDeleted() @@ -790,8 +779,8 @@ abstract class ContentImage implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class ContentImage implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class ContentImage implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class ContentImage implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class ContentImage implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class ContentImage implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class ContentImage implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class ContentImage implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class ContentImage implements ActiveRecordInterface if ($this->isColumnModified(ContentImageTableMap::POSITION)) $criteria->add(ContentImageTableMap::POSITION, $this->position); if ($this->isColumnModified(ContentImageTableMap::CREATED_AT)) $criteria->add(ContentImageTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ContentImageTableMap::UPDATED_AT)) $criteria->add(ContentImageTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class ContentImage implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class ContentImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentImage (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentImage (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class ContentImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentImage Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentImage Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class ContentImage implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ContentImage The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1336,16 +1323,14 @@ abstract class ContentImage implements ActiveRecordInterface $v->addContentImage($this); } - return $this; } - /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class ContentImage implements ActiveRecordInterface return $this->aContent; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class ContentImage implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class ContentImage implements ActiveRecordInterface * If this ChildContentImage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentImageI18n[] List of ChildContentImageI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class ContentImage implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentImageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContentImage The current object (for fluent API support) + * @param Collection $contentImageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContentImage The current object (for fluent API support) */ public function setContentImageI18ns(Collection $contentImageI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class ContentImage implements ActiveRecordInterface /** * Returns the number of related ContentImageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentImageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentImageI18n objects. * @throws PropelException */ public function countContentImageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class ContentImage implements ActiveRecordInterface * Method called to associate a ChildContentImageI18n object to this object * through the ChildContentImageI18n foreign key attribute. * - * @param ChildContentImageI18n $l ChildContentImageI18n - * @return \Thelia\Model\ContentImage The current object (for fluent API support) + * @param ChildContentImageI18n $l ChildContentImageI18n + * @return \Thelia\Model\ContentImage The current object (for fluent API support) */ public function addContentImageI18n(ChildContentImageI18n $l) { @@ -1587,7 +1571,7 @@ abstract class ContentImage implements ActiveRecordInterface } /** - * @param ContentImageI18n $contentImageI18n The contentImageI18n object to remove. + * @param ContentImageI18n $contentImageI18n The contentImageI18n object to remove. * @return ChildContentImage The current object (for fluent API support) */ public function removeContentImageI18n($contentImageI18n) @@ -1630,7 +1614,7 @@ abstract class ContentImage implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildContentImage The current object (for fluent API support) + * @return ChildContentImage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class ContentImage implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildContentImage The current object (for fluent API support) + * @return ChildContentImage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class ContentImage implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildContentImageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class ContentImage implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildContentImage The current object (for fluent API support) + * @return ChildContentImage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class ContentImage implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildContentImageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php index b29fc6d9d..2c3c87537 100644 --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -26,7 +26,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentImageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ContentImageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentImageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->aContentImage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->modifiedColumns[ContentImageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->modifiedColumns[ContentImageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->modifiedColumns[ContentImageI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->modifiedColumns[ContentImageI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface $this->modifiedColumns[ContentImageI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ContentImageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ContentImageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentImageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ContentImageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface if ($this->isColumnModified(ContentImageI18nTableMap::DESCRIPTION)) $criteria->add(ContentImageI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ContentImageI18nTableMap::CHAPO)) $criteria->add(ContentImageI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ContentImageI18nTableMap::POSTSCRIPTUM)) $criteria->add(ContentImageI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ContentImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentImageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentImageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentImageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentImageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildContentImage object. * - * @param ChildContentImage $v - * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) + * @param ChildContentImage $v + * @return \Thelia\Model\ContentImageI18n The current object (for fluent API support) * @throws PropelException */ public function setContentImage(ChildContentImage $v = null) @@ -1247,16 +1231,14 @@ abstract class ContentImageI18n implements ActiveRecordInterface $v->addContentImageI18n($this); } - return $this; } - /** * Get the associated ChildContentImage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContentImage The associated ChildContentImage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContentImage The associated ChildContentImage object. * @throws PropelException */ public function getContentImage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php b/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php index e99e58f37..56beef66a 100644 --- a/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php @@ -67,9 +67,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentImageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentImageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Returns a new ChildContentImageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentImageI18nQuery */ @@ -140,10 +140,10 @@ abstract class ContentImageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentImageI18n A model object, or null if the key is not found + * @return ChildContentImageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentImageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ContentImageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ContentImageI18nQuery extends ModelCriteria * * @see filterByContentImage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ContentImageI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class ContentImageI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ContentImage object * * @param \Thelia\Model\ContentImage|ObjectCollection $contentImage The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ContentImageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentImageQuery A secondary query class using the current class as primary query */ public function useContentImageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentImageI18n $contentImageI18n Object to remove from the list of results + * @param ChildContentImageI18n $contentImageI18n Object to remove from the list of results * * @return ChildContentImageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Deletes all rows from the content_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ContentImageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ContentImageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentImageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ContentImageQuery.php b/core/lib/Thelia/Model/Base/ContentImageQuery.php index 339bdfc55..93b944ae1 100644 --- a/core/lib/Thelia/Model/Base/ContentImageQuery.php +++ b/core/lib/Thelia/Model/Base/ContentImageQuery.php @@ -72,9 +72,9 @@ abstract class ContentImageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentImageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentImage', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Returns a new ChildContentImageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentImageQuery */ @@ -114,7 +114,7 @@ abstract class ContentImageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildContentImage|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ContentImageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentImage A model object, or null if the key is not found + * @return ChildContentImage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentImage|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ContentImageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ContentImageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentImageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ContentImageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentImageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ContentImageTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ContentImageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class ContentImageQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $contentId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class ContentImageQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class ContentImageQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class ContentImageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class ContentImageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class ContentImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentImageI18n object * - * @param \Thelia\Model\ContentImageI18n|ObjectCollection $contentImageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentImageI18n|ObjectCollection $contentImageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentImageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class ContentImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentImageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentImageI18nQuery A secondary query class using the current class as primary query */ public function useContentImageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class ContentImageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentImage $contentImage Object to remove from the list of results + * @param ChildContentImage $contentImage Object to remove from the list of results * * @return ChildContentImageQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class ContentImageQuery extends ModelCriteria /** * Deletes all rows from the content_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class ContentImageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class ContentImageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentImageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class ContentImageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class ContentImageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class ContentImageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class ContentImageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class ContentImageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class ContentImageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class ContentImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class ContentImageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentImageQuery The current query, for fluid interface + * @return ChildContentImageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class ContentImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentImageI18nQuery A secondary query class using the current class as primary query + * @return ChildContentImageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php index 0cbd7191d..c3a9ecdac 100644 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -107,9 +107,9 @@ abstract class ContentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Content', $modelAlias = null) { @@ -119,8 +119,8 @@ abstract class ContentQuery extends ModelCriteria /** * Returns a new ChildContentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentQuery */ @@ -149,7 +149,7 @@ abstract class ContentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildContent|array|mixed the result, formatted by the current formatter @@ -180,10 +180,10 @@ abstract class ContentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContent A model object, or null if the key is not found + * @return ChildContent A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -210,8 +210,8 @@ abstract class ContentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContent|array|mixed the result, formatted by the current formatter */ @@ -231,8 +231,8 @@ abstract class ContentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -253,26 +253,24 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ContentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ContentTableMap::ID, $keys, Criteria::IN); } @@ -286,11 +284,11 @@ abstract class ContentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -327,11 +325,11 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -368,11 +366,11 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -409,13 +407,13 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -452,13 +450,13 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -495,11 +493,11 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -536,13 +534,13 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -578,9 +576,9 @@ abstract class ContentQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -601,8 +599,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentFolder object * - * @param \Thelia\Model\ContentFolder|ObjectCollection $contentFolder the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentFolder|ObjectCollection $contentFolder the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -624,8 +622,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentFolder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -658,11 +656,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentFolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentFolderQuery A secondary query class using the current class as primary query */ public function useContentFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -674,8 +672,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentImage object * - * @param \Thelia\Model\ContentImage|ObjectCollection $contentImage the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentImage|ObjectCollection $contentImage the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -697,8 +695,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -731,11 +729,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentImageQuery A secondary query class using the current class as primary query */ public function useContentImageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -747,8 +745,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentDocument object * - * @param \Thelia\Model\ContentDocument|ObjectCollection $contentDocument the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentDocument|ObjectCollection $contentDocument the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -770,8 +768,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -804,11 +802,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentDocumentQuery A secondary query class using the current class as primary query */ public function useContentDocumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -820,8 +818,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductAssociatedContent object * - * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -843,8 +841,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductAssociatedContent relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -877,11 +875,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query */ public function useProductAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -893,8 +891,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CategoryAssociatedContent object * - * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -916,8 +914,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CategoryAssociatedContent relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -950,11 +948,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query */ public function useCategoryAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -966,8 +964,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentI18n object * - * @param \Thelia\Model\ContentI18n|ObjectCollection $contentI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentI18n|ObjectCollection $contentI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -989,8 +987,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -1023,11 +1021,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentI18nQuery A secondary query class using the current class as primary query */ public function useContentI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -1039,8 +1037,8 @@ abstract class ContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentVersion object * - * @param \Thelia\Model\ContentVersion|ObjectCollection $contentVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentVersion|ObjectCollection $contentVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface */ @@ -1062,8 +1060,8 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentQuery The current query, for fluid interface */ @@ -1096,11 +1094,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentVersionQuery A secondary query class using the current class as primary query */ public function useContentVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1113,7 +1111,7 @@ abstract class ContentQuery extends ModelCriteria * Filter the query by a related Folder object * using the content_folder table as cross reference * - * @param Folder $folder the related object to use as filter + * @param Folder $folder the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentQuery The current query, for fluid interface @@ -1129,7 +1127,7 @@ abstract class ContentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContent $content Object to remove from the list of results + * @param ChildContent $content Object to remove from the list of results * * @return ChildContentQuery The current query, for fluid interface */ @@ -1145,8 +1143,8 @@ abstract class ContentQuery extends ModelCriteria /** * Deletes all rows from the content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1177,13 +1175,13 @@ abstract class ContentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContent or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContent object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1203,7 +1201,6 @@ abstract class ContentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1222,9 +1219,9 @@ abstract class ContentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1234,9 +1231,9 @@ abstract class ContentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1246,7 +1243,7 @@ abstract class ContentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1256,7 +1253,7 @@ abstract class ContentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1266,7 +1263,7 @@ abstract class ContentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1276,7 +1273,7 @@ abstract class ContentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1288,11 +1285,11 @@ abstract class ContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1307,10 +1304,10 @@ abstract class ContentQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentQuery The current query, for fluid interface + * @return ChildContentQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1327,11 +1324,11 @@ abstract class ContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildContentI18nQuery A secondary query class using the current class as primary query + * @return ChildContentI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1347,7 +1344,7 @@ abstract class ContentQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1355,7 +1352,7 @@ abstract class ContentQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1363,7 +1360,7 @@ abstract class ContentQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php index b42831072..072122d47 100644 --- a/core/lib/Thelia/Model/Base/ContentVersion.php +++ b/core/lib/Thelia/Model/Base/ContentVersion.php @@ -28,7 +28,6 @@ abstract class ContentVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ContentVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -339,9 +338,9 @@ abstract class ContentVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ContentVersion The current object, for fluid interface */ @@ -391,33 +390,30 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -425,8 +421,8 @@ abstract class ContentVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -445,8 +441,8 @@ abstract class ContentVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -464,11 +460,10 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -476,8 +471,8 @@ abstract class ContentVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -495,19 +490,18 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setId($v) { @@ -524,15 +518,14 @@ abstract class ContentVersion implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setId() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setVisible($v) { @@ -545,15 +538,14 @@ abstract class ContentVersion implements ActiveRecordInterface $this->modifiedColumns[ContentVersionTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setPosition($v) { @@ -566,16 +558,15 @@ abstract class ContentVersion implements ActiveRecordInterface $this->modifiedColumns[ContentVersionTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -587,16 +578,15 @@ abstract class ContentVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -608,15 +598,14 @@ abstract class ContentVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -629,16 +618,15 @@ abstract class ContentVersion implements ActiveRecordInterface $this->modifiedColumns[ContentVersionTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -650,15 +638,14 @@ abstract class ContentVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -671,7 +658,6 @@ abstract class ContentVersion implements ActiveRecordInterface $this->modifiedColumns[ContentVersionTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -715,7 +701,6 @@ abstract class ContentVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ContentVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -788,10 +773,10 @@ abstract class ContentVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -827,7 +812,7 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ContentVersion::setDeleted() @@ -870,8 +855,8 @@ abstract class ContentVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -921,8 +906,8 @@ abstract class ContentVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -965,7 +950,7 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1050,7 +1035,7 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1066,12 +1051,12 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1085,7 +1070,7 @@ abstract class ContentVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1127,12 +1112,12 @@ abstract class ContentVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1170,12 +1155,12 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1189,8 +1174,8 @@ abstract class ContentVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1236,8 +1221,8 @@ abstract class ContentVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1271,7 +1256,6 @@ abstract class ContentVersion implements ActiveRecordInterface if ($this->isColumnModified(ContentVersionTableMap::VERSION)) $criteria->add(ContentVersionTableMap::VERSION, $this->version); if ($this->isColumnModified(ContentVersionTableMap::VERSION_CREATED_AT)) $criteria->add(ContentVersionTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(ContentVersionTableMap::VERSION_CREATED_BY)) $criteria->add(ContentVersionTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1309,7 +1293,7 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1324,7 +1308,6 @@ abstract class ContentVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1334,9 +1317,9 @@ abstract class ContentVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ContentVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ContentVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1362,8 +1345,8 @@ abstract class ContentVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ContentVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ContentVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1379,8 +1362,8 @@ abstract class ContentVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ContentVersion The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ContentVersion The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1399,16 +1382,14 @@ abstract class ContentVersion implements ActiveRecordInterface $v->addContentVersion($this); } - return $this; } - /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1455,7 +1436,7 @@ abstract class ContentVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ContentVersionQuery.php b/core/lib/Thelia/Model/Base/ContentVersionQuery.php index 6e8481c99..e37406271 100644 --- a/core/lib/Thelia/Model/Base/ContentVersionQuery.php +++ b/core/lib/Thelia/Model/Base/ContentVersionQuery.php @@ -75,9 +75,9 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ContentVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ContentVersion', $modelAlias = null) { @@ -87,8 +87,8 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Returns a new ChildContentVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildContentVersionQuery */ @@ -148,10 +148,10 @@ abstract class ContentVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildContentVersion A model object, or null if the key is not found + * @return ChildContentVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -179,8 +179,8 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildContentVersion|array|mixed the result, formatted by the current formatter */ @@ -200,8 +200,8 @@ abstract class ContentVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -222,7 +222,7 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -237,7 +237,7 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -268,11 +268,11 @@ abstract class ContentVersionQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -309,11 +309,11 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -350,11 +350,11 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -391,13 +391,13 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -434,13 +434,13 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -477,11 +477,11 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -518,13 +518,13 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -560,9 +560,9 @@ abstract class ContentVersionQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -583,8 +583,8 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -608,8 +608,8 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -642,11 +642,11 @@ abstract class ContentVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -658,7 +658,7 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildContentVersion $contentVersion Object to remove from the list of results + * @param ChildContentVersion $contentVersion Object to remove from the list of results * * @return ChildContentVersionQuery The current query, for fluid interface */ @@ -676,8 +676,8 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Deletes all rows from the content_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -708,13 +708,13 @@ abstract class ContentVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildContentVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildContentVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildContentVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -734,7 +734,6 @@ abstract class ContentVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ContentVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index aa2597ceb..9995bb598 100644 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -36,7 +36,6 @@ abstract class Country implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CountryTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -405,9 +404,9 @@ abstract class Country implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Country The current object, for fluid interface */ @@ -457,77 +456,70 @@ abstract class Country implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [area_id] column value. * - * @return int + * @return int */ public function getAreaId() { - return $this->area_id; } /** * Get the [isocode] column value. * - * @return string + * @return string */ public function getIsocode() { - return $this->isocode; } /** * Get the [isoalpha2] column value. * - * @return string + * @return string */ public function getIsoalpha2() { - return $this->isoalpha2; } /** * Get the [isoalpha3] column value. * - * @return string + * @return string */ public function getIsoalpha3() { - return $this->isoalpha3; } /** * Get the [by_default] column value. * - * @return int + * @return int */ public function getByDefault() { - return $this->by_default; } /** * Get the [shop_country] column value. * - * @return boolean + * @return boolean */ public function getShopCountry() { - return $this->shop_country; } @@ -535,8 +527,8 @@ abstract class Country implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -555,8 +547,8 @@ abstract class Country implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -574,8 +566,8 @@ abstract class Country implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setId($v) { @@ -588,15 +580,14 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [area_id] column. * - * @param int $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setAreaId($v) { @@ -613,15 +604,14 @@ abstract class Country implements ActiveRecordInterface $this->aArea = null; } - return $this; } // setAreaId() /** * Set the value of [isocode] column. * - * @param string $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setIsocode($v) { @@ -634,15 +624,14 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::ISOCODE] = true; } - return $this; } // setIsocode() /** * Set the value of [isoalpha2] column. * - * @param string $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setIsoalpha2($v) { @@ -655,15 +644,14 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::ISOALPHA2] = true; } - return $this; } // setIsoalpha2() /** * Set the value of [isoalpha3] column. * - * @param string $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setIsoalpha3($v) { @@ -676,15 +664,14 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::ISOALPHA3] = true; } - return $this; } // setIsoalpha3() /** * Set the value of [by_default] column. * - * @param int $v new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setByDefault($v) { @@ -697,7 +684,6 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::BY_DEFAULT] = true; } - return $this; } // setByDefault() @@ -708,8 +694,8 @@ abstract class Country implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setShopCountry($v) { @@ -726,16 +712,15 @@ abstract class Country implements ActiveRecordInterface $this->modifiedColumns[CountryTableMap::SHOP_COUNTRY] = true; } - return $this; } // setShopCountry() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -747,16 +732,15 @@ abstract class Country implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -768,7 +752,6 @@ abstract class Country implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -816,7 +799,6 @@ abstract class Country implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CountryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -889,10 +871,10 @@ abstract class Country implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -934,7 +916,7 @@ abstract class Country implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Country::setDeleted() @@ -977,8 +959,8 @@ abstract class Country implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1039,8 +1021,8 @@ abstract class Country implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1134,7 +1116,7 @@ abstract class Country implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1236,7 +1218,7 @@ abstract class Country implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1252,12 +1234,12 @@ abstract class Country implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1271,7 +1253,7 @@ abstract class Country implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1316,12 +1298,12 @@ abstract class Country implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1369,12 +1351,12 @@ abstract class Country implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1388,8 +1370,8 @@ abstract class Country implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1438,8 +1420,8 @@ abstract class Country implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1475,7 +1457,6 @@ abstract class Country implements ActiveRecordInterface if ($this->isColumnModified(CountryTableMap::SHOP_COUNTRY)) $criteria->add(CountryTableMap::SHOP_COUNTRY, $this->shop_country); if ($this->isColumnModified(CountryTableMap::CREATED_AT)) $criteria->add(CountryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CountryTableMap::UPDATED_AT)) $criteria->add(CountryTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1497,7 +1478,7 @@ abstract class Country implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1507,7 +1488,7 @@ abstract class Country implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1521,7 +1502,6 @@ abstract class Country implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1531,9 +1511,9 @@ abstract class Country implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Country (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Country (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1586,8 +1566,8 @@ abstract class Country implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Country Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Country Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1603,8 +1583,8 @@ abstract class Country implements ActiveRecordInterface /** * Declares an association between this object and a ChildArea object. * - * @param ChildArea $v - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param ChildArea $v + * @return \Thelia\Model\Country The current object (for fluent API support) * @throws PropelException */ public function setArea(ChildArea $v = null) @@ -1623,7 +1603,6 @@ abstract class Country implements ActiveRecordInterface $v->addCountry($this); } - return $this; } @@ -1631,8 +1610,8 @@ abstract class Country implements ActiveRecordInterface /** * Get the associated ChildArea object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildArea The associated ChildArea object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildArea The associated ChildArea object. * @throws PropelException */ public function getArea(ConnectionInterface $con = null) @@ -1657,7 +1636,7 @@ abstract class Country implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1702,8 +1681,8 @@ abstract class Country implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1725,8 +1704,8 @@ abstract class Country implements ActiveRecordInterface * If this ChildCountry is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects * @throws PropelException */ @@ -1782,15 +1761,14 @@ abstract class Country implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $taxRuleCountries A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCountry The current object (for fluent API support) + * @param Collection $taxRuleCountries A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCountry The current object (for fluent API support) */ public function setTaxRuleCountries(Collection $taxRuleCountries, ConnectionInterface $con = null) { $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1814,10 +1792,10 @@ abstract class Country implements ActiveRecordInterface /** * Returns the number of related TaxRuleCountry objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TaxRuleCountry objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TaxRuleCountry objects. * @throws PropelException */ public function countTaxRuleCountries(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1849,8 +1827,8 @@ abstract class Country implements ActiveRecordInterface * Method called to associate a ChildTaxRuleCountry object to this object * through the ChildTaxRuleCountry foreign key attribute. * - * @param ChildTaxRuleCountry $l ChildTaxRuleCountry - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param ChildTaxRuleCountry $l ChildTaxRuleCountry + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function addTaxRuleCountry(ChildTaxRuleCountry $l) { @@ -1877,7 +1855,7 @@ abstract class Country implements ActiveRecordInterface /** * @param TaxRuleCountry $taxRuleCountry The taxRuleCountry object to remove. - * @return ChildCountry The current object (for fluent API support) + * @return ChildCountry The current object (for fluent API support) */ public function removeTaxRuleCountry($taxRuleCountry) { @@ -1894,7 +1872,6 @@ abstract class Country implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1906,9 +1883,9 @@ abstract class Country implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Country. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinTax($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1919,7 +1896,6 @@ abstract class Country implements ActiveRecordInterface return $this->getTaxRuleCountries($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1931,9 +1907,9 @@ abstract class Country implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Country. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinTaxRule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1973,8 +1949,8 @@ abstract class Country implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1996,8 +1972,8 @@ abstract class Country implements ActiveRecordInterface * If this ChildCountry is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAddress[] List of ChildAddress objects * @throws PropelException */ @@ -2053,15 +2029,14 @@ abstract class Country implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $addresses A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCountry The current object (for fluent API support) + * @param Collection $addresses A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCountry The current object (for fluent API support) */ public function setAddresses(Collection $addresses, ConnectionInterface $con = null) { $addressesToDelete = $this->getAddresses(new Criteria(), $con)->diff($addresses); - $this->addressesScheduledForDeletion = $addressesToDelete; foreach ($addressesToDelete as $addressRemoved) { @@ -2082,10 +2057,10 @@ abstract class Country implements ActiveRecordInterface /** * Returns the number of related Address objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Address objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Address objects. * @throws PropelException */ public function countAddresses(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2117,8 +2092,8 @@ abstract class Country implements ActiveRecordInterface * Method called to associate a ChildAddress object to this object * through the ChildAddress foreign key attribute. * - * @param ChildAddress $l ChildAddress - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param ChildAddress $l ChildAddress + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function addAddress(ChildAddress $l) { @@ -2144,7 +2119,7 @@ abstract class Country implements ActiveRecordInterface } /** - * @param Address $address The address object to remove. + * @param Address $address The address object to remove. * @return ChildCountry The current object (for fluent API support) */ public function removeAddress($address) @@ -2162,7 +2137,6 @@ abstract class Country implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2174,9 +2148,9 @@ abstract class Country implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Country. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2187,7 +2161,6 @@ abstract class Country implements ActiveRecordInterface return $this->getAddresses($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2199,9 +2172,9 @@ abstract class Country implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Country. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCustomerTitle($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2241,8 +2214,8 @@ abstract class Country implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2264,8 +2237,8 @@ abstract class Country implements ActiveRecordInterface * If this ChildCountry is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCountryI18n[] List of ChildCountryI18n objects * @throws PropelException */ @@ -2321,15 +2294,14 @@ abstract class Country implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $countryI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCountry The current object (for fluent API support) + * @param Collection $countryI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCountry The current object (for fluent API support) */ public function setCountryI18ns(Collection $countryI18ns, ConnectionInterface $con = null) { $countryI18nsToDelete = $this->getCountryI18ns(new Criteria(), $con)->diff($countryI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2353,10 +2325,10 @@ abstract class Country implements ActiveRecordInterface /** * Returns the number of related CountryI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CountryI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CountryI18n objects. * @throws PropelException */ public function countCountryI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2388,8 +2360,8 @@ abstract class Country implements ActiveRecordInterface * Method called to associate a ChildCountryI18n object to this object * through the ChildCountryI18n foreign key attribute. * - * @param ChildCountryI18n $l ChildCountryI18n - * @return \Thelia\Model\Country The current object (for fluent API support) + * @param ChildCountryI18n $l ChildCountryI18n + * @return \Thelia\Model\Country The current object (for fluent API support) */ public function addCountryI18n(ChildCountryI18n $l) { @@ -2419,7 +2391,7 @@ abstract class Country implements ActiveRecordInterface } /** - * @param CountryI18n $countryI18n The countryI18n object to remove. + * @param CountryI18n $countryI18n The countryI18n object to remove. * @return ChildCountry The current object (for fluent API support) */ public function removeCountryI18n($countryI18n) @@ -2466,7 +2438,7 @@ abstract class Country implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2513,7 +2485,7 @@ abstract class Country implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCountry The current object (for fluent API support) + * @return ChildCountry The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2527,9 +2499,9 @@ abstract class Country implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCountry The current object (for fluent API support) + * @return ChildCountry The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2541,7 +2513,7 @@ abstract class Country implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2551,8 +2523,8 @@ abstract class Country implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCountryI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2585,10 +2557,10 @@ abstract class Country implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCountry The current object (for fluent API support) + * @return ChildCountry The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2613,7 +2585,7 @@ abstract class Country implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCountryI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2621,7 +2593,6 @@ abstract class Country implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2632,7 +2603,6 @@ abstract class Country implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2645,7 +2615,6 @@ abstract class Country implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2656,7 +2625,6 @@ abstract class Country implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2669,7 +2637,6 @@ abstract class Country implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2680,7 +2647,6 @@ abstract class Country implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2693,7 +2659,6 @@ abstract class Country implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2704,7 +2669,6 @@ abstract class Country implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2793,7 +2757,6 @@ abstract class Country implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php index 7088720ab..27d654190 100644 --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -26,7 +26,6 @@ abstract class CountryI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CountryI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class CountryI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CountryI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class CountryI18n implements ActiveRecordInterface $this->aCountry = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class CountryI18n implements ActiveRecordInterface $this->modifiedColumns[CountryI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class CountryI18n implements ActiveRecordInterface $this->modifiedColumns[CountryI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class CountryI18n implements ActiveRecordInterface $this->modifiedColumns[CountryI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class CountryI18n implements ActiveRecordInterface $this->modifiedColumns[CountryI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class CountryI18n implements ActiveRecordInterface $this->modifiedColumns[CountryI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class CountryI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CountryI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class CountryI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CountryI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class CountryI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class CountryI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class CountryI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class CountryI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class CountryI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class CountryI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class CountryI18n implements ActiveRecordInterface if ($this->isColumnModified(CountryI18nTableMap::DESCRIPTION)) $criteria->add(CountryI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CountryI18nTableMap::CHAPO)) $criteria->add(CountryI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(CountryI18nTableMap::POSTSCRIPTUM)) $criteria->add(CountryI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class CountryI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CountryI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CountryI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class CountryI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CountryI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CountryI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class CountryI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCountry object. * - * @param ChildCountry $v - * @return \Thelia\Model\CountryI18n The current object (for fluent API support) + * @param ChildCountry $v + * @return \Thelia\Model\CountryI18n The current object (for fluent API support) * @throws PropelException */ public function setCountry(ChildCountry $v = null) @@ -1247,16 +1231,14 @@ abstract class CountryI18n implements ActiveRecordInterface $v->addCountryI18n($this); } - return $this; } - /** * Get the associated ChildCountry object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCountry The associated ChildCountry object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCountry The associated ChildCountry object. * @throws PropelException */ public function getCountry(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class CountryI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CountryI18nQuery.php b/core/lib/Thelia/Model/Base/CountryI18nQuery.php index 81ea2b508..d91d33a0f 100644 --- a/core/lib/Thelia/Model/Base/CountryI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CountryI18nQuery.php @@ -67,9 +67,9 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CountryI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CountryI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Returns a new ChildCountryI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCountryI18nQuery */ @@ -140,10 +140,10 @@ abstract class CountryI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCountryI18n A model object, or null if the key is not found + * @return ChildCountryI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCountryI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class CountryI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class CountryI18nQuery extends ModelCriteria * * @see filterByCountry() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class CountryI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class CountryI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class CountryI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class CountryI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class CountryI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Country object * - * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Country relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class CountryI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query */ public function useCountryQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCountryI18n $countryI18n Object to remove from the list of results + * @param ChildCountryI18n $countryI18n Object to remove from the list of results * * @return ChildCountryI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Deletes all rows from the country_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class CountryI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCountryI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCountryI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCountryI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class CountryI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CountryI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 270802f07..20488968f 100644 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -92,9 +92,9 @@ abstract class CountryQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CountryQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Country', $modelAlias = null) { @@ -104,8 +104,8 @@ abstract class CountryQuery extends ModelCriteria /** * Returns a new ChildCountryQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCountryQuery */ @@ -134,7 +134,7 @@ abstract class CountryQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCountry|array|mixed the result, formatted by the current formatter @@ -165,10 +165,10 @@ abstract class CountryQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCountry A model object, or null if the key is not found + * @return ChildCountry A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -195,8 +195,8 @@ abstract class CountryQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCountry|array|mixed the result, formatted by the current formatter */ @@ -216,8 +216,8 @@ abstract class CountryQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -238,26 +238,24 @@ abstract class CountryQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCountryQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CountryTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCountryQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CountryTableMap::ID, $keys, Criteria::IN); } @@ -271,11 +269,11 @@ abstract class CountryQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -314,11 +312,11 @@ abstract class CountryQuery extends ModelCriteria * * @see filterByArea() * - * @param mixed $areaId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $areaId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -354,9 +352,9 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByIsocode('%fooValue%'); // WHERE isocode LIKE '%fooValue%' * * - * @param string $isocode The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $isocode The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -383,9 +381,9 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByIsoalpha2('%fooValue%'); // WHERE isoalpha2 LIKE '%fooValue%' * * - * @param string $isoalpha2 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $isoalpha2 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -412,9 +410,9 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByIsoalpha3('%fooValue%'); // WHERE isoalpha3 LIKE '%fooValue%' * * - * @param string $isoalpha3 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $isoalpha3 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -442,11 +440,11 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByByDefault(array('min' => 12)); // WHERE by_default > 12 * * - * @param mixed $byDefault The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $byDefault The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -482,12 +480,12 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByShopCountry('yes'); // WHERE shop_country = true * * - * @param boolean|string $shopCountry The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $shopCountry The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -510,13 +508,13 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -553,13 +551,13 @@ abstract class CountryQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -589,8 +587,8 @@ abstract class CountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Area object * - * @param \Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -614,8 +612,8 @@ abstract class CountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Area relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCountryQuery The current query, for fluid interface */ @@ -648,11 +646,11 @@ abstract class CountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query */ public function useAreaQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -664,8 +662,8 @@ abstract class CountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRuleCountry object * - * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -687,8 +685,8 @@ abstract class CountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRuleCountry relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCountryQuery The current query, for fluid interface */ @@ -721,11 +719,11 @@ abstract class CountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -737,8 +735,8 @@ abstract class CountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Address object * - * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -760,8 +758,8 @@ abstract class CountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Address relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCountryQuery The current query, for fluid interface */ @@ -794,11 +792,11 @@ abstract class CountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query */ public function useAddressQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -810,8 +808,8 @@ abstract class CountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CountryI18n object * - * @param \Thelia\Model\CountryI18n|ObjectCollection $countryI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CountryI18n|ObjectCollection $countryI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCountryQuery The current query, for fluid interface */ @@ -833,8 +831,8 @@ abstract class CountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CountryI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCountryQuery The current query, for fluid interface */ @@ -867,11 +865,11 @@ abstract class CountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CountryI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CountryI18nQuery A secondary query class using the current class as primary query */ public function useCountryI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -883,7 +881,7 @@ abstract class CountryQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCountry $country Object to remove from the list of results + * @param ChildCountry $country Object to remove from the list of results * * @return ChildCountryQuery The current query, for fluid interface */ @@ -899,8 +897,8 @@ abstract class CountryQuery extends ModelCriteria /** * Deletes all rows from the country table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -931,13 +929,13 @@ abstract class CountryQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCountry or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCountry object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCountry object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -957,7 +955,6 @@ abstract class CountryQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CountryTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -976,9 +973,9 @@ abstract class CountryQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -988,9 +985,9 @@ abstract class CountryQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1000,7 +997,7 @@ abstract class CountryQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1010,7 +1007,7 @@ abstract class CountryQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1020,7 +1017,7 @@ abstract class CountryQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1030,7 +1027,7 @@ abstract class CountryQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1042,11 +1039,11 @@ abstract class CountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1061,10 +1058,10 @@ abstract class CountryQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCountryQuery The current query, for fluid interface + * @return ChildCountryQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1081,11 +1078,11 @@ abstract class CountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCountryI18nQuery A secondary query class using the current class as primary query + * @return ChildCountryI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 56d271683..0abe46f84 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -33,7 +33,6 @@ abstract class Coupon implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CouponTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -187,7 +186,6 @@ abstract class Coupon implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -427,9 +425,9 @@ abstract class Coupon implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Coupon The current object, for fluid interface */ @@ -479,55 +477,50 @@ abstract class Coupon implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [type] column value. * - * @return string + * @return string */ public function getType() { - return $this->type; } /** * Get the [serialized_effects] column value. * - * @return string + * @return string */ public function getSerializedEffects() { - return $this->serialized_effects; } /** * Get the [is_enabled] column value. * - * @return boolean + * @return boolean */ public function getIsEnabled() { - return $this->is_enabled; } @@ -535,8 +528,8 @@ abstract class Coupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [expiration_date] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -554,66 +547,60 @@ abstract class Coupon implements ActiveRecordInterface /** * Get the [max_usage] column value. * - * @return int + * @return int */ public function getMaxUsage() { - return $this->max_usage; } /** * Get the [is_cumulative] column value. * - * @return boolean + * @return boolean */ public function getIsCumulative() { - return $this->is_cumulative; } /** * Get the [is_removing_postage] column value. * - * @return boolean + * @return boolean */ public function getIsRemovingPostage() { - return $this->is_removing_postage; } /** * Get the [is_available_on_special_offers] column value. * - * @return boolean + * @return boolean */ public function getIsAvailableOnSpecialOffers() { - return $this->is_available_on_special_offers; } /** * Get the [is_used] column value. * - * @return boolean + * @return boolean */ public function getIsUsed() { - return $this->is_used; } /** * Get the [serialized_conditions] column value. * - * @return string + * @return string */ public function getSerializedConditions() { - return $this->serialized_conditions; } @@ -621,8 +608,8 @@ abstract class Coupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -641,8 +628,8 @@ abstract class Coupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -660,19 +647,18 @@ abstract class Coupon implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setId($v) { @@ -685,15 +671,14 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setCode($v) { @@ -706,15 +691,14 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [type] column. * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setType($v) { @@ -727,15 +711,14 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::TYPE] = true; } - return $this; } // setType() /** * Set the value of [serialized_effects] column. * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setSerializedEffects($v) { @@ -748,7 +731,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::SERIALIZED_EFFECTS] = true; } - return $this; } // setSerializedEffects() @@ -759,8 +741,8 @@ abstract class Coupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setIsEnabled($v) { @@ -777,16 +759,15 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::IS_ENABLED] = true; } - return $this; } // setIsEnabled() /** * Sets the value of [expiration_date] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setExpirationDate($v) { @@ -798,15 +779,14 @@ abstract class Coupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setExpirationDate() /** * Set the value of [max_usage] column. * - * @param int $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setMaxUsage($v) { @@ -819,7 +799,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::MAX_USAGE] = true; } - return $this; } // setMaxUsage() @@ -830,8 +809,8 @@ abstract class Coupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setIsCumulative($v) { @@ -848,7 +827,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::IS_CUMULATIVE] = true; } - return $this; } // setIsCumulative() @@ -859,8 +837,8 @@ abstract class Coupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setIsRemovingPostage($v) { @@ -877,7 +855,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::IS_REMOVING_POSTAGE] = true; } - return $this; } // setIsRemovingPostage() @@ -888,8 +865,8 @@ abstract class Coupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setIsAvailableOnSpecialOffers($v) { @@ -906,7 +883,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS] = true; } - return $this; } // setIsAvailableOnSpecialOffers() @@ -917,8 +893,8 @@ abstract class Coupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setIsUsed($v) { @@ -935,15 +911,14 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::IS_USED] = true; } - return $this; } // setIsUsed() /** * Set the value of [serialized_conditions] column. * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setSerializedConditions($v) { @@ -956,16 +931,15 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::SERIALIZED_CONDITIONS] = true; } - return $this; } // setSerializedConditions() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -977,16 +951,15 @@ abstract class Coupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -998,15 +971,14 @@ abstract class Coupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function setVersion($v) { @@ -1019,7 +991,6 @@ abstract class Coupon implements ActiveRecordInterface $this->modifiedColumns[CouponTableMap::VERSION] = true; } - return $this; } // setVersion() @@ -1063,7 +1034,6 @@ abstract class Coupon implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -1154,10 +1124,10 @@ abstract class Coupon implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1196,7 +1166,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Coupon::setDeleted() @@ -1239,8 +1209,8 @@ abstract class Coupon implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1310,8 +1280,8 @@ abstract class Coupon implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1376,7 +1346,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1514,7 +1484,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1530,12 +1500,12 @@ abstract class Coupon implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1549,7 +1519,7 @@ abstract class Coupon implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1612,12 +1582,12 @@ abstract class Coupon implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1665,12 +1635,12 @@ abstract class Coupon implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1684,8 +1654,8 @@ abstract class Coupon implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1752,8 +1722,8 @@ abstract class Coupon implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1801,7 +1771,6 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::CREATED_AT)) $criteria->add(CouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) $criteria->add(CouponTableMap::UPDATED_AT, $this->updated_at); if ($this->isColumnModified(CouponTableMap::VERSION)) $criteria->add(CouponTableMap::VERSION, $this->version); - return $criteria; } @@ -1823,7 +1792,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1833,7 +1802,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1847,7 +1816,6 @@ abstract class Coupon implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1857,9 +1825,9 @@ abstract class Coupon implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Coupon (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Coupon (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1912,8 +1880,8 @@ abstract class Coupon implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Coupon Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Coupon Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1926,13 +1894,12 @@ abstract class Coupon implements ActiveRecordInterface return $copyObj; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1974,8 +1941,8 @@ abstract class Coupon implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1997,8 +1964,8 @@ abstract class Coupon implements ActiveRecordInterface * If this ChildCoupon is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCouponI18n[] List of ChildCouponI18n objects * @throws PropelException */ @@ -2054,9 +2021,9 @@ abstract class Coupon implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $couponI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCoupon The current object (for fluent API support) + * @param Collection $couponI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) */ public function setCouponI18ns(Collection $couponI18ns, ConnectionInterface $con = null) { @@ -2086,10 +2053,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Returns the number of related CouponI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CouponI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponI18n objects. * @throws PropelException */ public function countCouponI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2121,8 +2088,8 @@ abstract class Coupon implements ActiveRecordInterface * Method called to associate a ChildCouponI18n object to this object * through the ChildCouponI18n foreign key attribute. * - * @param ChildCouponI18n $l ChildCouponI18n - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param ChildCouponI18n $l ChildCouponI18n + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function addCouponI18n(ChildCouponI18n $l) { @@ -2152,7 +2119,7 @@ abstract class Coupon implements ActiveRecordInterface } /** - * @param CouponI18n $couponI18n The couponI18n object to remove. + * @param CouponI18n $couponI18n The couponI18n object to remove. * @return ChildCoupon The current object (for fluent API support) */ public function removeCouponI18n($couponI18n) @@ -2199,8 +2166,8 @@ abstract class Coupon implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2222,8 +2189,8 @@ abstract class Coupon implements ActiveRecordInterface * If this ChildCoupon is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCouponVersion[] List of ChildCouponVersion objects * @throws PropelException */ @@ -2279,9 +2246,9 @@ abstract class Coupon implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $couponVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCoupon The current object (for fluent API support) + * @param Collection $couponVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) */ public function setCouponVersions(Collection $couponVersions, ConnectionInterface $con = null) { @@ -2311,10 +2278,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Returns the number of related CouponVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CouponVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponVersion objects. * @throws PropelException */ public function countCouponVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2346,8 +2313,8 @@ abstract class Coupon implements ActiveRecordInterface * Method called to associate a ChildCouponVersion object to this object * through the ChildCouponVersion foreign key attribute. * - * @param ChildCouponVersion $l ChildCouponVersion - * @return \Thelia\Model\Coupon The current object (for fluent API support) + * @param ChildCouponVersion $l ChildCouponVersion + * @return \Thelia\Model\Coupon The current object (for fluent API support) */ public function addCouponVersion(ChildCouponVersion $l) { @@ -2374,7 +2341,7 @@ abstract class Coupon implements ActiveRecordInterface /** * @param CouponVersion $couponVersion The couponVersion object to remove. - * @return ChildCoupon The current object (for fluent API support) + * @return ChildCoupon The current object (for fluent API support) */ public function removeCouponVersion($couponVersion) { @@ -2426,7 +2393,7 @@ abstract class Coupon implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2466,7 +2433,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCoupon The current object (for fluent API support) + * @return ChildCoupon The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2480,9 +2447,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCoupon The current object (for fluent API support) + * @return ChildCoupon The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2494,7 +2461,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2504,8 +2471,8 @@ abstract class Coupon implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCouponI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2538,10 +2505,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCoupon The current object (for fluent API support) + * @return ChildCoupon The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2566,7 +2533,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCouponI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2663,7 +2630,7 @@ abstract class Coupon implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -2685,9 +2652,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildCouponVersion A version object + * @return ChildCouponVersion A version object */ public function addVersion($con = null) { @@ -2718,10 +2685,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildCoupon The current object (for fluent API support) + * @return ChildCoupon The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -2737,9 +2704,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildCouponVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildCouponVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildCoupon The current object (for fluent API support) */ @@ -2768,9 +2735,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -2788,9 +2755,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -2800,10 +2767,10 @@ abstract class Coupon implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildCouponVersion A version object + * @return ChildCouponVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -2816,9 +2783,9 @@ abstract class Coupon implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildCouponVersion objects + * @return ObjectCollection A list of ChildCouponVersion objects */ public function getAllVersions($con = null) { @@ -2838,12 +2805,12 @@ abstract class Coupon implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -2863,13 +2830,13 @@ abstract class Coupon implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -2889,12 +2856,12 @@ abstract class Coupon implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -2929,7 +2896,7 @@ abstract class Coupon implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\CouponVersion[] List of \Thelia\Model\CouponVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php index 957befd0a..d8aca165e 100644 --- a/core/lib/Thelia/Model/Base/CouponI18n.php +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -26,7 +26,6 @@ abstract class CouponI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CouponI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -319,9 +318,9 @@ abstract class CouponI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CouponI18n The current object, for fluid interface */ @@ -371,63 +370,58 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [short_description] column value. * - * @return string + * @return string */ public function getShortDescription() { - return $this->short_description; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) */ public function setId($v) { @@ -444,15 +438,14 @@ abstract class CouponI18n implements ActiveRecordInterface $this->aCoupon = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -465,15 +458,14 @@ abstract class CouponI18n implements ActiveRecordInterface $this->modifiedColumns[CouponI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -486,15 +478,14 @@ abstract class CouponI18n implements ActiveRecordInterface $this->modifiedColumns[CouponI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [short_description] column. * - * @param string $v new value - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) */ public function setShortDescription($v) { @@ -507,15 +498,14 @@ abstract class CouponI18n implements ActiveRecordInterface $this->modifiedColumns[CouponI18nTableMap::SHORT_DESCRIPTION] = true; } - return $this; } // setShortDescription() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -528,7 +518,6 @@ abstract class CouponI18n implements ActiveRecordInterface $this->modifiedColumns[CouponI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() @@ -572,7 +561,6 @@ abstract class CouponI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -627,10 +615,10 @@ abstract class CouponI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -666,7 +654,7 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CouponI18n::setDeleted() @@ -709,8 +697,8 @@ abstract class CouponI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -760,8 +748,8 @@ abstract class CouponI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -804,7 +792,7 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -871,7 +859,7 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -887,12 +875,12 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -906,7 +894,7 @@ abstract class CouponI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -939,12 +927,12 @@ abstract class CouponI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -979,12 +967,12 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -998,8 +986,8 @@ abstract class CouponI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1036,8 +1024,8 @@ abstract class CouponI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1065,7 +1053,6 @@ abstract class CouponI18n implements ActiveRecordInterface if ($this->isColumnModified(CouponI18nTableMap::TITLE)) $criteria->add(CouponI18nTableMap::TITLE, $this->title); if ($this->isColumnModified(CouponI18nTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponI18nTableMap::SHORT_DESCRIPTION, $this->short_description); if ($this->isColumnModified(CouponI18nTableMap::DESCRIPTION)) $criteria->add(CouponI18nTableMap::DESCRIPTION, $this->description); - return $criteria; } @@ -1103,7 +1090,7 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1118,7 +1105,6 @@ abstract class CouponI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1128,9 +1114,9 @@ abstract class CouponI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CouponI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CouponI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1153,8 +1139,8 @@ abstract class CouponI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CouponI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CouponI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1170,8 +1156,8 @@ abstract class CouponI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCoupon object. * - * @param ChildCoupon $v - * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @param ChildCoupon $v + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) * @throws PropelException */ public function setCoupon(ChildCoupon $v = null) @@ -1190,16 +1176,14 @@ abstract class CouponI18n implements ActiveRecordInterface $v->addCouponI18n($this); } - return $this; } - /** * Get the associated ChildCoupon object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCoupon The associated ChildCoupon object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. * @throws PropelException */ public function getCoupon(ConnectionInterface $con = null) @@ -1243,7 +1227,7 @@ abstract class CouponI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CouponI18nQuery.php b/core/lib/Thelia/Model/Base/CouponI18nQuery.php index 217796a80..cdd6a1584 100644 --- a/core/lib/Thelia/Model/Base/CouponI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CouponI18nQuery.php @@ -63,9 +63,9 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CouponI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CouponI18n', $modelAlias = null) { @@ -75,8 +75,8 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Returns a new ChildCouponI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCouponI18nQuery */ @@ -136,10 +136,10 @@ abstract class CouponI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCouponI18n A model object, or null if the key is not found + * @return ChildCouponI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -167,8 +167,8 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCouponI18n|array|mixed the result, formatted by the current formatter */ @@ -188,8 +188,8 @@ abstract class CouponI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -210,7 +210,7 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -225,7 +225,7 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -256,11 +256,11 @@ abstract class CouponI18nQuery extends ModelCriteria * * @see filterByCoupon() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -296,9 +296,9 @@ abstract class CouponI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -325,9 +325,9 @@ abstract class CouponI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -354,9 +354,9 @@ abstract class CouponI18nQuery extends ModelCriteria * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' * * - * @param string $shortDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $shortDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -383,9 +383,9 @@ abstract class CouponI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -406,8 +406,8 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Coupon object * - * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -431,8 +431,8 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Coupon relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -465,11 +465,11 @@ abstract class CouponI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query */ public function useCouponQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -481,7 +481,7 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCouponI18n $couponI18n Object to remove from the list of results + * @param ChildCouponI18n $couponI18n Object to remove from the list of results * * @return ChildCouponI18nQuery The current query, for fluid interface */ @@ -499,8 +499,8 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Deletes all rows from the coupon_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -531,13 +531,13 @@ abstract class CouponI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCouponI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCouponI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCouponI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -557,7 +557,6 @@ abstract class CouponI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CouponI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index 0967d21e2..c20eb9dcb 100644 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -115,9 +115,9 @@ abstract class CouponQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CouponQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Coupon', $modelAlias = null) { @@ -127,8 +127,8 @@ abstract class CouponQuery extends ModelCriteria /** * Returns a new ChildCouponQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCouponQuery */ @@ -157,7 +157,7 @@ abstract class CouponQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCoupon|array|mixed the result, formatted by the current formatter @@ -188,10 +188,10 @@ abstract class CouponQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCoupon A model object, or null if the key is not found + * @return ChildCoupon A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -218,8 +218,8 @@ abstract class CouponQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCoupon|array|mixed the result, formatted by the current formatter */ @@ -239,8 +239,8 @@ abstract class CouponQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -261,26 +261,24 @@ abstract class CouponQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCouponQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CouponTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCouponQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CouponTableMap::ID, $keys, Criteria::IN); } @@ -294,11 +292,11 @@ abstract class CouponQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -363,9 +361,9 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $type The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $type The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -392,9 +390,9 @@ abstract class CouponQuery extends ModelCriteria * $query->filterBySerializedEffects('%fooValue%'); // WHERE serialized_effects LIKE '%fooValue%' * * - * @param string $serializedEffects The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedEffects The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -421,12 +419,12 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByIsEnabled('yes'); // WHERE is_enabled = true * * - * @param boolean|string $isEnabled The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isEnabled The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -449,13 +447,13 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' * * - * @param mixed $expirationDate The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $expirationDate The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -492,11 +490,11 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByMaxUsage(array('min' => 12)); // WHERE max_usage > 12 * * - * @param mixed $maxUsage The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $maxUsage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -532,12 +530,12 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByIsCumulative('yes'); // WHERE is_cumulative = true * * - * @param boolean|string $isCumulative The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isCumulative The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -559,12 +557,12 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByIsRemovingPostage('yes'); // WHERE is_removing_postage = true * * - * @param boolean|string $isRemovingPostage The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isRemovingPostage The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -586,12 +584,12 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByIsAvailableOnSpecialOffers('yes'); // WHERE is_available_on_special_offers = true * * - * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -613,12 +611,12 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByIsUsed('yes'); // WHERE is_used = true * * - * @param boolean|string $isUsed The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isUsed The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -640,9 +638,9 @@ abstract class CouponQuery extends ModelCriteria * $query->filterBySerializedConditions('%fooValue%'); // WHERE serialized_conditions LIKE '%fooValue%' * * - * @param string $serializedConditions The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedConditions The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -670,13 +668,13 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -713,13 +711,13 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -756,11 +754,11 @@ abstract class CouponQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -790,8 +788,8 @@ abstract class CouponQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CouponI18n object * - * @param \Thelia\Model\CouponI18n|ObjectCollection $couponI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CouponI18n|ObjectCollection $couponI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -813,8 +811,8 @@ abstract class CouponQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CouponI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponQuery The current query, for fluid interface */ @@ -847,11 +845,11 @@ abstract class CouponQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CouponI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponI18nQuery A secondary query class using the current class as primary query */ public function useCouponI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -863,8 +861,8 @@ abstract class CouponQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CouponVersion object * - * @param \Thelia\Model\CouponVersion|ObjectCollection $couponVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CouponVersion|ObjectCollection $couponVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ @@ -886,8 +884,8 @@ abstract class CouponQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CouponVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponQuery The current query, for fluid interface */ @@ -920,11 +918,11 @@ abstract class CouponQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CouponVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponVersionQuery A secondary query class using the current class as primary query */ public function useCouponVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -936,7 +934,7 @@ abstract class CouponQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCoupon $coupon Object to remove from the list of results + * @param ChildCoupon $coupon Object to remove from the list of results * * @return ChildCouponQuery The current query, for fluid interface */ @@ -952,8 +950,8 @@ abstract class CouponQuery extends ModelCriteria /** * Deletes all rows from the coupon table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -984,13 +982,13 @@ abstract class CouponQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCoupon or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCoupon object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCoupon object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1010,7 +1008,6 @@ abstract class CouponQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CouponTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1029,9 +1026,9 @@ abstract class CouponQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1041,9 +1038,9 @@ abstract class CouponQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1053,7 +1050,7 @@ abstract class CouponQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1063,7 +1060,7 @@ abstract class CouponQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1073,7 +1070,7 @@ abstract class CouponQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1083,7 +1080,7 @@ abstract class CouponQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1095,11 +1092,11 @@ abstract class CouponQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1114,10 +1111,10 @@ abstract class CouponQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCouponQuery The current query, for fluid interface + * @return ChildCouponQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1134,11 +1131,11 @@ abstract class CouponQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCouponI18nQuery A secondary query class using the current class as primary query + * @return ChildCouponI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1154,7 +1151,7 @@ abstract class CouponQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1162,7 +1159,7 @@ abstract class CouponQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1170,7 +1167,7 @@ abstract class CouponQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index b890f3a2e..1ccca7d52 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -28,7 +28,6 @@ abstract class CouponVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CouponVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -381,9 +380,9 @@ abstract class CouponVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CouponVersion The current object, for fluid interface */ @@ -433,55 +432,50 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [type] column value. * - * @return string + * @return string */ public function getType() { - return $this->type; } /** * Get the [serialized_effects] column value. * - * @return string + * @return string */ public function getSerializedEffects() { - return $this->serialized_effects; } /** * Get the [is_enabled] column value. * - * @return boolean + * @return boolean */ public function getIsEnabled() { - return $this->is_enabled; } @@ -489,8 +483,8 @@ abstract class CouponVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [expiration_date] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -508,66 +502,60 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Get the [max_usage] column value. * - * @return int + * @return int */ public function getMaxUsage() { - return $this->max_usage; } /** * Get the [is_cumulative] column value. * - * @return boolean + * @return boolean */ public function getIsCumulative() { - return $this->is_cumulative; } /** * Get the [is_removing_postage] column value. * - * @return boolean + * @return boolean */ public function getIsRemovingPostage() { - return $this->is_removing_postage; } /** * Get the [is_available_on_special_offers] column value. * - * @return boolean + * @return boolean */ public function getIsAvailableOnSpecialOffers() { - return $this->is_available_on_special_offers; } /** * Get the [is_used] column value. * - * @return boolean + * @return boolean */ public function getIsUsed() { - return $this->is_used; } /** * Get the [serialized_conditions] column value. * - * @return string + * @return string */ public function getSerializedConditions() { - return $this->serialized_conditions; } @@ -575,8 +563,8 @@ abstract class CouponVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -595,8 +583,8 @@ abstract class CouponVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -614,19 +602,18 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setId($v) { @@ -643,15 +630,14 @@ abstract class CouponVersion implements ActiveRecordInterface $this->aCoupon = null; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setCode($v) { @@ -664,15 +650,14 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [type] column. * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setType($v) { @@ -685,15 +670,14 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::TYPE] = true; } - return $this; } // setType() /** * Set the value of [serialized_effects] column. * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setSerializedEffects($v) { @@ -706,7 +690,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::SERIALIZED_EFFECTS] = true; } - return $this; } // setSerializedEffects() @@ -717,8 +700,8 @@ abstract class CouponVersion implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setIsEnabled($v) { @@ -735,16 +718,15 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::IS_ENABLED] = true; } - return $this; } // setIsEnabled() /** * Sets the value of [expiration_date] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setExpirationDate($v) { @@ -756,15 +738,14 @@ abstract class CouponVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setExpirationDate() /** * Set the value of [max_usage] column. * - * @param int $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setMaxUsage($v) { @@ -777,7 +758,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::MAX_USAGE] = true; } - return $this; } // setMaxUsage() @@ -788,8 +768,8 @@ abstract class CouponVersion implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setIsCumulative($v) { @@ -806,7 +786,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::IS_CUMULATIVE] = true; } - return $this; } // setIsCumulative() @@ -817,8 +796,8 @@ abstract class CouponVersion implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setIsRemovingPostage($v) { @@ -835,7 +814,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::IS_REMOVING_POSTAGE] = true; } - return $this; } // setIsRemovingPostage() @@ -846,8 +824,8 @@ abstract class CouponVersion implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setIsAvailableOnSpecialOffers($v) { @@ -864,7 +842,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS] = true; } - return $this; } // setIsAvailableOnSpecialOffers() @@ -875,8 +852,8 @@ abstract class CouponVersion implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setIsUsed($v) { @@ -893,15 +870,14 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::IS_USED] = true; } - return $this; } // setIsUsed() /** * Set the value of [serialized_conditions] column. * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setSerializedConditions($v) { @@ -914,16 +890,15 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::SERIALIZED_CONDITIONS] = true; } - return $this; } // setSerializedConditions() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -935,16 +910,15 @@ abstract class CouponVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -956,15 +930,14 @@ abstract class CouponVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -977,7 +950,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->modifiedColumns[CouponVersionTableMap::VERSION] = true; } - return $this; } // setVersion() @@ -1021,7 +993,6 @@ abstract class CouponVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -1115,10 +1086,10 @@ abstract class CouponVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1154,7 +1125,7 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CouponVersion::setDeleted() @@ -1197,8 +1168,8 @@ abstract class CouponVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1248,8 +1219,8 @@ abstract class CouponVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1292,7 +1263,7 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1419,7 +1390,7 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1435,12 +1406,12 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1454,7 +1425,7 @@ abstract class CouponVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1517,12 +1488,12 @@ abstract class CouponVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1567,12 +1538,12 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1586,8 +1557,8 @@ abstract class CouponVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1654,8 +1625,8 @@ abstract class CouponVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1703,7 +1674,6 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::CREATED_AT)) $criteria->add(CouponVersionTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponVersionTableMap::UPDATED_AT)) $criteria->add(CouponVersionTableMap::UPDATED_AT, $this->updated_at); if ($this->isColumnModified(CouponVersionTableMap::VERSION)) $criteria->add(CouponVersionTableMap::VERSION, $this->version); - return $criteria; } @@ -1741,7 +1711,7 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1756,7 +1726,6 @@ abstract class CouponVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1766,9 +1735,9 @@ abstract class CouponVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CouponVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CouponVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1801,8 +1770,8 @@ abstract class CouponVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CouponVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CouponVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1818,8 +1787,8 @@ abstract class CouponVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildCoupon object. * - * @param ChildCoupon $v - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @param ChildCoupon $v + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) * @throws PropelException */ public function setCoupon(ChildCoupon $v = null) @@ -1838,16 +1807,14 @@ abstract class CouponVersion implements ActiveRecordInterface $v->addCouponVersion($this); } - return $this; } - /** * Get the associated ChildCoupon object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCoupon The associated ChildCoupon object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. * @throws PropelException */ public function getCoupon(ConnectionInterface $con = null) @@ -1901,7 +1868,7 @@ abstract class CouponVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CouponVersionQuery.php b/core/lib/Thelia/Model/Base/CouponVersionQuery.php index aee6708d8..2dfcba29c 100644 --- a/core/lib/Thelia/Model/Base/CouponVersionQuery.php +++ b/core/lib/Thelia/Model/Base/CouponVersionQuery.php @@ -103,9 +103,9 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CouponVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CouponVersion', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Returns a new ChildCouponVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCouponVersionQuery */ @@ -176,10 +176,10 @@ abstract class CouponVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCouponVersion A model object, or null if the key is not found + * @return ChildCouponVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -207,8 +207,8 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCouponVersion|array|mixed the result, formatted by the current formatter */ @@ -228,8 +228,8 @@ abstract class CouponVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -250,7 +250,7 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -265,7 +265,7 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -296,11 +296,11 @@ abstract class CouponVersionQuery extends ModelCriteria * * @see filterByCoupon() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -336,9 +336,9 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -365,9 +365,9 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $type The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $type The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -394,9 +394,9 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterBySerializedEffects('%fooValue%'); // WHERE serialized_effects LIKE '%fooValue%' * * - * @param string $serializedEffects The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedEffects The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -423,12 +423,12 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByIsEnabled('yes'); // WHERE is_enabled = true * * - * @param boolean|string $isEnabled The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isEnabled The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -451,13 +451,13 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' * * - * @param mixed $expirationDate The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $expirationDate The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -494,11 +494,11 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByMaxUsage(array('min' => 12)); // WHERE max_usage > 12 * * - * @param mixed $maxUsage The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $maxUsage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -534,12 +534,12 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByIsCumulative('yes'); // WHERE is_cumulative = true * * - * @param boolean|string $isCumulative The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isCumulative The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -561,12 +561,12 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByIsRemovingPostage('yes'); // WHERE is_removing_postage = true * * - * @param boolean|string $isRemovingPostage The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isRemovingPostage The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -588,12 +588,12 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByIsAvailableOnSpecialOffers('yes'); // WHERE is_available_on_special_offers = true * * - * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -615,12 +615,12 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByIsUsed('yes'); // WHERE is_used = true * * - * @param boolean|string $isUsed The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isUsed The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -642,9 +642,9 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterBySerializedConditions('%fooValue%'); // WHERE serialized_conditions LIKE '%fooValue%' * * - * @param string $serializedConditions The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedConditions The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -672,13 +672,13 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -715,13 +715,13 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -758,11 +758,11 @@ abstract class CouponVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -792,8 +792,8 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Coupon object * - * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -817,8 +817,8 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Coupon relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -851,11 +851,11 @@ abstract class CouponVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query */ public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -867,7 +867,7 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCouponVersion $couponVersion Object to remove from the list of results + * @param ChildCouponVersion $couponVersion Object to remove from the list of results * * @return ChildCouponVersionQuery The current query, for fluid interface */ @@ -885,8 +885,8 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Deletes all rows from the coupon_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -917,13 +917,13 @@ abstract class CouponVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCouponVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCouponVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCouponVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -943,7 +943,6 @@ abstract class CouponVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CouponVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php index b88ed9800..65694dc1a 100644 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -36,7 +36,6 @@ abstract class Currency implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CurrencyTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -390,9 +389,9 @@ abstract class Currency implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Currency The current object, for fluid interface */ @@ -442,66 +441,60 @@ abstract class Currency implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [symbol] column value. * - * @return string + * @return string */ public function getSymbol() { - return $this->symbol; } /** * Get the [rate] column value. * - * @return double + * @return double */ public function getRate() { - return $this->rate; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } /** * Get the [by_default] column value. * - * @return int + * @return int */ public function getByDefault() { - return $this->by_default; } @@ -509,8 +502,8 @@ abstract class Currency implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -529,8 +522,8 @@ abstract class Currency implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -548,8 +541,8 @@ abstract class Currency implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setId($v) { @@ -562,15 +555,14 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setCode($v) { @@ -583,15 +575,14 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [symbol] column. * - * @param string $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setSymbol($v) { @@ -604,15 +595,14 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::SYMBOL] = true; } - return $this; } // setSymbol() /** * Set the value of [rate] column. * - * @param double $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setRate($v) { @@ -625,15 +615,14 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::RATE] = true; } - return $this; } // setRate() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setPosition($v) { @@ -646,15 +635,14 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Set the value of [by_default] column. * - * @param int $v new value - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setByDefault($v) { @@ -667,16 +655,15 @@ abstract class Currency implements ActiveRecordInterface $this->modifiedColumns[CurrencyTableMap::BY_DEFAULT] = true; } - return $this; } // setByDefault() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -688,16 +675,15 @@ abstract class Currency implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -709,7 +695,6 @@ abstract class Currency implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -816,10 +801,10 @@ abstract class Currency implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -862,7 +847,7 @@ abstract class Currency implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Currency::setDeleted() @@ -905,8 +890,8 @@ abstract class Currency implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -967,8 +952,8 @@ abstract class Currency implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1067,7 +1052,7 @@ abstract class Currency implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1163,7 +1148,7 @@ abstract class Currency implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1179,12 +1164,12 @@ abstract class Currency implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1198,7 +1183,7 @@ abstract class Currency implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1240,12 +1225,12 @@ abstract class Currency implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1292,12 +1277,12 @@ abstract class Currency implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1311,8 +1296,8 @@ abstract class Currency implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1358,8 +1343,8 @@ abstract class Currency implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1393,7 +1378,6 @@ abstract class Currency implements ActiveRecordInterface if ($this->isColumnModified(CurrencyTableMap::BY_DEFAULT)) $criteria->add(CurrencyTableMap::BY_DEFAULT, $this->by_default); if ($this->isColumnModified(CurrencyTableMap::CREATED_AT)) $criteria->add(CurrencyTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CurrencyTableMap::UPDATED_AT)) $criteria->add(CurrencyTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1415,7 +1399,7 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1425,7 +1409,7 @@ abstract class Currency implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1439,7 +1423,6 @@ abstract class Currency implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1449,9 +1432,9 @@ abstract class Currency implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Currency (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Currency (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1509,8 +1492,8 @@ abstract class Currency implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Currency Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Currency Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1529,7 +1512,7 @@ abstract class Currency implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1577,8 +1560,8 @@ abstract class Currency implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1600,8 +1583,8 @@ abstract class Currency implements ActiveRecordInterface * If this ChildCurrency is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -1657,15 +1640,14 @@ abstract class Currency implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCurrency The current object (for fluent API support) + * @param Collection $orders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCurrency The current object (for fluent API support) */ public function setOrders(Collection $orders, ConnectionInterface $con = null) { $ordersToDelete = $this->getOrders(new Criteria(), $con)->diff($orders); - $this->ordersScheduledForDeletion = $ordersToDelete; foreach ($ordersToDelete as $orderRemoved) { @@ -1686,10 +1668,10 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1721,8 +1703,8 @@ abstract class Currency implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function addOrder(ChildOrder $l) { @@ -1748,7 +1730,7 @@ abstract class Currency implements ActiveRecordInterface } /** - * @param Order $order The order object to remove. + * @param Order $order The order object to remove. * @return ChildCurrency The current object (for fluent API support) */ public function removeOrder($order) @@ -1766,7 +1748,6 @@ abstract class Currency implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1778,9 +1759,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1791,7 +1772,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1803,9 +1783,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1816,7 +1796,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1828,9 +1807,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1841,7 +1820,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1853,9 +1831,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1866,7 +1844,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1878,9 +1855,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1891,7 +1868,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1903,9 +1879,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1916,7 +1892,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1928,9 +1903,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1970,8 +1945,8 @@ abstract class Currency implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1993,8 +1968,8 @@ abstract class Currency implements ActiveRecordInterface * If this ChildCurrency is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCart[] List of ChildCart objects * @throws PropelException */ @@ -2050,15 +2025,14 @@ abstract class Currency implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $carts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCurrency The current object (for fluent API support) + * @param Collection $carts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCurrency The current object (for fluent API support) */ public function setCarts(Collection $carts, ConnectionInterface $con = null) { $cartsToDelete = $this->getCarts(new Criteria(), $con)->diff($carts); - $this->cartsScheduledForDeletion = $cartsToDelete; foreach ($cartsToDelete as $cartRemoved) { @@ -2079,10 +2053,10 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the number of related Cart objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Cart objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Cart objects. * @throws PropelException */ public function countCarts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2114,8 +2088,8 @@ abstract class Currency implements ActiveRecordInterface * Method called to associate a ChildCart object to this object * through the ChildCart foreign key attribute. * - * @param ChildCart $l ChildCart - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param ChildCart $l ChildCart + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function addCart(ChildCart $l) { @@ -2141,7 +2115,7 @@ abstract class Currency implements ActiveRecordInterface } /** - * @param Cart $cart The cart object to remove. + * @param Cart $cart The cart object to remove. * @return ChildCurrency The current object (for fluent API support) */ public function removeCart($cart) @@ -2159,7 +2133,6 @@ abstract class Currency implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2171,9 +2144,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2184,7 +2157,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getCarts($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2196,9 +2168,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinAddressRelatedByAddressDeliveryId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2209,7 +2181,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getCarts($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2221,9 +2192,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinAddressRelatedByAddressInvoiceId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2263,8 +2234,8 @@ abstract class Currency implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2286,8 +2257,8 @@ abstract class Currency implements ActiveRecordInterface * If this ChildCurrency is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductPrice[] List of ChildProductPrice objects * @throws PropelException */ @@ -2343,15 +2314,14 @@ abstract class Currency implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productPrices A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCurrency The current object (for fluent API support) + * @param Collection $productPrices A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCurrency The current object (for fluent API support) */ public function setProductPrices(Collection $productPrices, ConnectionInterface $con = null) { $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2375,10 +2345,10 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the number of related ProductPrice objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductPrice objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductPrice objects. * @throws PropelException */ public function countProductPrices(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2410,8 +2380,8 @@ abstract class Currency implements ActiveRecordInterface * Method called to associate a ChildProductPrice object to this object * through the ChildProductPrice foreign key attribute. * - * @param ChildProductPrice $l ChildProductPrice - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param ChildProductPrice $l ChildProductPrice + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function addProductPrice(ChildProductPrice $l) { @@ -2437,7 +2407,7 @@ abstract class Currency implements ActiveRecordInterface } /** - * @param ProductPrice $productPrice The productPrice object to remove. + * @param ProductPrice $productPrice The productPrice object to remove. * @return ChildCurrency The current object (for fluent API support) */ public function removeProductPrice($productPrice) @@ -2455,7 +2425,6 @@ abstract class Currency implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2467,9 +2436,9 @@ abstract class Currency implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Currency. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductPrice[] List of ChildProductPrice objects */ public function getProductPricesJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2509,8 +2478,8 @@ abstract class Currency implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2532,8 +2501,8 @@ abstract class Currency implements ActiveRecordInterface * If this ChildCurrency is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCurrencyI18n[] List of ChildCurrencyI18n objects * @throws PropelException */ @@ -2589,15 +2558,14 @@ abstract class Currency implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $currencyI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCurrency The current object (for fluent API support) + * @param Collection $currencyI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCurrency The current object (for fluent API support) */ public function setCurrencyI18ns(Collection $currencyI18ns, ConnectionInterface $con = null) { $currencyI18nsToDelete = $this->getCurrencyI18ns(new Criteria(), $con)->diff($currencyI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2621,10 +2589,10 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the number of related CurrencyI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CurrencyI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CurrencyI18n objects. * @throws PropelException */ public function countCurrencyI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2656,8 +2624,8 @@ abstract class Currency implements ActiveRecordInterface * Method called to associate a ChildCurrencyI18n object to this object * through the ChildCurrencyI18n foreign key attribute. * - * @param ChildCurrencyI18n $l ChildCurrencyI18n - * @return \Thelia\Model\Currency The current object (for fluent API support) + * @param ChildCurrencyI18n $l ChildCurrencyI18n + * @return \Thelia\Model\Currency The current object (for fluent API support) */ public function addCurrencyI18n(ChildCurrencyI18n $l) { @@ -2687,7 +2655,7 @@ abstract class Currency implements ActiveRecordInterface } /** - * @param CurrencyI18n $currencyI18n The currencyI18n object to remove. + * @param CurrencyI18n $currencyI18n The currencyI18n object to remove. * @return ChildCurrency The current object (for fluent API support) */ public function removeCurrencyI18n($currencyI18n) @@ -2732,7 +2700,7 @@ abstract class Currency implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2784,7 +2752,7 @@ abstract class Currency implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCurrency The current object (for fluent API support) + * @return ChildCurrency The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2798,9 +2766,9 @@ abstract class Currency implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCurrency The current object (for fluent API support) + * @return ChildCurrency The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2812,7 +2780,7 @@ abstract class Currency implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2822,8 +2790,8 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCurrencyI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2856,10 +2824,10 @@ abstract class Currency implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCurrency The current object (for fluent API support) + * @return ChildCurrency The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2884,7 +2852,7 @@ abstract class Currency implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCurrencyI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2892,7 +2860,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [name] column value. * @@ -2903,7 +2870,6 @@ abstract class Currency implements ActiveRecordInterface return $this->getCurrentTranslation()->getName(); } - /** * Set the value of [name] column. * @@ -2992,7 +2958,6 @@ abstract class Currency implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php index 9bde742ca..3d5e8dab8 100644 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -26,7 +26,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CurrencyI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -307,9 +306,9 @@ abstract class CurrencyI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CurrencyI18n The current object, for fluid interface */ @@ -359,41 +358,38 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) */ public function setId($v) { @@ -410,15 +406,14 @@ abstract class CurrencyI18n implements ActiveRecordInterface $this->aCurrency = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -431,15 +426,14 @@ abstract class CurrencyI18n implements ActiveRecordInterface $this->modifiedColumns[CurrencyI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) */ public function setName($v) { @@ -452,7 +446,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface $this->modifiedColumns[CurrencyI18nTableMap::NAME] = true; } - return $this; } // setName() @@ -496,7 +489,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CurrencyI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -545,10 +537,10 @@ abstract class CurrencyI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -584,7 +576,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CurrencyI18n::setDeleted() @@ -627,8 +619,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -678,8 +670,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -722,7 +714,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -777,7 +769,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -793,12 +785,12 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -812,7 +804,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -839,12 +831,12 @@ abstract class CurrencyI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -877,12 +869,12 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -896,8 +888,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -928,8 +920,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -953,7 +945,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface if ($this->isColumnModified(CurrencyI18nTableMap::ID)) $criteria->add(CurrencyI18nTableMap::ID, $this->id); if ($this->isColumnModified(CurrencyI18nTableMap::LOCALE)) $criteria->add(CurrencyI18nTableMap::LOCALE, $this->locale); if ($this->isColumnModified(CurrencyI18nTableMap::NAME)) $criteria->add(CurrencyI18nTableMap::NAME, $this->name); - return $criteria; } @@ -991,7 +982,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1006,7 +997,6 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1016,9 +1006,9 @@ abstract class CurrencyI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CurrencyI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CurrencyI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1039,8 +1029,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CurrencyI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CurrencyI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1056,8 +1046,8 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCurrency object. * - * @param ChildCurrency $v - * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) + * @param ChildCurrency $v + * @return \Thelia\Model\CurrencyI18n The current object (for fluent API support) * @throws PropelException */ public function setCurrency(ChildCurrency $v = null) @@ -1076,16 +1066,14 @@ abstract class CurrencyI18n implements ActiveRecordInterface $v->addCurrencyI18n($this); } - return $this; } - /** * Get the associated ChildCurrency object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCurrency The associated ChildCurrency object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCurrency The associated ChildCurrency object. * @throws PropelException */ public function getCurrency(ConnectionInterface $con = null) @@ -1127,7 +1115,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php b/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php index 65019d642..5ac946523 100644 --- a/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php @@ -55,9 +55,9 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CurrencyI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CurrencyI18n', $modelAlias = null) { @@ -67,8 +67,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Returns a new ChildCurrencyI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCurrencyI18nQuery */ @@ -128,10 +128,10 @@ abstract class CurrencyI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCurrencyI18n A model object, or null if the key is not found + * @return ChildCurrencyI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -159,8 +159,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCurrencyI18n|array|mixed the result, formatted by the current formatter */ @@ -180,8 +180,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -202,7 +202,7 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -217,7 +217,7 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -248,11 +248,11 @@ abstract class CurrencyI18nQuery extends ModelCriteria * * @see filterByCurrency() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -288,9 +288,9 @@ abstract class CurrencyI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -317,9 +317,9 @@ abstract class CurrencyI18nQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -340,8 +340,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Currency object * - * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -365,8 +365,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Currency relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -399,11 +399,11 @@ abstract class CurrencyI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query */ public function useCurrencyQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -415,7 +415,7 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCurrencyI18n $currencyI18n Object to remove from the list of results + * @param ChildCurrencyI18n $currencyI18n Object to remove from the list of results * * @return ChildCurrencyI18nQuery The current query, for fluid interface */ @@ -433,8 +433,8 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Deletes all rows from the currency_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -465,13 +465,13 @@ abstract class CurrencyI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCurrencyI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCurrencyI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCurrencyI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -491,7 +491,6 @@ abstract class CurrencyI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CurrencyI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php index c6382efba..9719106ac 100644 --- a/core/lib/Thelia/Model/Base/CurrencyQuery.php +++ b/core/lib/Thelia/Model/Base/CurrencyQuery.php @@ -88,9 +88,9 @@ abstract class CurrencyQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CurrencyQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Currency', $modelAlias = null) { @@ -100,8 +100,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Returns a new ChildCurrencyQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCurrencyQuery */ @@ -130,7 +130,7 @@ abstract class CurrencyQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCurrency|array|mixed the result, formatted by the current formatter @@ -161,10 +161,10 @@ abstract class CurrencyQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCurrency A model object, or null if the key is not found + * @return ChildCurrency A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -191,8 +191,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCurrency|array|mixed the result, formatted by the current formatter */ @@ -212,8 +212,8 @@ abstract class CurrencyQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -234,26 +234,24 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCurrencyQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CurrencyTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCurrencyQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CurrencyTableMap::ID, $keys, Criteria::IN); } @@ -267,11 +265,11 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -307,9 +305,9 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -336,9 +334,9 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterBySymbol('%fooValue%'); // WHERE symbol LIKE '%fooValue%' * * - * @param string $symbol The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $symbol The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -366,11 +364,11 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByRate(array('min' => 12)); // WHERE rate > 12 * * - * @param mixed $rate The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $rate The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -407,11 +405,11 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -448,11 +446,11 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByByDefault(array('min' => 12)); // WHERE by_default > 12 * * - * @param mixed $byDefault The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $byDefault The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -489,13 +487,13 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -532,13 +530,13 @@ abstract class CurrencyQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -568,8 +566,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -591,8 +589,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -625,11 +623,11 @@ abstract class CurrencyQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -641,8 +639,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Cart object * - * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -664,8 +662,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Cart relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -698,11 +696,11 @@ abstract class CurrencyQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query */ public function useCartQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -714,8 +712,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductPrice object * - * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -737,8 +735,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductPrice relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -771,11 +769,11 @@ abstract class CurrencyQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query */ public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -787,8 +785,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CurrencyI18n object * - * @param \Thelia\Model\CurrencyI18n|ObjectCollection $currencyI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CurrencyI18n|ObjectCollection $currencyI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -810,8 +808,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CurrencyI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -844,11 +842,11 @@ abstract class CurrencyQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CurrencyI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CurrencyI18nQuery A secondary query class using the current class as primary query */ public function useCurrencyI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -860,7 +858,7 @@ abstract class CurrencyQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCurrency $currency Object to remove from the list of results + * @param ChildCurrency $currency Object to remove from the list of results * * @return ChildCurrencyQuery The current query, for fluid interface */ @@ -876,8 +874,8 @@ abstract class CurrencyQuery extends ModelCriteria /** * Deletes all rows from the currency table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -908,13 +906,13 @@ abstract class CurrencyQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCurrency or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCurrency object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCurrency object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -934,7 +932,6 @@ abstract class CurrencyQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CurrencyTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -953,9 +950,9 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -965,9 +962,9 @@ abstract class CurrencyQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -977,7 +974,7 @@ abstract class CurrencyQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -987,7 +984,7 @@ abstract class CurrencyQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -997,7 +994,7 @@ abstract class CurrencyQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1007,7 +1004,7 @@ abstract class CurrencyQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1019,11 +1016,11 @@ abstract class CurrencyQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1038,10 +1035,10 @@ abstract class CurrencyQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCurrencyQuery The current query, for fluid interface + * @return ChildCurrencyQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1058,11 +1055,11 @@ abstract class CurrencyQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCurrencyI18nQuery A secondary query class using the current class as primary query + * @return ChildCurrencyI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php index e0450b746..1c22f6622 100644 --- a/core/lib/Thelia/Model/Base/Customer.php +++ b/core/lib/Thelia/Model/Base/Customer.php @@ -36,7 +36,6 @@ abstract class Customer implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CustomerTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -417,9 +416,9 @@ abstract class Customer implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Customer The current object, for fluid interface */ @@ -469,154 +468,140 @@ abstract class Customer implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [ref] column value. * - * @return string + * @return string */ public function getRef() { - return $this->ref; } /** * Get the [title_id] column value. * - * @return int + * @return int */ public function getTitleId() { - return $this->title_id; } /** * Get the [firstname] column value. * - * @return string + * @return string */ public function getFirstname() { - return $this->firstname; } /** * Get the [lastname] column value. * - * @return string + * @return string */ public function getLastname() { - return $this->lastname; } /** * Get the [email] column value. * - * @return string + * @return string */ public function getEmail() { - return $this->email; } /** * Get the [password] column value. * - * @return string + * @return string */ public function getPassword() { - return $this->password; } /** * Get the [algo] column value. * - * @return string + * @return string */ public function getAlgo() { - return $this->algo; } /** * Get the [reseller] column value. * - * @return int + * @return int */ public function getReseller() { - return $this->reseller; } /** * Get the [lang] column value. * - * @return string + * @return string */ public function getLang() { - return $this->lang; } /** * Get the [sponsor] column value. * - * @return string + * @return string */ public function getSponsor() { - return $this->sponsor; } /** * Get the [discount] column value. * - * @return double + * @return double */ public function getDiscount() { - return $this->discount; } /** * Get the [remember_me_token] column value. * - * @return string + * @return string */ public function getRememberMeToken() { - return $this->remember_me_token; } /** * Get the [remember_me_serial] column value. * - * @return string + * @return string */ public function getRememberMeSerial() { - return $this->remember_me_serial; } @@ -624,8 +609,8 @@ abstract class Customer implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -644,8 +629,8 @@ abstract class Customer implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -663,8 +648,8 @@ abstract class Customer implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setId($v) { @@ -677,15 +662,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [ref] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setRef($v) { @@ -698,15 +682,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::REF] = true; } - return $this; } // setRef() /** * Set the value of [title_id] column. * - * @param int $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setTitleId($v) { @@ -723,15 +706,14 @@ abstract class Customer implements ActiveRecordInterface $this->aCustomerTitle = null; } - return $this; } // setTitleId() /** * Set the value of [firstname] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setFirstname($v) { @@ -744,15 +726,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::FIRSTNAME] = true; } - return $this; } // setFirstname() /** * Set the value of [lastname] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setLastname($v) { @@ -765,15 +746,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::LASTNAME] = true; } - return $this; } // setLastname() /** * Set the value of [email] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setEmail($v) { @@ -786,15 +766,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::EMAIL] = true; } - return $this; } // setEmail() /** * Set the value of [password] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setPassword($v) { @@ -807,15 +786,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::PASSWORD] = true; } - return $this; } // setPassword() /** * Set the value of [algo] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setAlgo($v) { @@ -828,15 +806,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::ALGO] = true; } - return $this; } // setAlgo() /** * Set the value of [reseller] column. * - * @param int $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setReseller($v) { @@ -849,15 +826,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::RESELLER] = true; } - return $this; } // setReseller() /** * Set the value of [lang] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setLang($v) { @@ -870,15 +846,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::LANG] = true; } - return $this; } // setLang() /** * Set the value of [sponsor] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setSponsor($v) { @@ -891,15 +866,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::SPONSOR] = true; } - return $this; } // setSponsor() /** * Set the value of [discount] column. * - * @param double $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setDiscount($v) { @@ -912,15 +886,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::DISCOUNT] = true; } - return $this; } // setDiscount() /** * Set the value of [remember_me_token] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setRememberMeToken($v) { @@ -933,15 +906,14 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::REMEMBER_ME_TOKEN] = true; } - return $this; } // setRememberMeToken() /** * Set the value of [remember_me_serial] column. * - * @param string $v new value - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setRememberMeSerial($v) { @@ -954,16 +926,15 @@ abstract class Customer implements ActiveRecordInterface $this->modifiedColumns[CustomerTableMap::REMEMBER_ME_SERIAL] = true; } - return $this; } // setRememberMeSerial() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -975,16 +946,15 @@ abstract class Customer implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -996,7 +966,6 @@ abstract class Customer implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1130,10 +1099,10 @@ abstract class Customer implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1175,7 +1144,7 @@ abstract class Customer implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Customer::setDeleted() @@ -1218,8 +1187,8 @@ abstract class Customer implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1280,8 +1249,8 @@ abstract class Customer implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1375,7 +1344,7 @@ abstract class Customer implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1519,7 +1488,7 @@ abstract class Customer implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1535,12 +1504,12 @@ abstract class Customer implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1554,7 +1523,7 @@ abstract class Customer implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1620,12 +1589,12 @@ abstract class Customer implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1680,12 +1649,12 @@ abstract class Customer implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1699,8 +1668,8 @@ abstract class Customer implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1770,8 +1739,8 @@ abstract class Customer implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1821,7 +1790,6 @@ abstract class Customer implements ActiveRecordInterface if ($this->isColumnModified(CustomerTableMap::REMEMBER_ME_SERIAL)) $criteria->add(CustomerTableMap::REMEMBER_ME_SERIAL, $this->remember_me_serial); if ($this->isColumnModified(CustomerTableMap::CREATED_AT)) $criteria->add(CustomerTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CustomerTableMap::UPDATED_AT)) $criteria->add(CustomerTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1843,7 +1811,7 @@ abstract class Customer implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1853,7 +1821,7 @@ abstract class Customer implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1867,7 +1835,6 @@ abstract class Customer implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1877,9 +1844,9 @@ abstract class Customer implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Customer (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Customer (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1939,8 +1906,8 @@ abstract class Customer implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Customer Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Customer Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1956,8 +1923,8 @@ abstract class Customer implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomerTitle object. * - * @param ChildCustomerTitle $v - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param ChildCustomerTitle $v + * @return \Thelia\Model\Customer The current object (for fluent API support) * @throws PropelException */ public function setCustomerTitle(ChildCustomerTitle $v = null) @@ -1976,16 +1943,14 @@ abstract class Customer implements ActiveRecordInterface $v->addCustomer($this); } - return $this; } - /** * Get the associated ChildCustomerTitle object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomerTitle The associated ChildCustomerTitle object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomerTitle The associated ChildCustomerTitle object. * @throws PropelException */ public function getCustomerTitle(ConnectionInterface $con = null) @@ -2004,13 +1969,12 @@ abstract class Customer implements ActiveRecordInterface return $this->aCustomerTitle; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -2055,8 +2019,8 @@ abstract class Customer implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2078,8 +2042,8 @@ abstract class Customer implements ActiveRecordInterface * If this ChildCustomer is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAddress[] List of ChildAddress objects * @throws PropelException */ @@ -2135,9 +2099,9 @@ abstract class Customer implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $addresses A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomer The current object (for fluent API support) + * @param Collection $addresses A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomer The current object (for fluent API support) */ public function setAddresses(Collection $addresses, ConnectionInterface $con = null) { @@ -2164,10 +2128,10 @@ abstract class Customer implements ActiveRecordInterface /** * Returns the number of related Address objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Address objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Address objects. * @throws PropelException */ public function countAddresses(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2199,8 +2163,8 @@ abstract class Customer implements ActiveRecordInterface * Method called to associate a ChildAddress object to this object * through the ChildAddress foreign key attribute. * - * @param ChildAddress $l ChildAddress - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param ChildAddress $l ChildAddress + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function addAddress(ChildAddress $l) { @@ -2226,7 +2190,7 @@ abstract class Customer implements ActiveRecordInterface } /** - * @param Address $address The address object to remove. + * @param Address $address The address object to remove. * @return ChildCustomer The current object (for fluent API support) */ public function removeAddress($address) @@ -2256,9 +2220,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCustomerTitle($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2281,9 +2245,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCountry($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2323,8 +2287,8 @@ abstract class Customer implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2346,8 +2310,8 @@ abstract class Customer implements ActiveRecordInterface * If this ChildCustomer is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -2403,9 +2367,9 @@ abstract class Customer implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomer The current object (for fluent API support) + * @param Collection $orders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomer The current object (for fluent API support) */ public function setOrders(Collection $orders, ConnectionInterface $con = null) { @@ -2432,10 +2396,10 @@ abstract class Customer implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2467,8 +2431,8 @@ abstract class Customer implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function addOrder(ChildOrder $l) { @@ -2494,7 +2458,7 @@ abstract class Customer implements ActiveRecordInterface } /** - * @param Order $order The order object to remove. + * @param Order $order The order object to remove. * @return ChildCustomer The current object (for fluent API support) */ public function removeOrder($order) @@ -2524,9 +2488,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2549,9 +2513,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2574,9 +2538,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2599,9 +2563,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2624,9 +2588,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2649,9 +2613,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2674,9 +2638,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2716,8 +2680,8 @@ abstract class Customer implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2739,8 +2703,8 @@ abstract class Customer implements ActiveRecordInterface * If this ChildCustomer is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCart[] List of ChildCart objects * @throws PropelException */ @@ -2796,9 +2760,9 @@ abstract class Customer implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $carts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomer The current object (for fluent API support) + * @param Collection $carts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomer The current object (for fluent API support) */ public function setCarts(Collection $carts, ConnectionInterface $con = null) { @@ -2825,10 +2789,10 @@ abstract class Customer implements ActiveRecordInterface /** * Returns the number of related Cart objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Cart objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Cart objects. * @throws PropelException */ public function countCarts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2860,8 +2824,8 @@ abstract class Customer implements ActiveRecordInterface * Method called to associate a ChildCart object to this object * through the ChildCart foreign key attribute. * - * @param ChildCart $l ChildCart - * @return \Thelia\Model\Customer The current object (for fluent API support) + * @param ChildCart $l ChildCart + * @return \Thelia\Model\Customer The current object (for fluent API support) */ public function addCart(ChildCart $l) { @@ -2887,7 +2851,7 @@ abstract class Customer implements ActiveRecordInterface } /** - * @param Cart $cart The cart object to remove. + * @param Cart $cart The cart object to remove. * @return ChildCustomer The current object (for fluent API support) */ public function removeCart($cart) @@ -2917,9 +2881,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinAddressRelatedByAddressDeliveryId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2942,9 +2906,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinAddressRelatedByAddressInvoiceId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2967,9 +2931,9 @@ abstract class Customer implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Customer. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCart[] List of ChildCart objects */ public function getCartsJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -3015,7 +2979,7 @@ abstract class Customer implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3058,7 +3022,7 @@ abstract class Customer implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCustomer The current object (for fluent API support) + * @return ChildCustomer The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/CustomerQuery.php b/core/lib/Thelia/Model/Base/CustomerQuery.php index 28ccb557b..c1608bac6 100644 --- a/core/lib/Thelia/Model/Base/CustomerQuery.php +++ b/core/lib/Thelia/Model/Base/CustomerQuery.php @@ -119,9 +119,9 @@ abstract class CustomerQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CustomerQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Customer', $modelAlias = null) { @@ -131,8 +131,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Returns a new ChildCustomerQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCustomerQuery */ @@ -161,7 +161,7 @@ abstract class CustomerQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCustomer|array|mixed the result, formatted by the current formatter @@ -192,10 +192,10 @@ abstract class CustomerQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCustomer A model object, or null if the key is not found + * @return ChildCustomer A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -222,8 +222,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCustomer|array|mixed the result, formatted by the current formatter */ @@ -243,8 +243,8 @@ abstract class CustomerQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -265,26 +265,24 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCustomerQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CustomerTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCustomerQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CustomerTableMap::ID, $keys, Criteria::IN); } @@ -298,11 +296,11 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -338,9 +336,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%' * * - * @param string $ref The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $ref The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -370,11 +368,11 @@ abstract class CustomerQuery extends ModelCriteria * * @see filterByCustomerTitle() * - * @param mixed $titleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $titleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -410,9 +408,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%' * * - * @param string $firstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $firstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -439,9 +437,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%' * * - * @param string $lastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -468,9 +466,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByEmail('%fooValue%'); // WHERE email LIKE '%fooValue%' * * - * @param string $email The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $email The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -497,9 +495,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByPassword('%fooValue%'); // WHERE password LIKE '%fooValue%' * * - * @param string $password The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $password The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -526,9 +524,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByAlgo('%fooValue%'); // WHERE algo LIKE '%fooValue%' * * - * @param string $algo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $algo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByReseller(array('min' => 12)); // WHERE reseller > 12 * * - * @param mixed $reseller The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $reseller The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -596,9 +594,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByLang('%fooValue%'); // WHERE lang LIKE '%fooValue%' * * - * @param string $lang The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lang The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -625,9 +623,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterBySponsor('%fooValue%'); // WHERE sponsor LIKE '%fooValue%' * * - * @param string $sponsor The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $sponsor The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -655,11 +653,11 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByDiscount(array('min' => 12)); // WHERE discount > 12 * * - * @param mixed $discount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $discount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -695,9 +693,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByRememberMeToken('%fooValue%'); // WHERE remember_me_token LIKE '%fooValue%' * * - * @param string $rememberMeToken The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $rememberMeToken The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -724,9 +722,9 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByRememberMeSerial('%fooValue%'); // WHERE remember_me_serial LIKE '%fooValue%' * * - * @param string $rememberMeSerial The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $rememberMeSerial The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -754,13 +752,13 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -797,13 +795,13 @@ abstract class CustomerQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -834,7 +832,7 @@ abstract class CustomerQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\CustomerTitle object * * @param \Thelia\Model\CustomerTitle|ObjectCollection $customerTitle The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -858,8 +856,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CustomerTitle relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -892,11 +890,11 @@ abstract class CustomerQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query */ public function useCustomerTitleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -908,8 +906,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Address object * - * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -931,8 +929,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Address relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -965,11 +963,11 @@ abstract class CustomerQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query */ public function useAddressQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -981,8 +979,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -1004,8 +1002,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -1038,11 +1036,11 @@ abstract class CustomerQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1054,8 +1052,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Cart object * - * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Cart|ObjectCollection $cart the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -1077,8 +1075,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Cart relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -1111,11 +1109,11 @@ abstract class CustomerQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query */ public function useCartQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1127,7 +1125,7 @@ abstract class CustomerQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCustomer $customer Object to remove from the list of results + * @param ChildCustomer $customer Object to remove from the list of results * * @return ChildCustomerQuery The current query, for fluid interface */ @@ -1143,8 +1141,8 @@ abstract class CustomerQuery extends ModelCriteria /** * Deletes all rows from the customer table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1175,13 +1173,13 @@ abstract class CustomerQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCustomer or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCustomer object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCustomer object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1201,7 +1199,6 @@ abstract class CustomerQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CustomerTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1220,9 +1217,9 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1232,9 +1229,9 @@ abstract class CustomerQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1244,7 +1241,7 @@ abstract class CustomerQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1254,7 +1251,7 @@ abstract class CustomerQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1264,7 +1261,7 @@ abstract class CustomerQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1274,7 +1271,7 @@ abstract class CustomerQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCustomerQuery The current query, for fluid interface + * @return ChildCustomerQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php index 3d474c298..e8fac0779 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -34,7 +34,6 @@ abstract class CustomerTitle implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CustomerTitleTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -372,9 +371,9 @@ abstract class CustomerTitle implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CustomerTitle The current object, for fluid interface */ @@ -424,33 +423,30 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [by_default] column value. * - * @return int + * @return int */ public function getByDefault() { - return $this->by_default; } /** * Get the [position] column value. * - * @return string + * @return string */ public function getPosition() { - return $this->position; } @@ -458,8 +454,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -478,8 +474,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -497,8 +493,8 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function setId($v) { @@ -511,15 +507,14 @@ abstract class CustomerTitle implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [by_default] column. * - * @param int $v new value - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function setByDefault($v) { @@ -532,15 +527,14 @@ abstract class CustomerTitle implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleTableMap::BY_DEFAULT] = true; } - return $this; } // setByDefault() /** * Set the value of [position] column. * - * @param string $v new value - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function setPosition($v) { @@ -553,16 +547,15 @@ abstract class CustomerTitle implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -574,16 +567,15 @@ abstract class CustomerTitle implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -595,7 +587,6 @@ abstract class CustomerTitle implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -639,7 +630,6 @@ abstract class CustomerTitle implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CustomerTitleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -697,10 +687,10 @@ abstract class CustomerTitle implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -741,7 +731,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CustomerTitle::setDeleted() @@ -784,8 +774,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -846,8 +836,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -929,7 +919,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1007,7 +997,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1023,12 +1013,12 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1042,7 +1032,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1075,12 +1065,12 @@ abstract class CustomerTitle implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1121,12 +1111,12 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1140,8 +1130,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1178,8 +1168,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1207,7 +1197,6 @@ abstract class CustomerTitle implements ActiveRecordInterface if ($this->isColumnModified(CustomerTitleTableMap::POSITION)) $criteria->add(CustomerTitleTableMap::POSITION, $this->position); if ($this->isColumnModified(CustomerTitleTableMap::CREATED_AT)) $criteria->add(CustomerTitleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CustomerTitleTableMap::UPDATED_AT)) $criteria->add(CustomerTitleTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1229,7 +1218,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1239,7 +1228,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1253,7 +1242,6 @@ abstract class CustomerTitle implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1263,9 +1251,9 @@ abstract class CustomerTitle implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CustomerTitle (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CustomerTitle (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1314,8 +1302,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CustomerTitle Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CustomerTitle Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1334,7 +1322,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1379,8 +1367,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1402,8 +1390,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * If this ChildCustomerTitle is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCustomer[] List of ChildCustomer objects * @throws PropelException */ @@ -1459,15 +1447,14 @@ abstract class CustomerTitle implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $customers A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomerTitle The current object (for fluent API support) + * @param Collection $customers A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomerTitle The current object (for fluent API support) */ public function setCustomers(Collection $customers, ConnectionInterface $con = null) { $customersToDelete = $this->getCustomers(new Criteria(), $con)->diff($customers); - $this->customersScheduledForDeletion = $customersToDelete; foreach ($customersToDelete as $customerRemoved) { @@ -1488,10 +1475,10 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the number of related Customer objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Customer objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Customer objects. * @throws PropelException */ public function countCustomers(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1523,8 +1510,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Method called to associate a ChildCustomer object to this object * through the ChildCustomer foreign key attribute. * - * @param ChildCustomer $l ChildCustomer - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param ChildCustomer $l ChildCustomer + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function addCustomer(ChildCustomer $l) { @@ -1550,7 +1537,7 @@ abstract class CustomerTitle implements ActiveRecordInterface } /** - * @param Customer $customer The customer object to remove. + * @param Customer $customer The customer object to remove. * @return ChildCustomerTitle The current object (for fluent API support) */ public function removeCustomer($customer) @@ -1597,8 +1584,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1620,8 +1607,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * If this ChildCustomerTitle is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAddress[] List of ChildAddress objects * @throws PropelException */ @@ -1677,15 +1664,14 @@ abstract class CustomerTitle implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $addresses A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomerTitle The current object (for fluent API support) + * @param Collection $addresses A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomerTitle The current object (for fluent API support) */ public function setAddresses(Collection $addresses, ConnectionInterface $con = null) { $addressesToDelete = $this->getAddresses(new Criteria(), $con)->diff($addresses); - $this->addressesScheduledForDeletion = $addressesToDelete; foreach ($addressesToDelete as $addressRemoved) { @@ -1706,10 +1692,10 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the number of related Address objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Address objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Address objects. * @throws PropelException */ public function countAddresses(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1741,8 +1727,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Method called to associate a ChildAddress object to this object * through the ChildAddress foreign key attribute. * - * @param ChildAddress $l ChildAddress - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param ChildAddress $l ChildAddress + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function addAddress(ChildAddress $l) { @@ -1768,7 +1754,7 @@ abstract class CustomerTitle implements ActiveRecordInterface } /** - * @param Address $address The address object to remove. + * @param Address $address The address object to remove. * @return ChildCustomerTitle The current object (for fluent API support) */ public function removeAddress($address) @@ -1786,7 +1772,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1798,9 +1783,9 @@ abstract class CustomerTitle implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in CustomerTitle. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1811,7 +1796,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this->getAddresses($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1823,9 +1807,9 @@ abstract class CustomerTitle implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in CustomerTitle. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAddress[] List of ChildAddress objects */ public function getAddressesJoinCountry($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1865,8 +1849,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1888,8 +1872,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * If this ChildCustomerTitle is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCustomerTitleI18n[] List of ChildCustomerTitleI18n objects * @throws PropelException */ @@ -1945,15 +1929,14 @@ abstract class CustomerTitle implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $customerTitleI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCustomerTitle The current object (for fluent API support) + * @param Collection $customerTitleI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCustomerTitle The current object (for fluent API support) */ public function setCustomerTitleI18ns(Collection $customerTitleI18ns, ConnectionInterface $con = null) { $customerTitleI18nsToDelete = $this->getCustomerTitleI18ns(new Criteria(), $con)->diff($customerTitleI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1977,10 +1960,10 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the number of related CustomerTitleI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CustomerTitleI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CustomerTitleI18n objects. * @throws PropelException */ public function countCustomerTitleI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2012,8 +1995,8 @@ abstract class CustomerTitle implements ActiveRecordInterface * Method called to associate a ChildCustomerTitleI18n object to this object * through the ChildCustomerTitleI18n foreign key attribute. * - * @param ChildCustomerTitleI18n $l ChildCustomerTitleI18n - * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) + * @param ChildCustomerTitleI18n $l ChildCustomerTitleI18n + * @return \Thelia\Model\CustomerTitle The current object (for fluent API support) */ public function addCustomerTitleI18n(ChildCustomerTitleI18n $l) { @@ -2043,7 +2026,7 @@ abstract class CustomerTitle implements ActiveRecordInterface } /** - * @param CustomerTitleI18n $customerTitleI18n The customerTitleI18n object to remove. + * @param CustomerTitleI18n $customerTitleI18n The customerTitleI18n object to remove. * @return ChildCustomerTitle The current object (for fluent API support) */ public function removeCustomerTitleI18n($customerTitleI18n) @@ -2086,7 +2069,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2132,7 +2115,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildCustomerTitle The current object (for fluent API support) + * @return ChildCustomerTitle The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2146,9 +2129,9 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildCustomerTitle The current object (for fluent API support) + * @return ChildCustomerTitle The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2160,7 +2143,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2170,8 +2153,8 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildCustomerTitleI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2204,10 +2187,10 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildCustomerTitle The current object (for fluent API support) + * @return ChildCustomerTitle The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2232,7 +2215,7 @@ abstract class CustomerTitle implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildCustomerTitleI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2240,7 +2223,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [short] column value. * @@ -2251,7 +2233,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this->getCurrentTranslation()->getShort(); } - /** * Set the value of [short] column. * @@ -2264,7 +2245,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this; } - /** * Get the [long] column value. * @@ -2275,7 +2255,6 @@ abstract class CustomerTitle implements ActiveRecordInterface return $this->getCurrentTranslation()->getLong(); } - /** * Set the value of [long] column. * @@ -2364,7 +2343,6 @@ abstract class CustomerTitle implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php index a0aafcba9..6234775cc 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -26,7 +26,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\CustomerTitleI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -313,9 +312,9 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return CustomerTitleI18n The current object, for fluid interface */ @@ -365,52 +364,48 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [short] column value. * - * @return string + * @return string */ public function getShort() { - return $this->short; } /** * Get the [long] column value. * - * @return string + * @return string */ public function getLong() { - return $this->long; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) */ public function setId($v) { @@ -427,15 +422,14 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $this->aCustomerTitle = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -448,15 +442,14 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [short] column. * - * @param string $v new value - * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) */ public function setShort($v) { @@ -469,15 +462,14 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleI18nTableMap::SHORT] = true; } - return $this; } // setShort() /** * Set the value of [long] column. * - * @param string $v new value - * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) */ public function setLong($v) { @@ -490,7 +482,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $this->modifiedColumns[CustomerTitleI18nTableMap::LONG] = true; } - return $this; } // setLong() @@ -534,7 +525,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CustomerTitleI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -586,10 +576,10 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -625,7 +615,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see CustomerTitleI18n::setDeleted() @@ -668,8 +658,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -719,8 +709,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -763,7 +753,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -824,7 +814,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -840,12 +830,12 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -859,7 +849,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -889,12 +879,12 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -928,12 +918,12 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -947,8 +937,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -982,8 +972,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1009,7 +999,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface if ($this->isColumnModified(CustomerTitleI18nTableMap::LOCALE)) $criteria->add(CustomerTitleI18nTableMap::LOCALE, $this->locale); if ($this->isColumnModified(CustomerTitleI18nTableMap::SHORT)) $criteria->add(CustomerTitleI18nTableMap::SHORT, $this->short); if ($this->isColumnModified(CustomerTitleI18nTableMap::LONG)) $criteria->add(CustomerTitleI18nTableMap::LONG, $this->long); - return $criteria; } @@ -1047,7 +1036,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1062,7 +1051,6 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1072,9 +1060,9 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\CustomerTitleI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\CustomerTitleI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1096,8 +1084,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CustomerTitleI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CustomerTitleI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1113,8 +1101,8 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomerTitle object. * - * @param ChildCustomerTitle $v - * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) + * @param ChildCustomerTitle $v + * @return \Thelia\Model\CustomerTitleI18n The current object (for fluent API support) * @throws PropelException */ public function setCustomerTitle(ChildCustomerTitle $v = null) @@ -1133,16 +1121,14 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface $v->addCustomerTitleI18n($this); } - return $this; } - /** * Get the associated ChildCustomerTitle object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomerTitle The associated ChildCustomerTitle object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomerTitle The associated ChildCustomerTitle object. * @throws PropelException */ public function getCustomerTitle(ConnectionInterface $con = null) @@ -1185,7 +1171,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php index 446d44b1f..da6ee383d 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php @@ -59,9 +59,9 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CustomerTitleI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CustomerTitleI18n', $modelAlias = null) { @@ -71,8 +71,8 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Returns a new ChildCustomerTitleI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCustomerTitleI18nQuery */ @@ -132,10 +132,10 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCustomerTitleI18n A model object, or null if the key is not found + * @return ChildCustomerTitleI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -163,8 +163,8 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCustomerTitleI18n|array|mixed the result, formatted by the current formatter */ @@ -184,8 +184,8 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -206,7 +206,7 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -221,7 +221,7 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -252,11 +252,11 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * * @see filterByCustomerTitle() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -292,9 +292,9 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -321,9 +321,9 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * $query->filterByShort('%fooValue%'); // WHERE short LIKE '%fooValue%' * * - * @param string $short The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $short The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -350,9 +350,9 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * $query->filterByLong('%fooValue%'); // WHERE long LIKE '%fooValue%' * * - * @param string $long The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $long The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -374,7 +374,7 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\CustomerTitle object * * @param \Thelia\Model\CustomerTitle|ObjectCollection $customerTitle The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -398,8 +398,8 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CustomerTitle relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -432,11 +432,11 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query */ public function useCustomerTitleQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -448,7 +448,7 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCustomerTitleI18n $customerTitleI18n Object to remove from the list of results + * @param ChildCustomerTitleI18n $customerTitleI18n Object to remove from the list of results * * @return ChildCustomerTitleI18nQuery The current query, for fluid interface */ @@ -466,8 +466,8 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Deletes all rows from the customer_title_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -498,13 +498,13 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCustomerTitleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCustomerTitleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCustomerTitleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -524,7 +524,6 @@ abstract class CustomerTitleI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CustomerTitleI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php index 62fa27684..93ac36a03 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php @@ -72,9 +72,9 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\CustomerTitleQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\CustomerTitle', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Returns a new ChildCustomerTitleQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildCustomerTitleQuery */ @@ -114,7 +114,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildCustomerTitle|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class CustomerTitleQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildCustomerTitle A model object, or null if the key is not found + * @return ChildCustomerTitle A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildCustomerTitle|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class CustomerTitleQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(CustomerTitleTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(CustomerTitleTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -292,11 +290,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * $query->filterByByDefault(array('min' => 12)); // WHERE by_default > 12 * * - * @param mixed $byDefault The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $byDefault The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -332,9 +330,9 @@ abstract class CustomerTitleQuery extends ModelCriteria * $query->filterByPosition('%fooValue%'); // WHERE position LIKE '%fooValue%' * * - * @param string $position The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $position The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -362,13 +360,13 @@ abstract class CustomerTitleQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class CustomerTitleQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -441,8 +439,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Customer object * - * @param \Thelia\Model\Customer|ObjectCollection $customer the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Customer|ObjectCollection $customer the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -464,8 +462,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Customer relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -498,11 +496,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query */ public function useCustomerQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -514,8 +512,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Address object * - * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Address|ObjectCollection $address the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -537,8 +535,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Address relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -571,11 +569,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AddressQuery A secondary query class using the current class as primary query */ public function useAddressQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -587,8 +585,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CustomerTitleI18n object * - * @param \Thelia\Model\CustomerTitleI18n|ObjectCollection $customerTitleI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CustomerTitleI18n|ObjectCollection $customerTitleI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -610,8 +608,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CustomerTitleI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -644,11 +642,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerTitleI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerTitleI18nQuery A secondary query class using the current class as primary query */ public function useCustomerTitleI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -660,7 +658,7 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildCustomerTitle $customerTitle Object to remove from the list of results + * @param ChildCustomerTitle $customerTitle Object to remove from the list of results * * @return ChildCustomerTitleQuery The current query, for fluid interface */ @@ -676,8 +674,8 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Deletes all rows from the customer_title table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -708,13 +706,13 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildCustomerTitle or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildCustomerTitle object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildCustomerTitle object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -734,7 +732,6 @@ abstract class CustomerTitleQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - CustomerTitleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -753,9 +750,9 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -765,9 +762,9 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -777,7 +774,7 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -787,7 +784,7 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -797,7 +794,7 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -807,7 +804,7 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -819,11 +816,11 @@ abstract class CustomerTitleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -838,10 +835,10 @@ abstract class CustomerTitleQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCustomerTitleQuery The current query, for fluid interface + * @return ChildCustomerTitleQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -858,11 +855,11 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildCustomerTitleI18nQuery A secondary query class using the current class as primary query + * @return ChildCustomerTitleI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php index c44ab606e..1fd61eb13 100644 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -38,7 +38,6 @@ abstract class Feature implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -399,9 +398,9 @@ abstract class Feature implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Feature The current object, for fluid interface */ @@ -451,33 +450,30 @@ abstract class Feature implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -485,8 +481,8 @@ abstract class Feature implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -505,8 +501,8 @@ abstract class Feature implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -524,8 +520,8 @@ abstract class Feature implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function setId($v) { @@ -538,15 +534,14 @@ abstract class Feature implements ActiveRecordInterface $this->modifiedColumns[FeatureTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function setVisible($v) { @@ -559,15 +554,14 @@ abstract class Feature implements ActiveRecordInterface $this->modifiedColumns[FeatureTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function setPosition($v) { @@ -580,16 +574,15 @@ abstract class Feature implements ActiveRecordInterface $this->modifiedColumns[FeatureTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -601,16 +594,15 @@ abstract class Feature implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -622,7 +614,6 @@ abstract class Feature implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -666,7 +657,6 @@ abstract class Feature implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FeatureTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -724,10 +714,10 @@ abstract class Feature implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -771,7 +761,7 @@ abstract class Feature implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Feature::setDeleted() @@ -814,8 +804,8 @@ abstract class Feature implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -876,8 +866,8 @@ abstract class Feature implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1003,7 +993,7 @@ abstract class Feature implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1081,7 +1071,7 @@ abstract class Feature implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1097,12 +1087,12 @@ abstract class Feature implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1116,7 +1106,7 @@ abstract class Feature implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1149,12 +1139,12 @@ abstract class Feature implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1198,12 +1188,12 @@ abstract class Feature implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1217,8 +1207,8 @@ abstract class Feature implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1255,8 +1245,8 @@ abstract class Feature implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1284,7 +1274,6 @@ abstract class Feature implements ActiveRecordInterface if ($this->isColumnModified(FeatureTableMap::POSITION)) $criteria->add(FeatureTableMap::POSITION, $this->position); if ($this->isColumnModified(FeatureTableMap::CREATED_AT)) $criteria->add(FeatureTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FeatureTableMap::UPDATED_AT)) $criteria->add(FeatureTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1306,7 +1295,7 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1316,7 +1305,7 @@ abstract class Feature implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1330,7 +1319,6 @@ abstract class Feature implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1340,9 +1328,9 @@ abstract class Feature implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Feature (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Feature (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1397,8 +1385,8 @@ abstract class Feature implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Feature Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Feature Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1411,13 +1399,12 @@ abstract class Feature implements ActiveRecordInterface return $copyObj; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1465,8 +1452,8 @@ abstract class Feature implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1488,8 +1475,8 @@ abstract class Feature implements ActiveRecordInterface * If this ChildFeature is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureAv[] List of ChildFeatureAv objects * @throws PropelException */ @@ -1545,9 +1532,9 @@ abstract class Feature implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureAvs A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeature The current object (for fluent API support) + * @param Collection $featureAvs A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeature The current object (for fluent API support) */ public function setFeatureAvs(Collection $featureAvs, ConnectionInterface $con = null) { @@ -1574,10 +1561,10 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the number of related FeatureAv objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureAv objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureAv objects. * @throws PropelException */ public function countFeatureAvs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1609,8 +1596,8 @@ abstract class Feature implements ActiveRecordInterface * Method called to associate a ChildFeatureAv object to this object * through the ChildFeatureAv foreign key attribute. * - * @param ChildFeatureAv $l ChildFeatureAv - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param ChildFeatureAv $l ChildFeatureAv + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function addFeatureAv(ChildFeatureAv $l) { @@ -1636,7 +1623,7 @@ abstract class Feature implements ActiveRecordInterface } /** - * @param FeatureAv $featureAv The featureAv object to remove. + * @param FeatureAv $featureAv The featureAv object to remove. * @return ChildFeature The current object (for fluent API support) */ public function removeFeatureAv($featureAv) @@ -1683,8 +1670,8 @@ abstract class Feature implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1706,8 +1693,8 @@ abstract class Feature implements ActiveRecordInterface * If this ChildFeature is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects * @throws PropelException */ @@ -1763,9 +1750,9 @@ abstract class Feature implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureProducts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeature The current object (for fluent API support) + * @param Collection $featureProducts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeature The current object (for fluent API support) */ public function setFeatureProducts(Collection $featureProducts, ConnectionInterface $con = null) { @@ -1792,10 +1779,10 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the number of related FeatureProduct objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureProduct objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureProduct objects. * @throws PropelException */ public function countFeatureProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1827,8 +1814,8 @@ abstract class Feature implements ActiveRecordInterface * Method called to associate a ChildFeatureProduct object to this object * through the ChildFeatureProduct foreign key attribute. * - * @param ChildFeatureProduct $l ChildFeatureProduct - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param ChildFeatureProduct $l ChildFeatureProduct + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function addFeatureProduct(ChildFeatureProduct $l) { @@ -1855,7 +1842,7 @@ abstract class Feature implements ActiveRecordInterface /** * @param FeatureProduct $featureProduct The featureProduct object to remove. - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function removeFeatureProduct($featureProduct) { @@ -1884,9 +1871,9 @@ abstract class Feature implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Feature. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1909,9 +1896,9 @@ abstract class Feature implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Feature. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinFeatureAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1951,8 +1938,8 @@ abstract class Feature implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1974,8 +1961,8 @@ abstract class Feature implements ActiveRecordInterface * If this ChildFeature is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureTemplate[] List of ChildFeatureTemplate objects * @throws PropelException */ @@ -2031,9 +2018,9 @@ abstract class Feature implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureTemplates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeature The current object (for fluent API support) + * @param Collection $featureTemplates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeature The current object (for fluent API support) */ public function setFeatureTemplates(Collection $featureTemplates, ConnectionInterface $con = null) { @@ -2060,10 +2047,10 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the number of related FeatureTemplate objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureTemplate objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureTemplate objects. * @throws PropelException */ public function countFeatureTemplates(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2095,8 +2082,8 @@ abstract class Feature implements ActiveRecordInterface * Method called to associate a ChildFeatureTemplate object to this object * through the ChildFeatureTemplate foreign key attribute. * - * @param ChildFeatureTemplate $l ChildFeatureTemplate - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param ChildFeatureTemplate $l ChildFeatureTemplate + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function addFeatureTemplate(ChildFeatureTemplate $l) { @@ -2123,7 +2110,7 @@ abstract class Feature implements ActiveRecordInterface /** * @param FeatureTemplate $featureTemplate The featureTemplate object to remove. - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function removeFeatureTemplate($featureTemplate) { @@ -2152,9 +2139,9 @@ abstract class Feature implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Feature. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureTemplate[] List of ChildFeatureTemplate objects */ public function getFeatureTemplatesJoinTemplate($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2194,8 +2181,8 @@ abstract class Feature implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2217,8 +2204,8 @@ abstract class Feature implements ActiveRecordInterface * If this ChildFeature is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureI18n[] List of ChildFeatureI18n objects * @throws PropelException */ @@ -2274,9 +2261,9 @@ abstract class Feature implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeature The current object (for fluent API support) + * @param Collection $featureI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeature The current object (for fluent API support) */ public function setFeatureI18ns(Collection $featureI18ns, ConnectionInterface $con = null) { @@ -2306,10 +2293,10 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the number of related FeatureI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureI18n objects. * @throws PropelException */ public function countFeatureI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2341,8 +2328,8 @@ abstract class Feature implements ActiveRecordInterface * Method called to associate a ChildFeatureI18n object to this object * through the ChildFeatureI18n foreign key attribute. * - * @param ChildFeatureI18n $l ChildFeatureI18n - * @return \Thelia\Model\Feature The current object (for fluent API support) + * @param ChildFeatureI18n $l ChildFeatureI18n + * @return \Thelia\Model\Feature The current object (for fluent API support) */ public function addFeatureI18n(ChildFeatureI18n $l) { @@ -2372,7 +2359,7 @@ abstract class Feature implements ActiveRecordInterface } /** - * @param FeatureI18n $featureI18n The featureI18n object to remove. + * @param FeatureI18n $featureI18n The featureI18n object to remove. * @return ChildFeature The current object (for fluent API support) */ public function removeFeatureI18n($featureI18n) @@ -2430,8 +2417,8 @@ abstract class Feature implements ActiveRecordInterface * If this ChildFeature is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildTemplate[] List of ChildTemplate objects */ @@ -2461,9 +2448,9 @@ abstract class Feature implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $templates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeature The current object (for fluent API support) + * @param Collection $templates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeature The current object (for fluent API support) */ public function setTemplates(Collection $templates, ConnectionInterface $con = null) { @@ -2487,9 +2474,9 @@ abstract class Feature implements ActiveRecordInterface * Gets the number of ChildTemplate objects related by a many-to-many relationship * to the current object by way of the feature_template cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildTemplate objects */ @@ -2518,7 +2505,7 @@ abstract class Feature implements ActiveRecordInterface * through the feature_template cross reference table. * * @param ChildTemplate $template The ChildFeatureTemplate object to relate - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function addTemplate(ChildTemplate $template) { @@ -2535,7 +2522,7 @@ abstract class Feature implements ActiveRecordInterface } /** - * @param Template $template The template object to add. + * @param Template $template The template object to add. */ protected function doAddTemplate($template) { @@ -2554,8 +2541,8 @@ abstract class Feature implements ActiveRecordInterface * Remove a ChildTemplate object to this object * through the feature_template cross reference table. * - * @param ChildTemplate $template The ChildFeatureTemplate object to relate - * @return ChildFeature The current object (for fluent API support) + * @param ChildTemplate $template The ChildFeatureTemplate object to relate + * @return ChildFeature The current object (for fluent API support) */ public function removeTemplate(ChildTemplate $template) { @@ -2598,7 +2585,7 @@ abstract class Feature implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2656,7 +2643,7 @@ abstract class Feature implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2670,9 +2657,9 @@ abstract class Feature implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2684,7 +2671,7 @@ abstract class Feature implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2694,8 +2681,8 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2728,10 +2715,10 @@ abstract class Feature implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildFeature The current object (for fluent API support) + * @return ChildFeature The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2756,7 +2743,7 @@ abstract class Feature implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php index 97fd6af1b..ee78a8786 100644 --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -34,7 +34,6 @@ abstract class FeatureAv implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureAvTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -351,9 +350,9 @@ abstract class FeatureAv implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FeatureAv The current object, for fluid interface */ @@ -403,33 +402,30 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [feature_id] column value. * - * @return int + * @return int */ public function getFeatureId() { - return $this->feature_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -437,8 +433,8 @@ abstract class FeatureAv implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +453,8 @@ abstract class FeatureAv implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -476,8 +472,8 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function setId($v) { @@ -490,15 +486,14 @@ abstract class FeatureAv implements ActiveRecordInterface $this->modifiedColumns[FeatureAvTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [feature_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function setFeatureId($v) { @@ -515,15 +510,14 @@ abstract class FeatureAv implements ActiveRecordInterface $this->aFeature = null; } - return $this; } // setFeatureId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function setPosition($v) { @@ -536,16 +530,15 @@ abstract class FeatureAv implements ActiveRecordInterface $this->modifiedColumns[FeatureAvTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -557,16 +550,15 @@ abstract class FeatureAv implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -578,7 +570,6 @@ abstract class FeatureAv implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -679,10 +670,10 @@ abstract class FeatureAv implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -722,7 +713,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FeatureAv::setDeleted() @@ -765,8 +756,8 @@ abstract class FeatureAv implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -827,8 +818,8 @@ abstract class FeatureAv implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -905,7 +896,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -983,7 +974,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -999,12 +990,12 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1018,7 +1009,7 @@ abstract class FeatureAv implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1051,12 +1042,12 @@ abstract class FeatureAv implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1097,12 +1088,12 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1116,8 +1107,8 @@ abstract class FeatureAv implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1154,8 +1145,8 @@ abstract class FeatureAv implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1183,7 +1174,6 @@ abstract class FeatureAv implements ActiveRecordInterface if ($this->isColumnModified(FeatureAvTableMap::POSITION)) $criteria->add(FeatureAvTableMap::POSITION, $this->position); if ($this->isColumnModified(FeatureAvTableMap::CREATED_AT)) $criteria->add(FeatureAvTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FeatureAvTableMap::UPDATED_AT)) $criteria->add(FeatureAvTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1205,7 +1195,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1215,7 +1205,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1229,7 +1219,6 @@ abstract class FeatureAv implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1239,9 +1228,9 @@ abstract class FeatureAv implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FeatureAv (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FeatureAv (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1284,8 +1273,8 @@ abstract class FeatureAv implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FeatureAv Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FeatureAv Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1301,8 +1290,8 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeature object. * - * @param ChildFeature $v - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param ChildFeature $v + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) * @throws PropelException */ public function setFeature(ChildFeature $v = null) @@ -1321,7 +1310,6 @@ abstract class FeatureAv implements ActiveRecordInterface $v->addFeatureAv($this); } - return $this; } @@ -1329,8 +1317,8 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Get the associated ChildFeature object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeature The associated ChildFeature object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeature The associated ChildFeature object. * @throws PropelException */ public function getFeature(ConnectionInterface $con = null) @@ -1355,7 +1343,7 @@ abstract class FeatureAv implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1397,8 +1385,8 @@ abstract class FeatureAv implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1420,8 +1408,8 @@ abstract class FeatureAv implements ActiveRecordInterface * If this ChildFeatureAv is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects * @throws PropelException */ @@ -1477,15 +1465,14 @@ abstract class FeatureAv implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureProducts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeatureAv The current object (for fluent API support) + * @param Collection $featureProducts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeatureAv The current object (for fluent API support) */ public function setFeatureProducts(Collection $featureProducts, ConnectionInterface $con = null) { $featureProductsToDelete = $this->getFeatureProducts(new Criteria(), $con)->diff($featureProducts); - $this->featureProductsScheduledForDeletion = $featureProductsToDelete; foreach ($featureProductsToDelete as $featureProductRemoved) { @@ -1506,10 +1493,10 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Returns the number of related FeatureProduct objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureProduct objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureProduct objects. * @throws PropelException */ public function countFeatureProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1541,8 +1528,8 @@ abstract class FeatureAv implements ActiveRecordInterface * Method called to associate a ChildFeatureProduct object to this object * through the ChildFeatureProduct foreign key attribute. * - * @param ChildFeatureProduct $l ChildFeatureProduct - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param ChildFeatureProduct $l ChildFeatureProduct + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function addFeatureProduct(ChildFeatureProduct $l) { @@ -1586,7 +1573,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1598,9 +1584,9 @@ abstract class FeatureAv implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in FeatureAv. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1611,7 +1597,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getFeatureProducts($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1623,9 +1608,9 @@ abstract class FeatureAv implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in FeatureAv. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinFeature($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1665,8 +1650,8 @@ abstract class FeatureAv implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1688,8 +1673,8 @@ abstract class FeatureAv implements ActiveRecordInterface * If this ChildFeatureAv is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureAvI18n[] List of ChildFeatureAvI18n objects * @throws PropelException */ @@ -1745,15 +1730,14 @@ abstract class FeatureAv implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureAvI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFeatureAv The current object (for fluent API support) + * @param Collection $featureAvI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFeatureAv The current object (for fluent API support) */ public function setFeatureAvI18ns(Collection $featureAvI18ns, ConnectionInterface $con = null) { $featureAvI18nsToDelete = $this->getFeatureAvI18ns(new Criteria(), $con)->diff($featureAvI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1777,10 +1761,10 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Returns the number of related FeatureAvI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureAvI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureAvI18n objects. * @throws PropelException */ public function countFeatureAvI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1812,8 +1796,8 @@ abstract class FeatureAv implements ActiveRecordInterface * Method called to associate a ChildFeatureAvI18n object to this object * through the ChildFeatureAvI18n foreign key attribute. * - * @param ChildFeatureAvI18n $l ChildFeatureAvI18n - * @return \Thelia\Model\FeatureAv The current object (for fluent API support) + * @param ChildFeatureAvI18n $l ChildFeatureAvI18n + * @return \Thelia\Model\FeatureAv The current object (for fluent API support) */ public function addFeatureAvI18n(ChildFeatureAvI18n $l) { @@ -1843,7 +1827,7 @@ abstract class FeatureAv implements ActiveRecordInterface } /** - * @param FeatureAvI18n $featureAvI18n The featureAvI18n object to remove. + * @param FeatureAvI18n $featureAvI18n The featureAvI18n object to remove. * @return ChildFeatureAv The current object (for fluent API support) */ public function removeFeatureAvI18n($featureAvI18n) @@ -1885,7 +1869,7 @@ abstract class FeatureAv implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1926,7 +1910,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFeatureAv The current object (for fluent API support) + * @return ChildFeatureAv The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1940,9 +1924,9 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildFeatureAv The current object (for fluent API support) + * @return ChildFeatureAv The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1954,7 +1938,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1964,8 +1948,8 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureAvI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1998,10 +1982,10 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildFeatureAv The current object (for fluent API support) + * @return ChildFeatureAv The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2026,7 +2010,7 @@ abstract class FeatureAv implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureAvI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2034,7 +2018,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2045,7 +2028,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2058,7 +2040,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2069,7 +2050,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2082,7 +2062,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2093,7 +2072,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2106,7 +2084,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2117,7 +2094,6 @@ abstract class FeatureAv implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2206,7 +2182,6 @@ abstract class FeatureAv implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php index 8b3d2c93c..497a8b108 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -26,7 +26,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureAvI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FeatureAvI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->aFeatureAv = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureAvI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureAvI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureAvI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureAvI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureAvI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FeatureAvI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FeatureAvI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface if ($this->isColumnModified(FeatureAvI18nTableMap::DESCRIPTION)) $criteria->add(FeatureAvI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(FeatureAvI18nTableMap::CHAPO)) $criteria->add(FeatureAvI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(FeatureAvI18nTableMap::POSTSCRIPTUM)) $criteria->add(FeatureAvI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FeatureAvI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FeatureAvI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FeatureAvI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FeatureAvI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeatureAv object. * - * @param ChildFeatureAv $v - * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) + * @param ChildFeatureAv $v + * @return \Thelia\Model\FeatureAvI18n The current object (for fluent API support) * @throws PropelException */ public function setFeatureAv(ChildFeatureAv $v = null) @@ -1247,16 +1231,14 @@ abstract class FeatureAvI18n implements ActiveRecordInterface $v->addFeatureAvI18n($this); } - return $this; } - /** * Get the associated ChildFeatureAv object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeatureAv The associated ChildFeatureAv object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeatureAv The associated ChildFeatureAv object. * @throws PropelException */ public function getFeatureAv(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php index 88bb52aa5..208d7dc49 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php @@ -67,9 +67,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureAvI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureAvI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Returns a new ChildFeatureAvI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureAvI18nQuery */ @@ -140,10 +140,10 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeatureAvI18n A model object, or null if the key is not found + * @return ChildFeatureAvI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeatureAvI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * * @see filterByFeatureAv() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureAv object * - * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class FeatureAvI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query */ public function useFeatureAvQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeatureAvI18n $featureAvI18n Object to remove from the list of results + * @param ChildFeatureAvI18n $featureAvI18n Object to remove from the list of results * * @return ChildFeatureAvI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Deletes all rows from the feature_av_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class FeatureAvI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeatureAvI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeatureAvI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeatureAvI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class FeatureAvI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureAvI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php index 3d8d81a4b..7de437661 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureAvQuery.php @@ -72,9 +72,9 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureAvQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureAv', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Returns a new ChildFeatureAvQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureAvQuery */ @@ -114,7 +114,7 @@ abstract class FeatureAvQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureAv|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class FeatureAvQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeatureAv A model object, or null if the key is not found + * @return ChildFeatureAv A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeatureAv|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class FeatureAvQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureAvQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FeatureAvTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureAvQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FeatureAvTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class FeatureAvQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class FeatureAvQuery extends ModelCriteria * * @see filterByFeature() * - * @param mixed $featureId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $featureId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -335,11 +333,11 @@ abstract class FeatureAvQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -376,13 +374,13 @@ abstract class FeatureAvQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -419,13 +417,13 @@ abstract class FeatureAvQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -455,8 +453,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Feature object * - * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -480,8 +478,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Feature relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -514,11 +512,11 @@ abstract class FeatureAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query */ public function useFeatureQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -530,8 +528,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureProduct object * - * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -553,8 +551,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -587,11 +585,11 @@ abstract class FeatureAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query */ public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -603,8 +601,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureAvI18n object * - * @param \Thelia\Model\FeatureAvI18n|ObjectCollection $featureAvI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureAvI18n|ObjectCollection $featureAvI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -626,8 +624,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureAvI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -660,11 +658,11 @@ abstract class FeatureAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureAvI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureAvI18nQuery A secondary query class using the current class as primary query */ public function useFeatureAvI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -676,7 +674,7 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeatureAv $featureAv Object to remove from the list of results + * @param ChildFeatureAv $featureAv Object to remove from the list of results * * @return ChildFeatureAvQuery The current query, for fluid interface */ @@ -692,8 +690,8 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Deletes all rows from the feature_av table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -724,13 +722,13 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeatureAv or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeatureAv object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeatureAv object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -750,7 +748,6 @@ abstract class FeatureAvQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureAvTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -769,9 +766,9 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -781,9 +778,9 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -793,7 +790,7 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -803,7 +800,7 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -813,7 +810,7 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -823,7 +820,7 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -835,11 +832,11 @@ abstract class FeatureAvQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -854,10 +851,10 @@ abstract class FeatureAvQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureAvQuery The current query, for fluid interface + * @return ChildFeatureAvQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -874,11 +871,11 @@ abstract class FeatureAvQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureAvI18nQuery A secondary query class using the current class as primary query + * @return ChildFeatureAvI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php index 1a9bbc244..d8766b261 100644 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -26,7 +26,6 @@ abstract class FeatureI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class FeatureI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FeatureI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->aFeature = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class FeatureI18n implements ActiveRecordInterface $this->modifiedColumns[FeatureI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class FeatureI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FeatureI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class FeatureI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FeatureI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class FeatureI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class FeatureI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class FeatureI18n implements ActiveRecordInterface if ($this->isColumnModified(FeatureI18nTableMap::DESCRIPTION)) $criteria->add(FeatureI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(FeatureI18nTableMap::CHAPO)) $criteria->add(FeatureI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(FeatureI18nTableMap::POSTSCRIPTUM)) $criteria->add(FeatureI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class FeatureI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FeatureI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FeatureI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class FeatureI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FeatureI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FeatureI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeature object. * - * @param ChildFeature $v - * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) + * @param ChildFeature $v + * @return \Thelia\Model\FeatureI18n The current object (for fluent API support) * @throws PropelException */ public function setFeature(ChildFeature $v = null) @@ -1247,16 +1231,14 @@ abstract class FeatureI18n implements ActiveRecordInterface $v->addFeatureI18n($this); } - return $this; } - /** * Get the associated ChildFeature object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeature The associated ChildFeature object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeature The associated ChildFeature object. * @throws PropelException */ public function getFeature(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class FeatureI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FeatureI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureI18nQuery.php index 33c171127..05bdb9f77 100644 --- a/core/lib/Thelia/Model/Base/FeatureI18nQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureI18nQuery.php @@ -67,9 +67,9 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Returns a new ChildFeatureI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureI18nQuery */ @@ -140,10 +140,10 @@ abstract class FeatureI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeatureI18n A model object, or null if the key is not found + * @return ChildFeatureI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeatureI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class FeatureI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class FeatureI18nQuery extends ModelCriteria * * @see filterByFeature() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class FeatureI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class FeatureI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class FeatureI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class FeatureI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class FeatureI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Feature object * - * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Feature relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class FeatureI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query */ public function useFeatureQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeatureI18n $featureI18n Object to remove from the list of results + * @param ChildFeatureI18n $featureI18n Object to remove from the list of results * * @return ChildFeatureI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Deletes all rows from the feature_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class FeatureI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeatureI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeatureI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeatureI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class FeatureI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/FeatureProduct.php b/core/lib/Thelia/Model/Base/FeatureProduct.php index c7b08e763..2f2fdc939 100644 --- a/core/lib/Thelia/Model/Base/FeatureProduct.php +++ b/core/lib/Thelia/Model/Base/FeatureProduct.php @@ -33,7 +33,6 @@ abstract class FeatureProduct implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureProductTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -340,9 +339,9 @@ abstract class FeatureProduct implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FeatureProduct The current object, for fluid interface */ @@ -392,66 +391,60 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [feature_id] column value. * - * @return int + * @return int */ public function getFeatureId() { - return $this->feature_id; } /** * Get the [feature_av_id] column value. * - * @return int + * @return int */ public function getFeatureAvId() { - return $this->feature_av_id; } /** * Get the [free_text_value] column value. * - * @return string + * @return string */ public function getFreeTextValue() { - return $this->free_text_value; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -459,8 +452,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +472,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -498,8 +491,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setId($v) { @@ -512,15 +505,14 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->modifiedColumns[FeatureProductTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setProductId($v) { @@ -537,15 +529,14 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [feature_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setFeatureId($v) { @@ -562,15 +553,14 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->aFeature = null; } - return $this; } // setFeatureId() /** * Set the value of [feature_av_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setFeatureAvId($v) { @@ -587,15 +577,14 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->aFeatureAv = null; } - return $this; } // setFeatureAvId() /** * Set the value of [free_text_value] column. * - * @param string $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setFreeTextValue($v) { @@ -608,15 +597,14 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->modifiedColumns[FeatureProductTableMap::FREE_TEXT_VALUE] = true; } - return $this; } // setFreeTextValue() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setPosition($v) { @@ -629,16 +617,15 @@ abstract class FeatureProduct implements ActiveRecordInterface $this->modifiedColumns[FeatureProductTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -650,16 +637,15 @@ abstract class FeatureProduct implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -671,7 +657,6 @@ abstract class FeatureProduct implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -787,10 +772,10 @@ abstract class FeatureProduct implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -828,7 +813,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FeatureProduct::setDeleted() @@ -871,8 +856,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -933,8 +918,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -991,7 +976,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1087,7 +1072,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1103,12 +1088,12 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1122,7 +1107,7 @@ abstract class FeatureProduct implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1164,12 +1149,12 @@ abstract class FeatureProduct implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1213,12 +1198,12 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1232,8 +1217,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1279,8 +1264,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1314,7 +1299,6 @@ abstract class FeatureProduct implements ActiveRecordInterface if ($this->isColumnModified(FeatureProductTableMap::POSITION)) $criteria->add(FeatureProductTableMap::POSITION, $this->position); if ($this->isColumnModified(FeatureProductTableMap::CREATED_AT)) $criteria->add(FeatureProductTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FeatureProductTableMap::UPDATED_AT)) $criteria->add(FeatureProductTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1336,7 +1320,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1346,7 +1330,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1360,7 +1344,6 @@ abstract class FeatureProduct implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1370,9 +1353,9 @@ abstract class FeatureProduct implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FeatureProduct (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FeatureProduct (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1398,8 +1381,8 @@ abstract class FeatureProduct implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FeatureProduct Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FeatureProduct Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1415,8 +1398,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1435,7 +1418,6 @@ abstract class FeatureProduct implements ActiveRecordInterface $v->addFeatureProduct($this); } - return $this; } @@ -1443,8 +1425,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1466,8 +1448,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeature object. * - * @param ChildFeature $v - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param ChildFeature $v + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) * @throws PropelException */ public function setFeature(ChildFeature $v = null) @@ -1486,7 +1468,6 @@ abstract class FeatureProduct implements ActiveRecordInterface $v->addFeatureProduct($this); } - return $this; } @@ -1494,8 +1475,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the associated ChildFeature object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeature The associated ChildFeature object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeature The associated ChildFeature object. * @throws PropelException */ public function getFeature(ConnectionInterface $con = null) @@ -1517,8 +1498,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeatureAv object. * - * @param ChildFeatureAv $v - * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) + * @param ChildFeatureAv $v + * @return \Thelia\Model\FeatureProduct The current object (for fluent API support) * @throws PropelException */ public function setFeatureAv(ChildFeatureAv $v = null) @@ -1537,7 +1518,6 @@ abstract class FeatureProduct implements ActiveRecordInterface $v->addFeatureProduct($this); } - return $this; } @@ -1545,8 +1525,8 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Get the associated ChildFeatureAv object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeatureAv The associated ChildFeatureAv object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeatureAv The associated ChildFeatureAv object. * @throws PropelException */ public function getFeatureAv(ConnectionInterface $con = null) @@ -1592,7 +1572,7 @@ abstract class FeatureProduct implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1619,7 +1599,7 @@ abstract class FeatureProduct implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFeatureProduct The current object (for fluent API support) + * @return ChildFeatureProduct The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/FeatureProductQuery.php b/core/lib/Thelia/Model/Base/FeatureProductQuery.php index b1d46a12f..d3ab67800 100644 --- a/core/lib/Thelia/Model/Base/FeatureProductQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureProductQuery.php @@ -83,9 +83,9 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureProductQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureProduct', $modelAlias = null) { @@ -95,8 +95,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Returns a new ChildFeatureProductQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureProductQuery */ @@ -125,7 +125,7 @@ abstract class FeatureProductQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureProduct|array|mixed the result, formatted by the current formatter @@ -156,10 +156,10 @@ abstract class FeatureProductQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeatureProduct A model object, or null if the key is not found + * @return ChildFeatureProduct A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -186,8 +186,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeatureProduct|array|mixed the result, formatted by the current formatter */ @@ -207,8 +207,8 @@ abstract class FeatureProductQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -229,26 +229,24 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureProductQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FeatureProductTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureProductQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FeatureProductTableMap::ID, $keys, Criteria::IN); } @@ -262,11 +260,11 @@ abstract class FeatureProductQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -305,11 +303,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -348,11 +346,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see filterByFeature() * - * @param mixed $featureId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $featureId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -391,11 +389,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see filterByFeatureAv() * - * @param mixed $featureAvId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $featureAvId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -431,9 +429,9 @@ abstract class FeatureProductQuery extends ModelCriteria * $query->filterByFreeTextValue('%fooValue%'); // WHERE free_text_value LIKE '%fooValue%' * * - * @param string $freeTextValue The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $freeTextValue The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -461,11 +459,11 @@ abstract class FeatureProductQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -502,13 +500,13 @@ abstract class FeatureProductQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -545,13 +543,13 @@ abstract class FeatureProductQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -581,8 +579,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -606,8 +604,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -640,11 +638,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -656,8 +654,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Feature object * - * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -681,8 +679,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Feature relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -715,11 +713,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query */ public function useFeatureQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -731,8 +729,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureAv object * - * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -756,8 +754,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -790,11 +788,11 @@ abstract class FeatureProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query */ public function useFeatureAvQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -806,7 +804,7 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeatureProduct $featureProduct Object to remove from the list of results + * @param ChildFeatureProduct $featureProduct Object to remove from the list of results * * @return ChildFeatureProductQuery The current query, for fluid interface */ @@ -822,8 +820,8 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Deletes all rows from the feature_product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -854,13 +852,13 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeatureProduct or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeatureProduct object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeatureProduct object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -880,7 +878,6 @@ abstract class FeatureProductQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureProductTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -899,9 +896,9 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -911,9 +908,9 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -923,7 +920,7 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -933,7 +930,7 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -943,7 +940,7 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -953,7 +950,7 @@ abstract class FeatureProductQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFeatureProductQuery The current query, for fluid interface + * @return ChildFeatureProductQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php index d6e20ea15..f11c189f6 100644 --- a/core/lib/Thelia/Model/Base/FeatureQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureQuery.php @@ -76,9 +76,9 @@ abstract class FeatureQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Feature', $modelAlias = null) { @@ -88,8 +88,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Returns a new ChildFeatureQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureQuery */ @@ -118,7 +118,7 @@ abstract class FeatureQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFeature|array|mixed the result, formatted by the current formatter @@ -149,10 +149,10 @@ abstract class FeatureQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeature A model object, or null if the key is not found + * @return ChildFeature A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -179,8 +179,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeature|array|mixed the result, formatted by the current formatter */ @@ -200,8 +200,8 @@ abstract class FeatureQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -222,26 +222,24 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FeatureTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FeatureTableMap::ID, $keys, Criteria::IN); } @@ -255,11 +253,11 @@ abstract class FeatureQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -296,11 +294,11 @@ abstract class FeatureQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -337,11 +335,11 @@ abstract class FeatureQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -378,13 +376,13 @@ abstract class FeatureQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -421,13 +419,13 @@ abstract class FeatureQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -458,7 +456,7 @@ abstract class FeatureQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\FeatureAv object * * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -480,8 +478,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureAv relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -514,11 +512,11 @@ abstract class FeatureQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureAvQuery A secondary query class using the current class as primary query */ public function useFeatureAvQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -530,8 +528,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureProduct object * - * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -553,8 +551,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -587,11 +585,11 @@ abstract class FeatureQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query */ public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -603,8 +601,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureTemplate object * - * @param \Thelia\Model\FeatureTemplate|ObjectCollection $featureTemplate the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureTemplate|ObjectCollection $featureTemplate the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -626,8 +624,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureTemplate relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -660,11 +658,11 @@ abstract class FeatureQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureTemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureTemplateQuery A secondary query class using the current class as primary query */ public function useFeatureTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -676,8 +674,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureI18n object * - * @param \Thelia\Model\FeatureI18n|ObjectCollection $featureI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureI18n|ObjectCollection $featureI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -699,8 +697,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -733,11 +731,11 @@ abstract class FeatureQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureI18nQuery A secondary query class using the current class as primary query */ public function useFeatureI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -750,8 +748,8 @@ abstract class FeatureQuery extends ModelCriteria * Filter the query by a related Template object * using the feature_template table as cross reference * - * @param Template $template the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Template $template the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -766,7 +764,7 @@ abstract class FeatureQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeature $feature Object to remove from the list of results + * @param ChildFeature $feature Object to remove from the list of results * * @return ChildFeatureQuery The current query, for fluid interface */ @@ -782,8 +780,8 @@ abstract class FeatureQuery extends ModelCriteria /** * Deletes all rows from the feature table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -814,13 +812,13 @@ abstract class FeatureQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeature or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeature object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeature object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -840,7 +838,6 @@ abstract class FeatureQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -859,9 +856,9 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -871,9 +868,9 @@ abstract class FeatureQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -883,7 +880,7 @@ abstract class FeatureQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -893,7 +890,7 @@ abstract class FeatureQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -903,7 +900,7 @@ abstract class FeatureQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -913,7 +910,7 @@ abstract class FeatureQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -925,11 +922,11 @@ abstract class FeatureQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -944,10 +941,10 @@ abstract class FeatureQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureQuery The current query, for fluid interface + * @return ChildFeatureQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -964,11 +961,11 @@ abstract class FeatureQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFeatureI18nQuery A secondary query class using the current class as primary query + * @return ChildFeatureI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/FeatureTemplate.php b/core/lib/Thelia/Model/Base/FeatureTemplate.php index b837cb3b3..340629131 100644 --- a/core/lib/Thelia/Model/Base/FeatureTemplate.php +++ b/core/lib/Thelia/Model/Base/FeatureTemplate.php @@ -31,7 +31,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureTemplateTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -321,9 +320,9 @@ abstract class FeatureTemplate implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FeatureTemplate The current object, for fluid interface */ @@ -373,44 +372,40 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [feature_id] column value. * - * @return int + * @return int */ public function getFeatureId() { - return $this->feature_id; } /** * Get the [template_id] column value. * - * @return int + * @return int */ public function getTemplateId() { - return $this->template_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -418,8 +413,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -438,8 +433,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +452,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setId($v) { @@ -471,15 +466,14 @@ abstract class FeatureTemplate implements ActiveRecordInterface $this->modifiedColumns[FeatureTemplateTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [feature_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setFeatureId($v) { @@ -496,15 +490,14 @@ abstract class FeatureTemplate implements ActiveRecordInterface $this->aFeature = null; } - return $this; } // setFeatureId() /** * Set the value of [template_id] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setTemplateId($v) { @@ -521,15 +514,14 @@ abstract class FeatureTemplate implements ActiveRecordInterface $this->aTemplate = null; } - return $this; } // setTemplateId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setPosition($v) { @@ -542,16 +534,15 @@ abstract class FeatureTemplate implements ActiveRecordInterface $this->modifiedColumns[FeatureTemplateTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -563,16 +554,15 @@ abstract class FeatureTemplate implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -584,7 +574,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -691,10 +680,10 @@ abstract class FeatureTemplate implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -731,7 +720,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FeatureTemplate::setDeleted() @@ -774,8 +763,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -836,8 +825,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -887,7 +876,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -971,7 +960,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -987,12 +976,12 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1006,7 +995,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1042,12 +1031,12 @@ abstract class FeatureTemplate implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1086,12 +1075,12 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1105,8 +1094,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1146,8 +1135,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1177,7 +1166,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface if ($this->isColumnModified(FeatureTemplateTableMap::POSITION)) $criteria->add(FeatureTemplateTableMap::POSITION, $this->position); if ($this->isColumnModified(FeatureTemplateTableMap::CREATED_AT)) $criteria->add(FeatureTemplateTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FeatureTemplateTableMap::UPDATED_AT)) $criteria->add(FeatureTemplateTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1199,7 +1187,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1209,7 +1197,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1223,7 +1211,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1233,9 +1220,9 @@ abstract class FeatureTemplate implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FeatureTemplate (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FeatureTemplate (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1259,8 +1246,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FeatureTemplate Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FeatureTemplate Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1276,8 +1263,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Declares an association between this object and a ChildFeature object. * - * @param ChildFeature $v - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param ChildFeature $v + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) * @throws PropelException */ public function setFeature(ChildFeature $v = null) @@ -1296,7 +1283,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface $v->addFeatureTemplate($this); } - return $this; } @@ -1304,8 +1290,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Get the associated ChildFeature object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFeature The associated ChildFeature object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFeature The associated ChildFeature object. * @throws PropelException */ public function getFeature(ConnectionInterface $con = null) @@ -1327,8 +1313,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Declares an association between this object and a ChildTemplate object. * - * @param ChildTemplate $v - * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) + * @param ChildTemplate $v + * @return \Thelia\Model\FeatureTemplate The current object (for fluent API support) * @throws PropelException */ public function setTemplate(ChildTemplate $v = null) @@ -1347,7 +1333,6 @@ abstract class FeatureTemplate implements ActiveRecordInterface $v->addFeatureTemplate($this); } - return $this; } @@ -1355,8 +1340,8 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Get the associated ChildTemplate object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTemplate The associated ChildTemplate object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTemplate The associated ChildTemplate object. * @throws PropelException */ public function getTemplate(ConnectionInterface $con = null) @@ -1400,7 +1385,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1426,7 +1411,7 @@ abstract class FeatureTemplate implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFeatureTemplate The current object (for fluent API support) + * @return ChildFeatureTemplate The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/FeatureTemplateQuery.php b/core/lib/Thelia/Model/Base/FeatureTemplateQuery.php index 8b4f0893e..077515ee6 100644 --- a/core/lib/Thelia/Model/Base/FeatureTemplateQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureTemplateQuery.php @@ -71,9 +71,9 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FeatureTemplateQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureTemplate', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Returns a new ChildFeatureTemplateQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFeatureTemplateQuery */ @@ -113,7 +113,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureTemplate|array|mixed the result, formatted by the current formatter @@ -144,10 +144,10 @@ abstract class FeatureTemplateQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFeatureTemplate A model object, or null if the key is not found + * @return ChildFeatureTemplate A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -174,8 +174,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFeatureTemplate|array|mixed the result, formatted by the current formatter */ @@ -195,8 +195,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -217,26 +217,24 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FeatureTemplateTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FeatureTemplateTableMap::ID, $keys, Criteria::IN); } @@ -250,11 +248,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -293,11 +291,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * * @see filterByFeature() * - * @param mixed $featureId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $featureId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -336,11 +334,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * * @see filterByTemplate() * - * @param mixed $templateId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $templateId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -377,11 +375,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -418,13 +416,13 @@ abstract class FeatureTemplateQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -461,13 +459,13 @@ abstract class FeatureTemplateQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -497,8 +495,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Feature object * - * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -522,8 +520,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Feature relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureQuery A secondary query class using the current class as primary query */ public function useFeatureQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -572,8 +570,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Template object * - * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -597,8 +595,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Template relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -631,11 +629,11 @@ abstract class FeatureTemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query */ public function useTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -647,7 +645,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFeatureTemplate $featureTemplate Object to remove from the list of results + * @param ChildFeatureTemplate $featureTemplate Object to remove from the list of results * * @return ChildFeatureTemplateQuery The current query, for fluid interface */ @@ -663,8 +661,8 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Deletes all rows from the feature_template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -695,13 +693,13 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFeatureTemplate or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFeatureTemplate object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFeatureTemplate object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -721,7 +719,6 @@ abstract class FeatureTemplateQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FeatureTemplateTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -740,9 +737,9 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -752,9 +749,9 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -764,7 +761,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -774,7 +771,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -784,7 +781,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -794,7 +791,7 @@ abstract class FeatureTemplateQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFeatureTemplateQuery The current query, for fluid interface + * @return ChildFeatureTemplateQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index c0529ebb6..97ced8ee5 100644 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -41,7 +41,6 @@ abstract class Folder implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -182,7 +181,6 @@ abstract class Folder implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -446,9 +444,9 @@ abstract class Folder implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Folder The current object, for fluid interface */ @@ -498,44 +496,40 @@ abstract class Folder implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [parent] column value. * - * @return int + * @return int */ public function getParent() { - return $this->parent; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -543,8 +537,8 @@ abstract class Folder implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -563,8 +557,8 @@ abstract class Folder implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -582,11 +576,10 @@ abstract class Folder implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -594,8 +587,8 @@ abstract class Folder implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -613,19 +606,18 @@ abstract class Folder implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setId($v) { @@ -638,15 +630,14 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [parent] column. * - * @param int $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setParent($v) { @@ -659,15 +650,14 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::PARENT] = true; } - return $this; } // setParent() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setVisible($v) { @@ -680,15 +670,14 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setPosition($v) { @@ -701,16 +690,15 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -722,16 +710,15 @@ abstract class Folder implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -743,15 +730,14 @@ abstract class Folder implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setVersion($v) { @@ -764,16 +750,15 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -785,15 +770,14 @@ abstract class Folder implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -806,7 +790,6 @@ abstract class Folder implements ActiveRecordInterface $this->modifiedColumns[FolderTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -850,7 +833,6 @@ abstract class Folder implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FolderTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -923,10 +905,10 @@ abstract class Folder implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -972,7 +954,7 @@ abstract class Folder implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Folder::setDeleted() @@ -1015,8 +997,8 @@ abstract class Folder implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1089,8 +1071,8 @@ abstract class Folder implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1233,7 +1215,7 @@ abstract class Folder implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1335,7 +1317,7 @@ abstract class Folder implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1351,12 +1333,12 @@ abstract class Folder implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1370,7 +1352,7 @@ abstract class Folder implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1415,12 +1397,12 @@ abstract class Folder implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1471,12 +1453,12 @@ abstract class Folder implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1490,8 +1472,8 @@ abstract class Folder implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1540,8 +1522,8 @@ abstract class Folder implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1577,7 +1559,6 @@ abstract class Folder implements ActiveRecordInterface if ($this->isColumnModified(FolderTableMap::VERSION)) $criteria->add(FolderTableMap::VERSION, $this->version); if ($this->isColumnModified(FolderTableMap::VERSION_CREATED_AT)) $criteria->add(FolderTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(FolderTableMap::VERSION_CREATED_BY)) $criteria->add(FolderTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1599,7 +1580,7 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1609,7 +1590,7 @@ abstract class Folder implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1623,7 +1604,6 @@ abstract class Folder implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1633,9 +1613,9 @@ abstract class Folder implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Folder (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Folder (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1700,8 +1680,8 @@ abstract class Folder implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Folder Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Folder Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1720,7 +1700,7 @@ abstract class Folder implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1771,8 +1751,8 @@ abstract class Folder implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1794,8 +1774,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildContentFolder[] List of ChildContentFolder objects * @throws PropelException */ @@ -1851,15 +1831,14 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contentFolders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $contentFolders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setContentFolders(Collection $contentFolders, ConnectionInterface $con = null) { $contentFoldersToDelete = $this->getContentFolders(new Criteria(), $con)->diff($contentFolders); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1883,10 +1862,10 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the number of related ContentFolder objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentFolder objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ContentFolder objects. * @throws PropelException */ public function countContentFolders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1918,8 +1897,8 @@ abstract class Folder implements ActiveRecordInterface * Method called to associate a ChildContentFolder object to this object * through the ChildContentFolder foreign key attribute. * - * @param ChildContentFolder $l ChildContentFolder - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param ChildContentFolder $l ChildContentFolder + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function addContentFolder(ChildContentFolder $l) { @@ -1946,7 +1925,7 @@ abstract class Folder implements ActiveRecordInterface /** * @param ContentFolder $contentFolder The contentFolder object to remove. - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function removeContentFolder($contentFolder) { @@ -1963,7 +1942,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1975,9 +1953,9 @@ abstract class Folder implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Folder. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildContentFolder[] List of ChildContentFolder objects */ public function getContentFoldersJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2017,8 +1995,8 @@ abstract class Folder implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2040,8 +2018,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderImage[] List of ChildFolderImage objects * @throws PropelException */ @@ -2097,15 +2075,14 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderImages A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $folderImages A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setFolderImages(Collection $folderImages, ConnectionInterface $con = null) { $folderImagesToDelete = $this->getFolderImages(new Criteria(), $con)->diff($folderImages); - $this->folderImagesScheduledForDeletion = $folderImagesToDelete; foreach ($folderImagesToDelete as $folderImageRemoved) { @@ -2126,10 +2103,10 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the number of related FolderImage objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderImage objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderImage objects. * @throws PropelException */ public function countFolderImages(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2161,8 +2138,8 @@ abstract class Folder implements ActiveRecordInterface * Method called to associate a ChildFolderImage object to this object * through the ChildFolderImage foreign key attribute. * - * @param ChildFolderImage $l ChildFolderImage - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param ChildFolderImage $l ChildFolderImage + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function addFolderImage(ChildFolderImage $l) { @@ -2235,8 +2212,8 @@ abstract class Folder implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2258,8 +2235,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderDocument[] List of ChildFolderDocument objects * @throws PropelException */ @@ -2315,15 +2292,14 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderDocuments A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $folderDocuments A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setFolderDocuments(Collection $folderDocuments, ConnectionInterface $con = null) { $folderDocumentsToDelete = $this->getFolderDocuments(new Criteria(), $con)->diff($folderDocuments); - $this->folderDocumentsScheduledForDeletion = $folderDocumentsToDelete; foreach ($folderDocumentsToDelete as $folderDocumentRemoved) { @@ -2344,10 +2320,10 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the number of related FolderDocument objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderDocument objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderDocument objects. * @throws PropelException */ public function countFolderDocuments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2379,8 +2355,8 @@ abstract class Folder implements ActiveRecordInterface * Method called to associate a ChildFolderDocument object to this object * through the ChildFolderDocument foreign key attribute. * - * @param ChildFolderDocument $l ChildFolderDocument - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param ChildFolderDocument $l ChildFolderDocument + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function addFolderDocument(ChildFolderDocument $l) { @@ -2407,7 +2383,7 @@ abstract class Folder implements ActiveRecordInterface /** * @param FolderDocument $folderDocument The folderDocument object to remove. - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function removeFolderDocument($folderDocument) { @@ -2453,8 +2429,8 @@ abstract class Folder implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2476,8 +2452,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderI18n[] List of ChildFolderI18n objects * @throws PropelException */ @@ -2533,15 +2509,14 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $folderI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setFolderI18ns(Collection $folderI18ns, ConnectionInterface $con = null) { $folderI18nsToDelete = $this->getFolderI18ns(new Criteria(), $con)->diff($folderI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2565,10 +2540,10 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the number of related FolderI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderI18n objects. * @throws PropelException */ public function countFolderI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2600,8 +2575,8 @@ abstract class Folder implements ActiveRecordInterface * Method called to associate a ChildFolderI18n object to this object * through the ChildFolderI18n foreign key attribute. * - * @param ChildFolderI18n $l ChildFolderI18n - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param ChildFolderI18n $l ChildFolderI18n + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function addFolderI18n(ChildFolderI18n $l) { @@ -2631,7 +2606,7 @@ abstract class Folder implements ActiveRecordInterface } /** - * @param FolderI18n $folderI18n The folderI18n object to remove. + * @param FolderI18n $folderI18n The folderI18n object to remove. * @return ChildFolder The current object (for fluent API support) */ public function removeFolderI18n($folderI18n) @@ -2678,8 +2653,8 @@ abstract class Folder implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2701,8 +2676,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderVersion[] List of ChildFolderVersion objects * @throws PropelException */ @@ -2758,15 +2733,14 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $folderVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setFolderVersions(Collection $folderVersions, ConnectionInterface $con = null) { $folderVersionsToDelete = $this->getFolderVersions(new Criteria(), $con)->diff($folderVersions); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2790,10 +2764,10 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the number of related FolderVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderVersion objects. * @throws PropelException */ public function countFolderVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2825,8 +2799,8 @@ abstract class Folder implements ActiveRecordInterface * Method called to associate a ChildFolderVersion object to this object * through the ChildFolderVersion foreign key attribute. * - * @param ChildFolderVersion $l ChildFolderVersion - * @return \Thelia\Model\Folder The current object (for fluent API support) + * @param ChildFolderVersion $l ChildFolderVersion + * @return \Thelia\Model\Folder The current object (for fluent API support) */ public function addFolderVersion(ChildFolderVersion $l) { @@ -2853,7 +2827,7 @@ abstract class Folder implements ActiveRecordInterface /** * @param FolderVersion $folderVersion The folderVersion object to remove. - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function removeFolderVersion($folderVersion) { @@ -2910,8 +2884,8 @@ abstract class Folder implements ActiveRecordInterface * If this ChildFolder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildContent[] List of ChildContent objects */ @@ -2941,9 +2915,9 @@ abstract class Folder implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $contents A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) + * @param Collection $contents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) */ public function setContents(Collection $contents, ConnectionInterface $con = null) { @@ -2967,9 +2941,9 @@ abstract class Folder implements ActiveRecordInterface * Gets the number of ChildContent objects related by a many-to-many relationship * to the current object by way of the content_folder cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildContent objects */ @@ -2998,7 +2972,7 @@ abstract class Folder implements ActiveRecordInterface * through the content_folder cross reference table. * * @param ChildContent $content The ChildContentFolder object to relate - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function addContent(ChildContent $content) { @@ -3015,7 +2989,7 @@ abstract class Folder implements ActiveRecordInterface } /** - * @param Content $content The content object to add. + * @param Content $content The content object to add. */ protected function doAddContent($content) { @@ -3034,8 +3008,8 @@ abstract class Folder implements ActiveRecordInterface * Remove a ChildContent object to this object * through the content_folder cross reference table. * - * @param ChildContent $content The ChildContentFolder object to relate - * @return ChildFolder The current object (for fluent API support) + * @param ChildContent $content The ChildContentFolder object to relate + * @return ChildFolder The current object (for fluent API support) */ public function removeContent(ChildContent $content) { @@ -3082,7 +3056,7 @@ abstract class Folder implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3146,7 +3120,7 @@ abstract class Folder implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -3160,9 +3134,9 @@ abstract class Folder implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -3174,7 +3148,7 @@ abstract class Folder implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -3184,8 +3158,8 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -3218,10 +3192,10 @@ abstract class Folder implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -3246,7 +3220,7 @@ abstract class Folder implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -3254,7 +3228,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -3265,7 +3238,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -3278,7 +3250,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -3289,7 +3260,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -3302,7 +3272,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -3313,7 +3282,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -3326,7 +3294,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -3337,7 +3304,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -3350,7 +3316,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [meta_title] column value. * @@ -3361,7 +3326,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaTitle(); } - /** * Set the value of [meta_title] column. * @@ -3374,7 +3338,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [meta_description] column value. * @@ -3385,7 +3348,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaDescription(); } - /** * Set the value of [meta_description] column. * @@ -3398,7 +3360,6 @@ abstract class Folder implements ActiveRecordInterface return $this; } - /** * Get the [meta_keywords] column value. * @@ -3409,7 +3370,6 @@ abstract class Folder implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaKeywords(); } - /** * Set the value of [meta_keywords] column. * @@ -3439,7 +3399,7 @@ abstract class Folder implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -3461,9 +3421,9 @@ abstract class Folder implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildFolderVersion A version object + * @return ChildFolderVersion A version object */ public function addVersion($con = null) { @@ -3488,10 +3448,10 @@ abstract class Folder implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildFolder The current object (for fluent API support) + * @return ChildFolder The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -3507,9 +3467,9 @@ abstract class Folder implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildFolderVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildFolderVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildFolder The current object (for fluent API support) */ @@ -3532,9 +3492,9 @@ abstract class Folder implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -3552,9 +3512,9 @@ abstract class Folder implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -3564,10 +3524,10 @@ abstract class Folder implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildFolderVersion A version object + * @return ChildFolderVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -3580,9 +3540,9 @@ abstract class Folder implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildFolderVersion objects + * @return ObjectCollection A list of ChildFolderVersion objects */ public function getAllVersions($con = null) { @@ -3602,12 +3562,12 @@ abstract class Folder implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -3627,13 +3587,13 @@ abstract class Folder implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -3653,12 +3613,12 @@ abstract class Folder implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -3695,7 +3655,7 @@ abstract class Folder implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\FolderVersion[] List of \Thelia\Model\FolderVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) @@ -3782,7 +3742,6 @@ abstract class Folder implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php index 3abd5e1c6..5b1b9029b 100644 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -32,7 +32,6 @@ abstract class FolderDocument implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderDocumentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class FolderDocument implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderDocument The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [folder_id] column value. * - * @return int + * @return int */ public function getFolderId() { - return $this->folder_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class FolderDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class FolderDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class FolderDocument implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [folder_id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setFolderId($v) { @@ -518,15 +512,14 @@ abstract class FolderDocument implements ActiveRecordInterface $this->aFolder = null; } - return $this; } // setFolderId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class FolderDocument implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class FolderDocument implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class FolderDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class FolderDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class FolderDocument implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderDocument::setDeleted() @@ -790,8 +779,8 @@ abstract class FolderDocument implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class FolderDocument implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class FolderDocument implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class FolderDocument implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class FolderDocument implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class FolderDocument implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class FolderDocument implements ActiveRecordInterface if ($this->isColumnModified(FolderDocumentTableMap::POSITION)) $criteria->add(FolderDocumentTableMap::POSITION, $this->position); if ($this->isColumnModified(FolderDocumentTableMap::CREATED_AT)) $criteria->add(FolderDocumentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FolderDocumentTableMap::UPDATED_AT)) $criteria->add(FolderDocumentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class FolderDocument implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class FolderDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderDocument (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderDocument (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class FolderDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderDocument Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderDocument Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolder object. * - * @param ChildFolder $v - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param ChildFolder $v + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) * @throws PropelException */ public function setFolder(ChildFolder $v = null) @@ -1336,16 +1323,14 @@ abstract class FolderDocument implements ActiveRecordInterface $v->addFolderDocument($this); } - return $this; } - /** * Get the associated ChildFolder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolder The associated ChildFolder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolder The associated ChildFolder object. * @throws PropelException */ public function getFolder(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class FolderDocument implements ActiveRecordInterface return $this->aFolder; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class FolderDocument implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class FolderDocument implements ActiveRecordInterface * If this ChildFolderDocument is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderDocumentI18n[] List of ChildFolderDocumentI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class FolderDocument implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderDocumentI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolderDocument The current object (for fluent API support) + * @param Collection $folderDocumentI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolderDocument The current object (for fluent API support) */ public function setFolderDocumentI18ns(Collection $folderDocumentI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Returns the number of related FolderDocumentI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderDocumentI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderDocumentI18n objects. * @throws PropelException */ public function countFolderDocumentI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class FolderDocument implements ActiveRecordInterface * Method called to associate a ChildFolderDocumentI18n object to this object * through the ChildFolderDocumentI18n foreign key attribute. * - * @param ChildFolderDocumentI18n $l ChildFolderDocumentI18n - * @return \Thelia\Model\FolderDocument The current object (for fluent API support) + * @param ChildFolderDocumentI18n $l ChildFolderDocumentI18n + * @return \Thelia\Model\FolderDocument The current object (for fluent API support) */ public function addFolderDocumentI18n(ChildFolderDocumentI18n $l) { @@ -1587,7 +1571,7 @@ abstract class FolderDocument implements ActiveRecordInterface } /** - * @param FolderDocumentI18n $folderDocumentI18n The folderDocumentI18n object to remove. + * @param FolderDocumentI18n $folderDocumentI18n The folderDocumentI18n object to remove. * @return ChildFolderDocument The current object (for fluent API support) */ public function removeFolderDocumentI18n($folderDocumentI18n) @@ -1630,7 +1614,7 @@ abstract class FolderDocument implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFolderDocument The current object (for fluent API support) + * @return ChildFolderDocument The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildFolderDocument The current object (for fluent API support) + * @return ChildFolderDocument The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderDocumentI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildFolderDocument The current object (for fluent API support) + * @return ChildFolderDocument The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class FolderDocument implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderDocumentI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php index 57373f362..b18ce4163 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -26,7 +26,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderDocumentI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderDocumentI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->aFolderDocument = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[FolderDocumentI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FolderDocumentI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderDocumentI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface if ($this->isColumnModified(FolderDocumentI18nTableMap::DESCRIPTION)) $criteria->add(FolderDocumentI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(FolderDocumentI18nTableMap::CHAPO)) $criteria->add(FolderDocumentI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(FolderDocumentI18nTableMap::POSTSCRIPTUM)) $criteria->add(FolderDocumentI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderDocumentI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderDocumentI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderDocumentI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderDocumentI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolderDocument object. * - * @param ChildFolderDocument $v - * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) + * @param ChildFolderDocument $v + * @return \Thelia\Model\FolderDocumentI18n The current object (for fluent API support) * @throws PropelException */ public function setFolderDocument(ChildFolderDocument $v = null) @@ -1247,16 +1231,14 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface $v->addFolderDocumentI18n($this); } - return $this; } - /** * Get the associated ChildFolderDocument object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolderDocument The associated ChildFolderDocument object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolderDocument The associated ChildFolderDocument object. * @throws PropelException */ public function getFolderDocument(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php index f053ac652..5be9dcb5b 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php @@ -67,9 +67,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderDocumentI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderDocumentI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Returns a new ChildFolderDocumentI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderDocumentI18nQuery */ @@ -140,10 +140,10 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderDocumentI18n A model object, or null if the key is not found + * @return ChildFolderDocumentI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderDocumentI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * * @see filterByFolderDocument() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\FolderDocument object * * @param \Thelia\Model\FolderDocument|ObjectCollection $folderDocument The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderDocumentQuery A secondary query class using the current class as primary query */ public function useFolderDocumentQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderDocumentI18n $folderDocumentI18n Object to remove from the list of results + * @param ChildFolderDocumentI18n $folderDocumentI18n Object to remove from the list of results * * @return ChildFolderDocumentI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Deletes all rows from the folder_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class FolderDocumentI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderDocumentI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php index c438576a6..404330192 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php @@ -72,9 +72,9 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderDocumentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderDocument', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Returns a new ChildFolderDocumentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderDocumentQuery */ @@ -114,7 +114,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFolderDocument|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class FolderDocumentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderDocument A model object, or null if the key is not found + * @return ChildFolderDocument A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderDocument|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class FolderDocumentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FolderDocumentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FolderDocumentTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @see filterByFolder() * - * @param mixed $folderId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $folderId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class FolderDocumentQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class FolderDocumentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class FolderDocumentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Folder object * - * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Folder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query */ public function useFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderDocumentI18n object * - * @param \Thelia\Model\FolderDocumentI18n|ObjectCollection $folderDocumentI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderDocumentI18n|ObjectCollection $folderDocumentI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderDocumentI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderDocumentI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderDocumentI18nQuery A secondary query class using the current class as primary query */ public function useFolderDocumentI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderDocument $folderDocument Object to remove from the list of results + * @param ChildFolderDocument $folderDocument Object to remove from the list of results * * @return ChildFolderDocumentQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Deletes all rows from the folder_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class FolderDocumentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderDocumentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class FolderDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class FolderDocumentQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderDocumentQuery The current query, for fluid interface + * @return ChildFolderDocumentQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderDocumentI18nQuery A secondary query class using the current class as primary query + * @return ChildFolderDocumentI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php index 116d2b17c..be1df2654 100644 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -26,7 +26,6 @@ abstract class FolderI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class FolderI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderI18n The current object, for fluid interface */ @@ -395,107 +394,98 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Get the [meta_title] column value. * - * @return string + * @return string */ public function getMetaTitle() { - return $this->meta_title; } /** * Get the [meta_description] column value. * - * @return string + * @return string */ public function getMetaDescription() { - return $this->meta_description; } /** * Get the [meta_keywords] column value. * - * @return string + * @return string */ public function getMetaKeywords() { - return $this->meta_keywords; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setId($v) { @@ -512,15 +502,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->aFolder = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -533,15 +522,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -554,15 +542,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -575,15 +562,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -596,15 +582,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -617,15 +602,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() /** * Set the value of [meta_title] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setMetaTitle($v) { @@ -638,15 +622,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::META_TITLE] = true; } - return $this; } // setMetaTitle() /** * Set the value of [meta_description] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setMetaDescription($v) { @@ -659,15 +642,14 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::META_DESCRIPTION] = true; } - return $this; } // setMetaDescription() /** * Set the value of [meta_keywords] column. * - * @param string $v new value - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) */ public function setMetaKeywords($v) { @@ -680,7 +662,6 @@ abstract class FolderI18n implements ActiveRecordInterface $this->modifiedColumns[FolderI18nTableMap::META_KEYWORDS] = true; } - return $this; } // setMetaKeywords() @@ -724,7 +705,6 @@ abstract class FolderI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FolderI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -791,10 +771,10 @@ abstract class FolderI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -830,7 +810,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderI18n::setDeleted() @@ -873,8 +853,8 @@ abstract class FolderI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -924,8 +904,8 @@ abstract class FolderI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -968,7 +948,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1059,7 +1039,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1075,12 +1055,12 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1094,7 +1074,7 @@ abstract class FolderI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1139,12 +1119,12 @@ abstract class FolderI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1183,12 +1163,12 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1202,8 +1182,8 @@ abstract class FolderI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1252,8 +1232,8 @@ abstract class FolderI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1289,7 +1269,6 @@ abstract class FolderI18n implements ActiveRecordInterface if ($this->isColumnModified(FolderI18nTableMap::META_TITLE)) $criteria->add(FolderI18nTableMap::META_TITLE, $this->meta_title); if ($this->isColumnModified(FolderI18nTableMap::META_DESCRIPTION)) $criteria->add(FolderI18nTableMap::META_DESCRIPTION, $this->meta_description); if ($this->isColumnModified(FolderI18nTableMap::META_KEYWORDS)) $criteria->add(FolderI18nTableMap::META_KEYWORDS, $this->meta_keywords); - return $criteria; } @@ -1327,7 +1306,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1342,7 +1321,6 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1352,9 +1330,9 @@ abstract class FolderI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1381,8 +1359,8 @@ abstract class FolderI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1398,8 +1376,8 @@ abstract class FolderI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolder object. * - * @param ChildFolder $v - * @return \Thelia\Model\FolderI18n The current object (for fluent API support) + * @param ChildFolder $v + * @return \Thelia\Model\FolderI18n The current object (for fluent API support) * @throws PropelException */ public function setFolder(ChildFolder $v = null) @@ -1418,16 +1396,14 @@ abstract class FolderI18n implements ActiveRecordInterface $v->addFolderI18n($this); } - return $this; } - /** * Get the associated ChildFolder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolder The associated ChildFolder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolder The associated ChildFolder object. * @throws PropelException */ public function getFolder(ConnectionInterface $con = null) @@ -1475,7 +1451,7 @@ abstract class FolderI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FolderI18nQuery.php b/core/lib/Thelia/Model/Base/FolderI18nQuery.php index 787657033..c1d8f0fab 100644 --- a/core/lib/Thelia/Model/Base/FolderI18nQuery.php +++ b/core/lib/Thelia/Model/Base/FolderI18nQuery.php @@ -79,9 +79,9 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderI18n', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Returns a new ChildFolderI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderI18nQuery */ @@ -152,10 +152,10 @@ abstract class FolderI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderI18n A model object, or null if the key is not found + * @return ChildFolderI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderI18n|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class FolderI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class FolderI18nQuery extends ModelCriteria * * @see filterByFolder() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -312,9 +312,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -341,9 +341,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -370,9 +370,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -399,9 +399,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -428,9 +428,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -457,9 +457,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByMetaTitle('%fooValue%'); // WHERE meta_title LIKE '%fooValue%' * * - * @param string $metaTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -486,9 +486,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByMetaDescription('%fooValue%'); // WHERE meta_description LIKE '%fooValue%' * * - * @param string $metaDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -515,9 +515,9 @@ abstract class FolderI18nQuery extends ModelCriteria * $query->filterByMetaKeywords('%fooValue%'); // WHERE meta_keywords LIKE '%fooValue%' * * - * @param string $metaKeywords The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaKeywords The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -538,8 +538,8 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Folder object * - * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -563,8 +563,8 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Folder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -597,11 +597,11 @@ abstract class FolderI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query */ public function useFolderQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -613,7 +613,7 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderI18n $folderI18n Object to remove from the list of results + * @param ChildFolderI18n $folderI18n Object to remove from the list of results * * @return ChildFolderI18nQuery The current query, for fluid interface */ @@ -631,8 +631,8 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Deletes all rows from the folder_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -663,13 +663,13 @@ abstract class FolderI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -689,7 +689,6 @@ abstract class FolderI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php index d32b11d39..c97945a82 100644 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -32,7 +32,6 @@ abstract class FolderImage implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderImageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class FolderImage implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderImage The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class FolderImage implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [folder_id] column value. * - * @return int + * @return int */ public function getFolderId() { - return $this->folder_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class FolderImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class FolderImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class FolderImage implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class FolderImage implements ActiveRecordInterface $this->modifiedColumns[FolderImageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [folder_id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setFolderId($v) { @@ -518,15 +512,14 @@ abstract class FolderImage implements ActiveRecordInterface $this->aFolder = null; } - return $this; } // setFolderId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class FolderImage implements ActiveRecordInterface $this->modifiedColumns[FolderImageTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class FolderImage implements ActiveRecordInterface $this->modifiedColumns[FolderImageTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class FolderImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class FolderImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class FolderImage implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderImage::setDeleted() @@ -790,8 +779,8 @@ abstract class FolderImage implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class FolderImage implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class FolderImage implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class FolderImage implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class FolderImage implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class FolderImage implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class FolderImage implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class FolderImage implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class FolderImage implements ActiveRecordInterface if ($this->isColumnModified(FolderImageTableMap::POSITION)) $criteria->add(FolderImageTableMap::POSITION, $this->position); if ($this->isColumnModified(FolderImageTableMap::CREATED_AT)) $criteria->add(FolderImageTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(FolderImageTableMap::UPDATED_AT)) $criteria->add(FolderImageTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class FolderImage implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class FolderImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderImage (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderImage (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class FolderImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderImage Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderImage Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class FolderImage implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolder object. * - * @param ChildFolder $v - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param ChildFolder $v + * @return \Thelia\Model\FolderImage The current object (for fluent API support) * @throws PropelException */ public function setFolder(ChildFolder $v = null) @@ -1336,16 +1323,14 @@ abstract class FolderImage implements ActiveRecordInterface $v->addFolderImage($this); } - return $this; } - /** * Get the associated ChildFolder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolder The associated ChildFolder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolder The associated ChildFolder object. * @throws PropelException */ public function getFolder(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class FolderImage implements ActiveRecordInterface return $this->aFolder; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class FolderImage implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class FolderImage implements ActiveRecordInterface * If this ChildFolderImage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFolderImageI18n[] List of ChildFolderImageI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class FolderImage implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $folderImageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolderImage The current object (for fluent API support) + * @param Collection $folderImageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolderImage The current object (for fluent API support) */ public function setFolderImageI18ns(Collection $folderImageI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class FolderImage implements ActiveRecordInterface /** * Returns the number of related FolderImageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FolderImageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FolderImageI18n objects. * @throws PropelException */ public function countFolderImageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class FolderImage implements ActiveRecordInterface * Method called to associate a ChildFolderImageI18n object to this object * through the ChildFolderImageI18n foreign key attribute. * - * @param ChildFolderImageI18n $l ChildFolderImageI18n - * @return \Thelia\Model\FolderImage The current object (for fluent API support) + * @param ChildFolderImageI18n $l ChildFolderImageI18n + * @return \Thelia\Model\FolderImage The current object (for fluent API support) */ public function addFolderImageI18n(ChildFolderImageI18n $l) { @@ -1587,7 +1571,7 @@ abstract class FolderImage implements ActiveRecordInterface } /** - * @param FolderImageI18n $folderImageI18n The folderImageI18n object to remove. + * @param FolderImageI18n $folderImageI18n The folderImageI18n object to remove. * @return ChildFolderImage The current object (for fluent API support) */ public function removeFolderImageI18n($folderImageI18n) @@ -1630,7 +1614,7 @@ abstract class FolderImage implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildFolderImage The current object (for fluent API support) + * @return ChildFolderImage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class FolderImage implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildFolderImage The current object (for fluent API support) + * @return ChildFolderImage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class FolderImage implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderImageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class FolderImage implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildFolderImage The current object (for fluent API support) + * @return ChildFolderImage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class FolderImage implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildFolderImageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php index 6155871b6..7b35c18e7 100644 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -26,7 +26,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderImageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class FolderImageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderImageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->aFolderImage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->modifiedColumns[FolderImageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->modifiedColumns[FolderImageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->modifiedColumns[FolderImageI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->modifiedColumns[FolderImageI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface $this->modifiedColumns[FolderImageI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FolderImageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class FolderImageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderImageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class FolderImageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface if ($this->isColumnModified(FolderImageI18nTableMap::DESCRIPTION)) $criteria->add(FolderImageI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(FolderImageI18nTableMap::CHAPO)) $criteria->add(FolderImageI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(FolderImageI18nTableMap::POSTSCRIPTUM)) $criteria->add(FolderImageI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class FolderImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderImageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderImageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderImageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderImageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolderImage object. * - * @param ChildFolderImage $v - * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) + * @param ChildFolderImage $v + * @return \Thelia\Model\FolderImageI18n The current object (for fluent API support) * @throws PropelException */ public function setFolderImage(ChildFolderImage $v = null) @@ -1247,16 +1231,14 @@ abstract class FolderImageI18n implements ActiveRecordInterface $v->addFolderImageI18n($this); } - return $this; } - /** * Get the associated ChildFolderImage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolderImage The associated ChildFolderImage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolderImage The associated ChildFolderImage object. * @throws PropelException */ public function getFolderImage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php b/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php index 15381439b..72543aec5 100644 --- a/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php @@ -67,9 +67,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderImageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderImageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Returns a new ChildFolderImageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderImageI18nQuery */ @@ -140,10 +140,10 @@ abstract class FolderImageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderImageI18n A model object, or null if the key is not found + * @return ChildFolderImageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderImageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class FolderImageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class FolderImageI18nQuery extends ModelCriteria * * @see filterByFolderImage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class FolderImageI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class FolderImageI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\FolderImage object * * @param \Thelia\Model\FolderImage|ObjectCollection $folderImage The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class FolderImageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderImageQuery A secondary query class using the current class as primary query */ public function useFolderImageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderImageI18n $folderImageI18n Object to remove from the list of results + * @param ChildFolderImageI18n $folderImageI18n Object to remove from the list of results * * @return ChildFolderImageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Deletes all rows from the folder_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class FolderImageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class FolderImageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderImageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/FolderImageQuery.php b/core/lib/Thelia/Model/Base/FolderImageQuery.php index 6466b83a3..d967c88b0 100644 --- a/core/lib/Thelia/Model/Base/FolderImageQuery.php +++ b/core/lib/Thelia/Model/Base/FolderImageQuery.php @@ -72,9 +72,9 @@ abstract class FolderImageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderImageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderImage', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Returns a new ChildFolderImageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderImageQuery */ @@ -114,7 +114,7 @@ abstract class FolderImageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFolderImage|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class FolderImageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderImage A model object, or null if the key is not found + * @return ChildFolderImage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderImage|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class FolderImageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class FolderImageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderImageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FolderImageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderImageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FolderImageTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class FolderImageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class FolderImageQuery extends ModelCriteria * * @see filterByFolder() * - * @param mixed $folderId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $folderId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class FolderImageQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class FolderImageQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class FolderImageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class FolderImageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Folder object * - * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Folder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class FolderImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query */ public function useFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderImageI18n object * - * @param \Thelia\Model\FolderImageI18n|ObjectCollection $folderImageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderImageI18n|ObjectCollection $folderImageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderImageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class FolderImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderImageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderImageI18nQuery A secondary query class using the current class as primary query */ public function useFolderImageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class FolderImageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderImage $folderImage Object to remove from the list of results + * @param ChildFolderImage $folderImage Object to remove from the list of results * * @return ChildFolderImageQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class FolderImageQuery extends ModelCriteria /** * Deletes all rows from the folder_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class FolderImageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class FolderImageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderImageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class FolderImageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class FolderImageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class FolderImageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class FolderImageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class FolderImageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class FolderImageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class FolderImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class FolderImageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderImageQuery The current query, for fluid interface + * @return ChildFolderImageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class FolderImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderImageI18nQuery A secondary query class using the current class as primary query + * @return ChildFolderImageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php index 473ad2234..822169704 100644 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -103,9 +103,9 @@ abstract class FolderQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Folder', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class FolderQuery extends ModelCriteria /** * Returns a new ChildFolderQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderQuery */ @@ -145,7 +145,7 @@ abstract class FolderQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildFolder|array|mixed the result, formatted by the current formatter @@ -176,10 +176,10 @@ abstract class FolderQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolder A model object, or null if the key is not found + * @return ChildFolder A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -206,8 +206,8 @@ abstract class FolderQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolder|array|mixed the result, formatted by the current formatter */ @@ -227,8 +227,8 @@ abstract class FolderQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -249,26 +249,24 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(FolderTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(FolderTableMap::ID, $keys, Criteria::IN); } @@ -282,11 +280,11 @@ abstract class FolderQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -323,11 +321,11 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByParent(array('min' => 12)); // WHERE parent > 12 * * - * @param mixed $parent The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $parent The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -405,11 +403,11 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -446,13 +444,13 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -489,13 +487,13 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -532,11 +530,11 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -573,13 +571,13 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -615,9 +613,9 @@ abstract class FolderQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -638,8 +636,8 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ContentFolder object * - * @param \Thelia\Model\ContentFolder|ObjectCollection $contentFolder the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ContentFolder|ObjectCollection $contentFolder the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -661,8 +659,8 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ContentFolder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderQuery The current query, for fluid interface */ @@ -695,11 +693,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentFolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentFolderQuery A secondary query class using the current class as primary query */ public function useContentFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -711,8 +709,8 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderImage object * - * @param \Thelia\Model\FolderImage|ObjectCollection $folderImage the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderImage|ObjectCollection $folderImage the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -734,8 +732,8 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderQuery The current query, for fluid interface */ @@ -768,11 +766,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderImageQuery A secondary query class using the current class as primary query */ public function useFolderImageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -784,8 +782,8 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderDocument object * - * @param \Thelia\Model\FolderDocument|ObjectCollection $folderDocument the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderDocument|ObjectCollection $folderDocument the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -807,8 +805,8 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderQuery The current query, for fluid interface */ @@ -841,11 +839,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderDocumentQuery A secondary query class using the current class as primary query */ public function useFolderDocumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -857,8 +855,8 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderI18n object * - * @param \Thelia\Model\FolderI18n|ObjectCollection $folderI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderI18n|ObjectCollection $folderI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -880,8 +878,8 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderQuery The current query, for fluid interface */ @@ -914,11 +912,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderI18nQuery A secondary query class using the current class as primary query */ public function useFolderI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -930,8 +928,8 @@ abstract class FolderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FolderVersion object * - * @param \Thelia\Model\FolderVersion|ObjectCollection $folderVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FolderVersion|ObjectCollection $folderVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -953,8 +951,8 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FolderVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderQuery The current query, for fluid interface */ @@ -987,11 +985,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderVersionQuery A secondary query class using the current class as primary query */ public function useFolderVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1004,8 +1002,8 @@ abstract class FolderQuery extends ModelCriteria * Filter the query by a related Content object * using the content_folder table as cross reference * - * @param Content $content the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Content $content the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderQuery The current query, for fluid interface */ @@ -1020,7 +1018,7 @@ abstract class FolderQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolder $folder Object to remove from the list of results + * @param ChildFolder $folder Object to remove from the list of results * * @return ChildFolderQuery The current query, for fluid interface */ @@ -1036,8 +1034,8 @@ abstract class FolderQuery extends ModelCriteria /** * Deletes all rows from the folder table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1068,13 +1066,13 @@ abstract class FolderQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolder or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolder object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolder object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1094,7 +1092,6 @@ abstract class FolderQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1113,9 +1110,9 @@ abstract class FolderQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1125,9 +1122,9 @@ abstract class FolderQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1137,7 +1134,7 @@ abstract class FolderQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1147,7 +1144,7 @@ abstract class FolderQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1157,7 +1154,7 @@ abstract class FolderQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1167,7 +1164,7 @@ abstract class FolderQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1179,11 +1176,11 @@ abstract class FolderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1198,10 +1195,10 @@ abstract class FolderQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderQuery The current query, for fluid interface + * @return ChildFolderQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1218,11 +1215,11 @@ abstract class FolderQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildFolderI18nQuery A secondary query class using the current class as primary query + * @return ChildFolderI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1238,7 +1235,7 @@ abstract class FolderQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1246,7 +1243,7 @@ abstract class FolderQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1254,7 +1251,7 @@ abstract class FolderQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php index f7718dd5b..a5771ac4b 100644 --- a/core/lib/Thelia/Model/Base/FolderVersion.php +++ b/core/lib/Thelia/Model/Base/FolderVersion.php @@ -28,7 +28,6 @@ abstract class FolderVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\FolderVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -345,9 +344,9 @@ abstract class FolderVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return FolderVersion The current object, for fluid interface */ @@ -397,44 +396,40 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [parent] column value. * - * @return int + * @return int */ public function getParent() { - return $this->parent; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -442,8 +437,8 @@ abstract class FolderVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -462,8 +457,8 @@ abstract class FolderVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -481,11 +476,10 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -493,8 +487,8 @@ abstract class FolderVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -512,19 +506,18 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setId($v) { @@ -541,15 +534,14 @@ abstract class FolderVersion implements ActiveRecordInterface $this->aFolder = null; } - return $this; } // setId() /** * Set the value of [parent] column. * - * @param int $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setParent($v) { @@ -562,15 +554,14 @@ abstract class FolderVersion implements ActiveRecordInterface $this->modifiedColumns[FolderVersionTableMap::PARENT] = true; } - return $this; } // setParent() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setVisible($v) { @@ -583,15 +574,14 @@ abstract class FolderVersion implements ActiveRecordInterface $this->modifiedColumns[FolderVersionTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setPosition($v) { @@ -604,16 +594,15 @@ abstract class FolderVersion implements ActiveRecordInterface $this->modifiedColumns[FolderVersionTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -625,16 +614,15 @@ abstract class FolderVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -646,15 +634,14 @@ abstract class FolderVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -667,16 +654,15 @@ abstract class FolderVersion implements ActiveRecordInterface $this->modifiedColumns[FolderVersionTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -688,15 +674,14 @@ abstract class FolderVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -709,7 +694,6 @@ abstract class FolderVersion implements ActiveRecordInterface $this->modifiedColumns[FolderVersionTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -753,7 +737,6 @@ abstract class FolderVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FolderVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -829,10 +812,10 @@ abstract class FolderVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -868,7 +851,7 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see FolderVersion::setDeleted() @@ -911,8 +894,8 @@ abstract class FolderVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -962,8 +945,8 @@ abstract class FolderVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1006,7 +989,7 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1097,7 +1080,7 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1113,12 +1096,12 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1132,7 +1115,7 @@ abstract class FolderVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1177,12 +1160,12 @@ abstract class FolderVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1221,12 +1204,12 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1240,8 +1223,8 @@ abstract class FolderVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1290,8 +1273,8 @@ abstract class FolderVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1327,7 +1310,6 @@ abstract class FolderVersion implements ActiveRecordInterface if ($this->isColumnModified(FolderVersionTableMap::VERSION)) $criteria->add(FolderVersionTableMap::VERSION, $this->version); if ($this->isColumnModified(FolderVersionTableMap::VERSION_CREATED_AT)) $criteria->add(FolderVersionTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(FolderVersionTableMap::VERSION_CREATED_BY)) $criteria->add(FolderVersionTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1365,7 +1347,7 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1380,7 +1362,6 @@ abstract class FolderVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1390,9 +1371,9 @@ abstract class FolderVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\FolderVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\FolderVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1419,8 +1400,8 @@ abstract class FolderVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\FolderVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\FolderVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1436,8 +1417,8 @@ abstract class FolderVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildFolder object. * - * @param ChildFolder $v - * @return \Thelia\Model\FolderVersion The current object (for fluent API support) + * @param ChildFolder $v + * @return \Thelia\Model\FolderVersion The current object (for fluent API support) * @throws PropelException */ public function setFolder(ChildFolder $v = null) @@ -1456,16 +1437,14 @@ abstract class FolderVersion implements ActiveRecordInterface $v->addFolderVersion($this); } - return $this; } - /** * Get the associated ChildFolder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildFolder The associated ChildFolder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildFolder The associated ChildFolder object. * @throws PropelException */ public function getFolder(ConnectionInterface $con = null) @@ -1513,7 +1492,7 @@ abstract class FolderVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/FolderVersionQuery.php b/core/lib/Thelia/Model/Base/FolderVersionQuery.php index 086551003..a5c96aead 100644 --- a/core/lib/Thelia/Model/Base/FolderVersionQuery.php +++ b/core/lib/Thelia/Model/Base/FolderVersionQuery.php @@ -79,9 +79,9 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\FolderVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FolderVersion', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Returns a new ChildFolderVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildFolderVersionQuery */ @@ -152,10 +152,10 @@ abstract class FolderVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildFolderVersion A model object, or null if the key is not found + * @return ChildFolderVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildFolderVersion|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class FolderVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class FolderVersionQuery extends ModelCriteria * * @see filterByFolder() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -313,11 +313,11 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByParent(array('min' => 12)); // WHERE parent > 12 * * - * @param mixed $parent The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $parent The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -354,11 +354,11 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -395,11 +395,11 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -436,13 +436,13 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -479,13 +479,13 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -522,11 +522,11 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -563,13 +563,13 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -605,9 +605,9 @@ abstract class FolderVersionQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -628,8 +628,8 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Folder object * - * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -653,8 +653,8 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Folder relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -687,11 +687,11 @@ abstract class FolderVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query */ public function useFolderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -703,7 +703,7 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildFolderVersion $folderVersion Object to remove from the list of results + * @param ChildFolderVersion $folderVersion Object to remove from the list of results * * @return ChildFolderVersionQuery The current query, for fluid interface */ @@ -721,8 +721,8 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Deletes all rows from the folder_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -753,13 +753,13 @@ abstract class FolderVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildFolderVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildFolderVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildFolderVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -779,7 +779,6 @@ abstract class FolderVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - FolderVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php index c2e99c32a..056a70ba4 100644 --- a/core/lib/Thelia/Model/Base/Lang.php +++ b/core/lib/Thelia/Model/Base/Lang.php @@ -30,7 +30,6 @@ abstract class Lang implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\LangTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -376,9 +375,9 @@ abstract class Lang implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Lang The current object, for fluid interface */ @@ -428,143 +427,130 @@ abstract class Lang implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [url] column value. * - * @return string + * @return string */ public function getUrl() { - return $this->url; } /** * Get the [date_format] column value. * - * @return string + * @return string */ public function getDateFormat() { - return $this->date_format; } /** * Get the [time_format] column value. * - * @return string + * @return string */ public function getTimeFormat() { - return $this->time_format; } /** * Get the [datetime_format] column value. * - * @return string + * @return string */ public function getDatetimeFormat() { - return $this->datetime_format; } /** * Get the [decimal_separator] column value. * - * @return string + * @return string */ public function getDecimalSeparator() { - return $this->decimal_separator; } /** * Get the [thousands_separator] column value. * - * @return string + * @return string */ public function getThousandsSeparator() { - return $this->thousands_separator; } /** * Get the [decimals] column value. * - * @return string + * @return string */ public function getDecimals() { - return $this->decimals; } /** * Get the [by_default] column value. * - * @return int + * @return int */ public function getByDefault() { - return $this->by_default; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -572,8 +558,8 @@ abstract class Lang implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -592,8 +578,8 @@ abstract class Lang implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -611,8 +597,8 @@ abstract class Lang implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setId($v) { @@ -625,15 +611,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setTitle($v) { @@ -646,15 +631,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setCode($v) { @@ -667,15 +651,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setLocale($v) { @@ -688,15 +671,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [url] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setUrl($v) { @@ -709,15 +691,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::URL] = true; } - return $this; } // setUrl() /** * Set the value of [date_format] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setDateFormat($v) { @@ -730,15 +711,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::DATE_FORMAT] = true; } - return $this; } // setDateFormat() /** * Set the value of [time_format] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setTimeFormat($v) { @@ -751,15 +731,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::TIME_FORMAT] = true; } - return $this; } // setTimeFormat() /** * Set the value of [datetime_format] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setDatetimeFormat($v) { @@ -772,15 +751,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::DATETIME_FORMAT] = true; } - return $this; } // setDatetimeFormat() /** * Set the value of [decimal_separator] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setDecimalSeparator($v) { @@ -793,15 +771,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::DECIMAL_SEPARATOR] = true; } - return $this; } // setDecimalSeparator() /** * Set the value of [thousands_separator] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setThousandsSeparator($v) { @@ -814,15 +791,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::THOUSANDS_SEPARATOR] = true; } - return $this; } // setThousandsSeparator() /** * Set the value of [decimals] column. * - * @param string $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setDecimals($v) { @@ -835,15 +811,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::DECIMALS] = true; } - return $this; } // setDecimals() /** * Set the value of [by_default] column. * - * @param int $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setByDefault($v) { @@ -856,15 +831,14 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::BY_DEFAULT] = true; } - return $this; } // setByDefault() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setPosition($v) { @@ -877,16 +851,15 @@ abstract class Lang implements ActiveRecordInterface $this->modifiedColumns[LangTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -898,16 +871,15 @@ abstract class Lang implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -919,7 +891,6 @@ abstract class Lang implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1047,10 +1018,10 @@ abstract class Lang implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1087,7 +1058,7 @@ abstract class Lang implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Lang::setDeleted() @@ -1130,8 +1101,8 @@ abstract class Lang implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1192,8 +1163,8 @@ abstract class Lang implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1241,7 +1212,7 @@ abstract class Lang implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1379,7 +1350,7 @@ abstract class Lang implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1395,12 +1366,12 @@ abstract class Lang implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1414,7 +1385,7 @@ abstract class Lang implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1477,12 +1448,12 @@ abstract class Lang implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1527,12 +1498,12 @@ abstract class Lang implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1546,8 +1517,8 @@ abstract class Lang implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1614,8 +1585,8 @@ abstract class Lang implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1663,7 +1634,6 @@ abstract class Lang implements ActiveRecordInterface if ($this->isColumnModified(LangTableMap::POSITION)) $criteria->add(LangTableMap::POSITION, $this->position); if ($this->isColumnModified(LangTableMap::CREATED_AT)) $criteria->add(LangTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(LangTableMap::UPDATED_AT)) $criteria->add(LangTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1685,7 +1655,7 @@ abstract class Lang implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1695,7 +1665,7 @@ abstract class Lang implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1709,7 +1679,6 @@ abstract class Lang implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1719,9 +1688,9 @@ abstract class Lang implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Lang (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Lang (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1768,8 +1737,8 @@ abstract class Lang implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Lang Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Lang Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1782,13 +1751,12 @@ abstract class Lang implements ActiveRecordInterface return $copyObj; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1827,8 +1795,8 @@ abstract class Lang implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1850,8 +1818,8 @@ abstract class Lang implements ActiveRecordInterface * If this ChildLang is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -1907,9 +1875,9 @@ abstract class Lang implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildLang The current object (for fluent API support) + * @param Collection $orders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildLang The current object (for fluent API support) */ public function setOrders(Collection $orders, ConnectionInterface $con = null) { @@ -1936,10 +1904,10 @@ abstract class Lang implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1971,8 +1939,8 @@ abstract class Lang implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\Lang The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\Lang The current object (for fluent API support) */ public function addOrder(ChildOrder $l) { @@ -1998,7 +1966,7 @@ abstract class Lang implements ActiveRecordInterface } /** - * @param Order $order The order object to remove. + * @param Order $order The order object to remove. * @return ChildLang The current object (for fluent API support) */ public function removeOrder($order) @@ -2028,9 +1996,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2053,9 +2021,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2078,9 +2046,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2103,9 +2071,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2128,9 +2096,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2153,9 +2121,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2178,9 +2146,9 @@ abstract class Lang implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Lang. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2225,7 +2193,7 @@ abstract class Lang implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2255,7 +2223,7 @@ abstract class Lang implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildLang The current object (for fluent API support) + * @return ChildLang The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/LangQuery.php b/core/lib/Thelia/Model/Base/LangQuery.php index f4f480fa9..d6cdaa33c 100644 --- a/core/lib/Thelia/Model/Base/LangQuery.php +++ b/core/lib/Thelia/Model/Base/LangQuery.php @@ -103,9 +103,9 @@ abstract class LangQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\LangQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Lang', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class LangQuery extends ModelCriteria /** * Returns a new ChildLangQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildLangQuery */ @@ -145,7 +145,7 @@ abstract class LangQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildLang|array|mixed the result, formatted by the current formatter @@ -176,10 +176,10 @@ abstract class LangQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildLang A model object, or null if the key is not found + * @return ChildLang A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -206,8 +206,8 @@ abstract class LangQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildLang|array|mixed the result, formatted by the current formatter */ @@ -227,8 +227,8 @@ abstract class LangQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -249,26 +249,24 @@ abstract class LangQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildLangQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(LangTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildLangQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(LangTableMap::ID, $keys, Criteria::IN); } @@ -282,11 +280,11 @@ abstract class LangQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -322,9 +320,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -351,9 +349,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -380,9 +378,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -409,9 +407,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByUrl('%fooValue%'); // WHERE url LIKE '%fooValue%' * * - * @param string $url The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $url The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -438,9 +436,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByDateFormat('%fooValue%'); // WHERE date_format LIKE '%fooValue%' * * - * @param string $dateFormat The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $dateFormat The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -467,9 +465,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByTimeFormat('%fooValue%'); // WHERE time_format LIKE '%fooValue%' * * - * @param string $timeFormat The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $timeFormat The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -496,9 +494,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByDatetimeFormat('%fooValue%'); // WHERE datetime_format LIKE '%fooValue%' * * - * @param string $datetimeFormat The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $datetimeFormat The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -525,9 +523,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByDecimalSeparator('%fooValue%'); // WHERE decimal_separator LIKE '%fooValue%' * * - * @param string $decimalSeparator The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $decimalSeparator The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -554,9 +552,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByThousandsSeparator('%fooValue%'); // WHERE thousands_separator LIKE '%fooValue%' * * - * @param string $thousandsSeparator The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $thousandsSeparator The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -583,9 +581,9 @@ abstract class LangQuery extends ModelCriteria * $query->filterByDecimals('%fooValue%'); // WHERE decimals LIKE '%fooValue%' * * - * @param string $decimals The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $decimals The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -613,11 +611,11 @@ abstract class LangQuery extends ModelCriteria * $query->filterByByDefault(array('min' => 12)); // WHERE by_default > 12 * * - * @param mixed $byDefault The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $byDefault The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -654,11 +652,11 @@ abstract class LangQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -695,13 +693,13 @@ abstract class LangQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -738,13 +736,13 @@ abstract class LangQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -774,8 +772,8 @@ abstract class LangQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildLangQuery The current query, for fluid interface */ @@ -797,8 +795,8 @@ abstract class LangQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildLangQuery The current query, for fluid interface */ @@ -831,11 +829,11 @@ abstract class LangQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -847,7 +845,7 @@ abstract class LangQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildLang $lang Object to remove from the list of results + * @param ChildLang $lang Object to remove from the list of results * * @return ChildLangQuery The current query, for fluid interface */ @@ -863,8 +861,8 @@ abstract class LangQuery extends ModelCriteria /** * Deletes all rows from the lang table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -895,13 +893,13 @@ abstract class LangQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildLang or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildLang object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildLang object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -921,7 +919,6 @@ abstract class LangQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - LangTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -940,9 +937,9 @@ abstract class LangQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -952,9 +949,9 @@ abstract class LangQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -964,7 +961,7 @@ abstract class LangQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -974,7 +971,7 @@ abstract class LangQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -984,7 +981,7 @@ abstract class LangQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -994,7 +991,7 @@ abstract class LangQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildLangQuery The current query, for fluid interface + * @return ChildLangQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php index a9e7dde84..a8298277c 100644 --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -33,7 +33,6 @@ abstract class Message implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\MessageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -169,7 +168,6 @@ abstract class Message implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -409,9 +407,9 @@ abstract class Message implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Message The current object, for fluid interface */ @@ -461,77 +459,70 @@ abstract class Message implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Get the [secured] column value. * - * @return int + * @return int */ public function getSecured() { - return $this->secured; } /** * Get the [text_layout_file_name] column value. * - * @return string + * @return string */ public function getTextLayoutFileName() { - return $this->text_layout_file_name; } /** * Get the [text_template_file_name] column value. * - * @return string + * @return string */ public function getTextTemplateFileName() { - return $this->text_template_file_name; } /** * Get the [html_layout_file_name] column value. * - * @return string + * @return string */ public function getHtmlLayoutFileName() { - return $this->html_layout_file_name; } /** * Get the [html_template_file_name] column value. * - * @return string + * @return string */ public function getHtmlTemplateFileName() { - return $this->html_template_file_name; } @@ -539,8 +530,8 @@ abstract class Message implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -559,8 +550,8 @@ abstract class Message implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -578,11 +569,10 @@ abstract class Message implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -590,8 +580,8 @@ abstract class Message implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -609,19 +599,18 @@ abstract class Message implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setId($v) { @@ -634,15 +623,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setName($v) { @@ -655,15 +643,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::NAME] = true; } - return $this; } // setName() /** * Set the value of [secured] column. * - * @param int $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setSecured($v) { @@ -676,15 +663,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::SECURED] = true; } - return $this; } // setSecured() /** * Set the value of [text_layout_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setTextLayoutFileName($v) { @@ -697,15 +683,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::TEXT_LAYOUT_FILE_NAME] = true; } - return $this; } // setTextLayoutFileName() /** * Set the value of [text_template_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setTextTemplateFileName($v) { @@ -718,15 +703,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::TEXT_TEMPLATE_FILE_NAME] = true; } - return $this; } // setTextTemplateFileName() /** * Set the value of [html_layout_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setHtmlLayoutFileName($v) { @@ -739,15 +723,14 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::HTML_LAYOUT_FILE_NAME] = true; } - return $this; } // setHtmlLayoutFileName() /** * Set the value of [html_template_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setHtmlTemplateFileName($v) { @@ -760,16 +743,15 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::HTML_TEMPLATE_FILE_NAME] = true; } - return $this; } // setHtmlTemplateFileName() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -781,16 +763,15 @@ abstract class Message implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -802,15 +783,14 @@ abstract class Message implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setVersion($v) { @@ -823,16 +803,15 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -844,15 +823,14 @@ abstract class Message implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -865,7 +843,6 @@ abstract class Message implements ActiveRecordInterface $this->modifiedColumns[MessageTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -909,7 +886,6 @@ abstract class Message implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : MessageTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -991,10 +967,10 @@ abstract class Message implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1033,7 +1009,7 @@ abstract class Message implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Message::setDeleted() @@ -1076,8 +1052,8 @@ abstract class Message implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1150,8 +1126,8 @@ abstract class Message implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1216,7 +1192,7 @@ abstract class Message implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1336,7 +1312,7 @@ abstract class Message implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1352,12 +1328,12 @@ abstract class Message implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1371,7 +1347,7 @@ abstract class Message implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1425,12 +1401,12 @@ abstract class Message implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1475,12 +1451,12 @@ abstract class Message implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1494,8 +1470,8 @@ abstract class Message implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1553,8 +1529,8 @@ abstract class Message implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1596,7 +1572,6 @@ abstract class Message implements ActiveRecordInterface if ($this->isColumnModified(MessageTableMap::VERSION)) $criteria->add(MessageTableMap::VERSION, $this->version); if ($this->isColumnModified(MessageTableMap::VERSION_CREATED_AT)) $criteria->add(MessageTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(MessageTableMap::VERSION_CREATED_BY)) $criteria->add(MessageTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1618,7 +1593,7 @@ abstract class Message implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1628,7 +1603,7 @@ abstract class Message implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1642,7 +1617,6 @@ abstract class Message implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1652,9 +1626,9 @@ abstract class Message implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Message (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Message (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1704,8 +1678,8 @@ abstract class Message implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Message Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Message Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1718,13 +1692,12 @@ abstract class Message implements ActiveRecordInterface return $copyObj; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1766,8 +1739,8 @@ abstract class Message implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1789,8 +1762,8 @@ abstract class Message implements ActiveRecordInterface * If this ChildMessage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildMessageI18n[] List of ChildMessageI18n objects * @throws PropelException */ @@ -1846,9 +1819,9 @@ abstract class Message implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $messageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildMessage The current object (for fluent API support) + * @param Collection $messageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildMessage The current object (for fluent API support) */ public function setMessageI18ns(Collection $messageI18ns, ConnectionInterface $con = null) { @@ -1878,10 +1851,10 @@ abstract class Message implements ActiveRecordInterface /** * Returns the number of related MessageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related MessageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related MessageI18n objects. * @throws PropelException */ public function countMessageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1913,8 +1886,8 @@ abstract class Message implements ActiveRecordInterface * Method called to associate a ChildMessageI18n object to this object * through the ChildMessageI18n foreign key attribute. * - * @param ChildMessageI18n $l ChildMessageI18n - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param ChildMessageI18n $l ChildMessageI18n + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function addMessageI18n(ChildMessageI18n $l) { @@ -1944,7 +1917,7 @@ abstract class Message implements ActiveRecordInterface } /** - * @param MessageI18n $messageI18n The messageI18n object to remove. + * @param MessageI18n $messageI18n The messageI18n object to remove. * @return ChildMessage The current object (for fluent API support) */ public function removeMessageI18n($messageI18n) @@ -1991,8 +1964,8 @@ abstract class Message implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2014,8 +1987,8 @@ abstract class Message implements ActiveRecordInterface * If this ChildMessage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildMessageVersion[] List of ChildMessageVersion objects * @throws PropelException */ @@ -2071,9 +2044,9 @@ abstract class Message implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $messageVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildMessage The current object (for fluent API support) + * @param Collection $messageVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildMessage The current object (for fluent API support) */ public function setMessageVersions(Collection $messageVersions, ConnectionInterface $con = null) { @@ -2103,10 +2076,10 @@ abstract class Message implements ActiveRecordInterface /** * Returns the number of related MessageVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related MessageVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related MessageVersion objects. * @throws PropelException */ public function countMessageVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2138,8 +2111,8 @@ abstract class Message implements ActiveRecordInterface * Method called to associate a ChildMessageVersion object to this object * through the ChildMessageVersion foreign key attribute. * - * @param ChildMessageVersion $l ChildMessageVersion - * @return \Thelia\Model\Message The current object (for fluent API support) + * @param ChildMessageVersion $l ChildMessageVersion + * @return \Thelia\Model\Message The current object (for fluent API support) */ public function addMessageVersion(ChildMessageVersion $l) { @@ -2166,7 +2139,7 @@ abstract class Message implements ActiveRecordInterface /** * @param MessageVersion $messageVersion The messageVersion object to remove. - * @return ChildMessage The current object (for fluent API support) + * @return ChildMessage The current object (for fluent API support) */ public function removeMessageVersion($messageVersion) { @@ -2215,7 +2188,7 @@ abstract class Message implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2255,7 +2228,7 @@ abstract class Message implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildMessage The current object (for fluent API support) + * @return ChildMessage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2269,9 +2242,9 @@ abstract class Message implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildMessage The current object (for fluent API support) + * @return ChildMessage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2283,7 +2256,7 @@ abstract class Message implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2293,8 +2266,8 @@ abstract class Message implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildMessageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2327,10 +2300,10 @@ abstract class Message implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildMessage The current object (for fluent API support) + * @return ChildMessage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2355,7 +2328,7 @@ abstract class Message implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildMessageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2476,7 +2449,7 @@ abstract class Message implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -2498,9 +2471,9 @@ abstract class Message implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildMessageVersion A version object + * @return ChildMessageVersion A version object */ public function addVersion($con = null) { @@ -2528,10 +2501,10 @@ abstract class Message implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildMessage The current object (for fluent API support) + * @return ChildMessage The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -2547,9 +2520,9 @@ abstract class Message implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildMessageVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildMessageVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildMessage The current object (for fluent API support) */ @@ -2575,9 +2548,9 @@ abstract class Message implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -2595,9 +2568,9 @@ abstract class Message implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -2607,10 +2580,10 @@ abstract class Message implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildMessageVersion A version object + * @return ChildMessageVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -2623,9 +2596,9 @@ abstract class Message implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildMessageVersion objects + * @return ObjectCollection A list of ChildMessageVersion objects */ public function getAllVersions($con = null) { @@ -2645,12 +2618,12 @@ abstract class Message implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -2670,13 +2643,13 @@ abstract class Message implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -2696,12 +2669,12 @@ abstract class Message implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -2738,7 +2711,7 @@ abstract class Message implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\MessageVersion[] List of \Thelia\Model\MessageVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php index d2e314617..e779f09ac 100644 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -26,7 +26,6 @@ abstract class MessageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\MessageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class MessageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return MessageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [subject] column value. * - * @return string + * @return string */ public function getSubject() { - return $this->subject; } /** * Get the [text_message] column value. * - * @return string + * @return string */ public function getTextMessage() { - return $this->text_message; } /** * Get the [html_message] column value. * - * @return string + * @return string */ public function getHtmlMessage() { - return $this->html_message; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class MessageI18n implements ActiveRecordInterface $this->aMessage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class MessageI18n implements ActiveRecordInterface $this->modifiedColumns[MessageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class MessageI18n implements ActiveRecordInterface $this->modifiedColumns[MessageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [subject] column. * - * @param string $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setSubject($v) { @@ -524,15 +514,14 @@ abstract class MessageI18n implements ActiveRecordInterface $this->modifiedColumns[MessageI18nTableMap::SUBJECT] = true; } - return $this; } // setSubject() /** * Set the value of [text_message] column. * - * @param string $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setTextMessage($v) { @@ -545,15 +534,14 @@ abstract class MessageI18n implements ActiveRecordInterface $this->modifiedColumns[MessageI18nTableMap::TEXT_MESSAGE] = true; } - return $this; } // setTextMessage() /** * Set the value of [html_message] column. * - * @param string $v new value - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) */ public function setHtmlMessage($v) { @@ -566,7 +554,6 @@ abstract class MessageI18n implements ActiveRecordInterface $this->modifiedColumns[MessageI18nTableMap::HTML_MESSAGE] = true; } - return $this; } // setHtmlMessage() @@ -610,7 +597,6 @@ abstract class MessageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : MessageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class MessageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see MessageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class MessageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class MessageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class MessageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class MessageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class MessageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class MessageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class MessageI18n implements ActiveRecordInterface if ($this->isColumnModified(MessageI18nTableMap::SUBJECT)) $criteria->add(MessageI18nTableMap::SUBJECT, $this->subject); if ($this->isColumnModified(MessageI18nTableMap::TEXT_MESSAGE)) $criteria->add(MessageI18nTableMap::TEXT_MESSAGE, $this->text_message); if ($this->isColumnModified(MessageI18nTableMap::HTML_MESSAGE)) $criteria->add(MessageI18nTableMap::HTML_MESSAGE, $this->html_message); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class MessageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\MessageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\MessageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class MessageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\MessageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\MessageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class MessageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildMessage object. * - * @param ChildMessage $v - * @return \Thelia\Model\MessageI18n The current object (for fluent API support) + * @param ChildMessage $v + * @return \Thelia\Model\MessageI18n The current object (for fluent API support) * @throws PropelException */ public function setMessage(ChildMessage $v = null) @@ -1247,16 +1231,14 @@ abstract class MessageI18n implements ActiveRecordInterface $v->addMessageI18n($this); } - return $this; } - /** * Get the associated ChildMessage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildMessage The associated ChildMessage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildMessage The associated ChildMessage object. * @throws PropelException */ public function getMessage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class MessageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/MessageI18nQuery.php b/core/lib/Thelia/Model/Base/MessageI18nQuery.php index 6ef0a1c10..e3a0fdd33 100644 --- a/core/lib/Thelia/Model/Base/MessageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/MessageI18nQuery.php @@ -67,9 +67,9 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\MessageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\MessageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Returns a new ChildMessageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildMessageI18nQuery */ @@ -140,10 +140,10 @@ abstract class MessageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildMessageI18n A model object, or null if the key is not found + * @return ChildMessageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildMessageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class MessageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class MessageI18nQuery extends ModelCriteria * * @see filterByMessage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class MessageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class MessageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class MessageI18nQuery extends ModelCriteria * $query->filterBySubject('%fooValue%'); // WHERE subject LIKE '%fooValue%' * * - * @param string $subject The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $subject The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class MessageI18nQuery extends ModelCriteria * $query->filterByTextMessage('%fooValue%'); // WHERE text_message LIKE '%fooValue%' * * - * @param string $textMessage The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $textMessage The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class MessageI18nQuery extends ModelCriteria * $query->filterByHtmlMessage('%fooValue%'); // WHERE html_message LIKE '%fooValue%' * * - * @param string $htmlMessage The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $htmlMessage The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Message object * - * @param \Thelia\Model\Message|ObjectCollection $message The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Message|ObjectCollection $message The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Message relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class MessageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\MessageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\MessageQuery A secondary query class using the current class as primary query */ public function useMessageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildMessageI18n $messageI18n Object to remove from the list of results + * @param ChildMessageI18n $messageI18n Object to remove from the list of results * * @return ChildMessageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Deletes all rows from the message_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class MessageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildMessageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildMessageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildMessageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class MessageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - MessageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php index 1492b0834..8762a17f5 100644 --- a/core/lib/Thelia/Model/Base/MessageQuery.php +++ b/core/lib/Thelia/Model/Base/MessageQuery.php @@ -103,9 +103,9 @@ abstract class MessageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\MessageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Message', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class MessageQuery extends ModelCriteria /** * Returns a new ChildMessageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildMessageQuery */ @@ -145,7 +145,7 @@ abstract class MessageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildMessage|array|mixed the result, formatted by the current formatter @@ -176,10 +176,10 @@ abstract class MessageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildMessage A model object, or null if the key is not found + * @return ChildMessage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -206,8 +206,8 @@ abstract class MessageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildMessage|array|mixed the result, formatted by the current formatter */ @@ -227,8 +227,8 @@ abstract class MessageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -249,26 +249,24 @@ abstract class MessageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildMessageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(MessageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildMessageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(MessageTableMap::ID, $keys, Criteria::IN); } @@ -282,11 +280,11 @@ abstract class MessageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -322,9 +320,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -352,11 +350,11 @@ abstract class MessageQuery extends ModelCriteria * $query->filterBySecured(array('min' => 12)); // WHERE secured > 12 * * - * @param mixed $secured The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $secured The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -392,9 +390,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByTextLayoutFileName('%fooValue%'); // WHERE text_layout_file_name LIKE '%fooValue%' * * - * @param string $textLayoutFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $textLayoutFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -421,9 +419,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByTextTemplateFileName('%fooValue%'); // WHERE text_template_file_name LIKE '%fooValue%' * * - * @param string $textTemplateFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $textTemplateFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -450,9 +448,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByHtmlLayoutFileName('%fooValue%'); // WHERE html_layout_file_name LIKE '%fooValue%' * * - * @param string $htmlLayoutFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $htmlLayoutFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -479,9 +477,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByHtmlTemplateFileName('%fooValue%'); // WHERE html_template_file_name LIKE '%fooValue%' * * - * @param string $htmlTemplateFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $htmlTemplateFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -509,13 +507,13 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -552,13 +550,13 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -595,11 +593,11 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -636,13 +634,13 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -678,9 +676,9 @@ abstract class MessageQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -701,8 +699,8 @@ abstract class MessageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\MessageI18n object * - * @param \Thelia\Model\MessageI18n|ObjectCollection $messageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\MessageI18n|ObjectCollection $messageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -724,8 +722,8 @@ abstract class MessageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the MessageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildMessageQuery The current query, for fluid interface */ @@ -758,11 +756,11 @@ abstract class MessageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\MessageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\MessageI18nQuery A secondary query class using the current class as primary query */ public function useMessageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -774,8 +772,8 @@ abstract class MessageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\MessageVersion object * - * @param \Thelia\Model\MessageVersion|ObjectCollection $messageVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\MessageVersion|ObjectCollection $messageVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageQuery The current query, for fluid interface */ @@ -797,8 +795,8 @@ abstract class MessageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the MessageVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildMessageQuery The current query, for fluid interface */ @@ -831,11 +829,11 @@ abstract class MessageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\MessageVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\MessageVersionQuery A secondary query class using the current class as primary query */ public function useMessageVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -847,7 +845,7 @@ abstract class MessageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildMessage $message Object to remove from the list of results + * @param ChildMessage $message Object to remove from the list of results * * @return ChildMessageQuery The current query, for fluid interface */ @@ -863,8 +861,8 @@ abstract class MessageQuery extends ModelCriteria /** * Deletes all rows from the message table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -895,13 +893,13 @@ abstract class MessageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildMessage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildMessage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildMessage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -921,7 +919,6 @@ abstract class MessageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - MessageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -940,9 +937,9 @@ abstract class MessageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -952,9 +949,9 @@ abstract class MessageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -964,7 +961,7 @@ abstract class MessageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -974,7 +971,7 @@ abstract class MessageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -984,7 +981,7 @@ abstract class MessageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -994,7 +991,7 @@ abstract class MessageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1006,11 +1003,11 @@ abstract class MessageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1025,10 +1022,10 @@ abstract class MessageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildMessageQuery The current query, for fluid interface + * @return ChildMessageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1045,11 +1042,11 @@ abstract class MessageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildMessageI18nQuery A secondary query class using the current class as primary query + * @return ChildMessageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1065,7 +1062,7 @@ abstract class MessageQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1073,7 +1070,7 @@ abstract class MessageQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1081,7 +1078,7 @@ abstract class MessageQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php index 5fc5986bc..9e9050c5f 100644 --- a/core/lib/Thelia/Model/Base/MessageVersion.php +++ b/core/lib/Thelia/Model/Base/MessageVersion.php @@ -28,7 +28,6 @@ abstract class MessageVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\MessageVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -363,9 +362,9 @@ abstract class MessageVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return MessageVersion The current object, for fluid interface */ @@ -415,77 +414,70 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Get the [secured] column value. * - * @return int + * @return int */ public function getSecured() { - return $this->secured; } /** * Get the [text_layout_file_name] column value. * - * @return string + * @return string */ public function getTextLayoutFileName() { - return $this->text_layout_file_name; } /** * Get the [text_template_file_name] column value. * - * @return string + * @return string */ public function getTextTemplateFileName() { - return $this->text_template_file_name; } /** * Get the [html_layout_file_name] column value. * - * @return string + * @return string */ public function getHtmlLayoutFileName() { - return $this->html_layout_file_name; } /** * Get the [html_template_file_name] column value. * - * @return string + * @return string */ public function getHtmlTemplateFileName() { - return $this->html_template_file_name; } @@ -493,8 +485,8 @@ abstract class MessageVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -513,8 +505,8 @@ abstract class MessageVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -532,11 +524,10 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -544,8 +535,8 @@ abstract class MessageVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -563,19 +554,18 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setId($v) { @@ -592,15 +582,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->aMessage = null; } - return $this; } // setId() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setName($v) { @@ -613,15 +602,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::NAME] = true; } - return $this; } // setName() /** * Set the value of [secured] column. * - * @param int $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setSecured($v) { @@ -634,15 +622,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::SECURED] = true; } - return $this; } // setSecured() /** * Set the value of [text_layout_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setTextLayoutFileName($v) { @@ -655,15 +642,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::TEXT_LAYOUT_FILE_NAME] = true; } - return $this; } // setTextLayoutFileName() /** * Set the value of [text_template_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setTextTemplateFileName($v) { @@ -676,15 +662,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::TEXT_TEMPLATE_FILE_NAME] = true; } - return $this; } // setTextTemplateFileName() /** * Set the value of [html_layout_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setHtmlLayoutFileName($v) { @@ -697,15 +682,14 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::HTML_LAYOUT_FILE_NAME] = true; } - return $this; } // setHtmlLayoutFileName() /** * Set the value of [html_template_file_name] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setHtmlTemplateFileName($v) { @@ -718,16 +702,15 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::HTML_TEMPLATE_FILE_NAME] = true; } - return $this; } // setHtmlTemplateFileName() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -739,16 +722,15 @@ abstract class MessageVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -760,15 +742,14 @@ abstract class MessageVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -781,16 +762,15 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -802,15 +782,14 @@ abstract class MessageVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -823,7 +802,6 @@ abstract class MessageVersion implements ActiveRecordInterface $this->modifiedColumns[MessageVersionTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -867,7 +845,6 @@ abstract class MessageVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : MessageVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -952,10 +929,10 @@ abstract class MessageVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -991,7 +968,7 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see MessageVersion::setDeleted() @@ -1034,8 +1011,8 @@ abstract class MessageVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1085,8 +1062,8 @@ abstract class MessageVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1129,7 +1106,7 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1238,7 +1215,7 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1254,12 +1231,12 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1273,7 +1250,7 @@ abstract class MessageVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1327,12 +1304,12 @@ abstract class MessageVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1374,12 +1351,12 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1393,8 +1370,8 @@ abstract class MessageVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1452,8 +1429,8 @@ abstract class MessageVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1495,7 +1472,6 @@ abstract class MessageVersion implements ActiveRecordInterface if ($this->isColumnModified(MessageVersionTableMap::VERSION)) $criteria->add(MessageVersionTableMap::VERSION, $this->version); if ($this->isColumnModified(MessageVersionTableMap::VERSION_CREATED_AT)) $criteria->add(MessageVersionTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(MessageVersionTableMap::VERSION_CREATED_BY)) $criteria->add(MessageVersionTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1533,7 +1509,7 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1548,7 +1524,6 @@ abstract class MessageVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1558,9 +1533,9 @@ abstract class MessageVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\MessageVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\MessageVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1590,8 +1565,8 @@ abstract class MessageVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\MessageVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\MessageVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1607,8 +1582,8 @@ abstract class MessageVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildMessage object. * - * @param ChildMessage $v - * @return \Thelia\Model\MessageVersion The current object (for fluent API support) + * @param ChildMessage $v + * @return \Thelia\Model\MessageVersion The current object (for fluent API support) * @throws PropelException */ public function setMessage(ChildMessage $v = null) @@ -1627,16 +1602,14 @@ abstract class MessageVersion implements ActiveRecordInterface $v->addMessageVersion($this); } - return $this; } - /** * Get the associated ChildMessage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildMessage The associated ChildMessage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildMessage The associated ChildMessage object. * @throws PropelException */ public function getMessage(ConnectionInterface $con = null) @@ -1687,7 +1660,7 @@ abstract class MessageVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/MessageVersionQuery.php b/core/lib/Thelia/Model/Base/MessageVersionQuery.php index 5a2a15a03..aaffbf1a7 100644 --- a/core/lib/Thelia/Model/Base/MessageVersionQuery.php +++ b/core/lib/Thelia/Model/Base/MessageVersionQuery.php @@ -91,9 +91,9 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\MessageVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\MessageVersion', $modelAlias = null) { @@ -103,8 +103,8 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Returns a new ChildMessageVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildMessageVersionQuery */ @@ -164,10 +164,10 @@ abstract class MessageVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildMessageVersion A model object, or null if the key is not found + * @return ChildMessageVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -195,8 +195,8 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildMessageVersion|array|mixed the result, formatted by the current formatter */ @@ -216,8 +216,8 @@ abstract class MessageVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -238,7 +238,7 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -253,7 +253,7 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -284,11 +284,11 @@ abstract class MessageVersionQuery extends ModelCriteria * * @see filterByMessage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -324,9 +324,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -354,11 +354,11 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterBySecured(array('min' => 12)); // WHERE secured > 12 * * - * @param mixed $secured The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $secured The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -394,9 +394,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByTextLayoutFileName('%fooValue%'); // WHERE text_layout_file_name LIKE '%fooValue%' * * - * @param string $textLayoutFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $textLayoutFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -423,9 +423,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByTextTemplateFileName('%fooValue%'); // WHERE text_template_file_name LIKE '%fooValue%' * * - * @param string $textTemplateFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $textTemplateFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -452,9 +452,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByHtmlLayoutFileName('%fooValue%'); // WHERE html_layout_file_name LIKE '%fooValue%' * * - * @param string $htmlLayoutFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $htmlLayoutFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -481,9 +481,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByHtmlTemplateFileName('%fooValue%'); // WHERE html_template_file_name LIKE '%fooValue%' * * - * @param string $htmlTemplateFileName The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $htmlTemplateFileName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -511,13 +511,13 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -554,13 +554,13 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -597,11 +597,11 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -638,13 +638,13 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -680,9 +680,9 @@ abstract class MessageVersionQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -703,8 +703,8 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Message object * - * @param \Thelia\Model\Message|ObjectCollection $message The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Message|ObjectCollection $message The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -728,8 +728,8 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Message relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -762,11 +762,11 @@ abstract class MessageVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\MessageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\MessageQuery A secondary query class using the current class as primary query */ public function useMessageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -778,7 +778,7 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildMessageVersion $messageVersion Object to remove from the list of results + * @param ChildMessageVersion $messageVersion Object to remove from the list of results * * @return ChildMessageVersionQuery The current query, for fluid interface */ @@ -796,8 +796,8 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Deletes all rows from the message_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -828,13 +828,13 @@ abstract class MessageVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildMessageVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildMessageVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildMessageVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -854,7 +854,6 @@ abstract class MessageVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - MessageVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index 5635c3028..9b2950a23 100644 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -38,7 +38,6 @@ abstract class Module implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ModuleTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -416,9 +415,9 @@ abstract class Module implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Module The current object, for fluid interface */ @@ -468,66 +467,60 @@ abstract class Module implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [type] column value. * - * @return int + * @return int */ public function getType() { - return $this->type; } /** * Get the [activate] column value. * - * @return int + * @return int */ public function getActivate() { - return $this->activate; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } /** * Get the [full_namespace] column value. * - * @return string + * @return string */ public function getFullNamespace() { - return $this->full_namespace; } @@ -535,8 +528,8 @@ abstract class Module implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -555,8 +548,8 @@ abstract class Module implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -574,8 +567,8 @@ abstract class Module implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setId($v) { @@ -588,15 +581,14 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setCode($v) { @@ -609,15 +601,14 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [type] column. * - * @param int $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setType($v) { @@ -630,15 +621,14 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::TYPE] = true; } - return $this; } // setType() /** * Set the value of [activate] column. * - * @param int $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setActivate($v) { @@ -651,15 +641,14 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::ACTIVATE] = true; } - return $this; } // setActivate() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setPosition($v) { @@ -672,15 +661,14 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Set the value of [full_namespace] column. * - * @param string $v new value - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setFullNamespace($v) { @@ -693,16 +681,15 @@ abstract class Module implements ActiveRecordInterface $this->modifiedColumns[ModuleTableMap::FULL_NAMESPACE] = true; } - return $this; } // setFullNamespace() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -714,16 +701,15 @@ abstract class Module implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -735,7 +721,6 @@ abstract class Module implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -842,10 +827,10 @@ abstract class Module implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -892,7 +877,7 @@ abstract class Module implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Module::setDeleted() @@ -935,8 +920,8 @@ abstract class Module implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -997,8 +982,8 @@ abstract class Module implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1131,7 +1116,7 @@ abstract class Module implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1227,7 +1212,7 @@ abstract class Module implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1243,12 +1228,12 @@ abstract class Module implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1262,7 +1247,7 @@ abstract class Module implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1304,12 +1289,12 @@ abstract class Module implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1362,12 +1347,12 @@ abstract class Module implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1381,8 +1366,8 @@ abstract class Module implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1428,8 +1413,8 @@ abstract class Module implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1463,7 +1448,6 @@ abstract class Module implements ActiveRecordInterface if ($this->isColumnModified(ModuleTableMap::FULL_NAMESPACE)) $criteria->add(ModuleTableMap::FULL_NAMESPACE, $this->full_namespace); if ($this->isColumnModified(ModuleTableMap::CREATED_AT)) $criteria->add(ModuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ModuleTableMap::UPDATED_AT)) $criteria->add(ModuleTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1485,7 +1469,7 @@ abstract class Module implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1495,7 +1479,7 @@ abstract class Module implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1509,7 +1493,6 @@ abstract class Module implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1519,9 +1502,9 @@ abstract class Module implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Module (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Module (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1591,8 +1574,8 @@ abstract class Module implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Module Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Module Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1611,7 +1594,7 @@ abstract class Module implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1665,8 +1648,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1688,8 +1671,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -1745,15 +1728,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $ordersRelatedByPaymentModuleId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $ordersRelatedByPaymentModuleId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setOrdersRelatedByPaymentModuleId(Collection $ordersRelatedByPaymentModuleId, ConnectionInterface $con = null) { $ordersRelatedByPaymentModuleIdToDelete = $this->getOrdersRelatedByPaymentModuleId(new Criteria(), $con)->diff($ordersRelatedByPaymentModuleId); - $this->ordersRelatedByPaymentModuleIdScheduledForDeletion = $ordersRelatedByPaymentModuleIdToDelete; foreach ($ordersRelatedByPaymentModuleIdToDelete as $orderRelatedByPaymentModuleIdRemoved) { @@ -1774,10 +1756,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrdersRelatedByPaymentModuleId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1809,8 +1791,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addOrderRelatedByPaymentModuleId(ChildOrder $l) { @@ -1837,7 +1819,7 @@ abstract class Module implements ActiveRecordInterface /** * @param OrderRelatedByPaymentModuleId $orderRelatedByPaymentModuleId The orderRelatedByPaymentModuleId object to remove. - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function removeOrderRelatedByPaymentModuleId($orderRelatedByPaymentModuleId) { @@ -1854,7 +1836,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1866,9 +1847,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1879,7 +1860,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByPaymentModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1891,9 +1871,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1904,7 +1884,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByPaymentModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1916,9 +1895,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1929,7 +1908,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByPaymentModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1941,9 +1919,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1954,7 +1932,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByPaymentModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1966,9 +1943,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1979,7 +1956,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByPaymentModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1991,9 +1967,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByPaymentModuleIdJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2033,8 +2009,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2056,8 +2032,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -2113,15 +2089,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $ordersRelatedByDeliveryModuleId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $ordersRelatedByDeliveryModuleId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setOrdersRelatedByDeliveryModuleId(Collection $ordersRelatedByDeliveryModuleId, ConnectionInterface $con = null) { $ordersRelatedByDeliveryModuleIdToDelete = $this->getOrdersRelatedByDeliveryModuleId(new Criteria(), $con)->diff($ordersRelatedByDeliveryModuleId); - $this->ordersRelatedByDeliveryModuleIdScheduledForDeletion = $ordersRelatedByDeliveryModuleIdToDelete; foreach ($ordersRelatedByDeliveryModuleIdToDelete as $orderRelatedByDeliveryModuleIdRemoved) { @@ -2142,10 +2117,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrdersRelatedByDeliveryModuleId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2177,8 +2152,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addOrderRelatedByDeliveryModuleId(ChildOrder $l) { @@ -2205,7 +2180,7 @@ abstract class Module implements ActiveRecordInterface /** * @param OrderRelatedByDeliveryModuleId $orderRelatedByDeliveryModuleId The orderRelatedByDeliveryModuleId object to remove. - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function removeOrderRelatedByDeliveryModuleId($orderRelatedByDeliveryModuleId) { @@ -2222,7 +2197,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2234,9 +2208,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2247,7 +2221,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2259,9 +2232,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2272,7 +2245,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2284,9 +2256,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2297,7 +2269,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2309,9 +2280,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2322,7 +2293,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2334,9 +2304,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2347,7 +2317,6 @@ abstract class Module implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryModuleId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2359,9 +2328,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryModuleIdJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2401,8 +2370,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2424,8 +2393,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects * @throws PropelException */ @@ -2481,15 +2450,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $areaDeliveryModules A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $areaDeliveryModules A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setAreaDeliveryModules(Collection $areaDeliveryModules, ConnectionInterface $con = null) { $areaDeliveryModulesToDelete = $this->getAreaDeliveryModules(new Criteria(), $con)->diff($areaDeliveryModules); - $this->areaDeliveryModulesScheduledForDeletion = $areaDeliveryModulesToDelete; foreach ($areaDeliveryModulesToDelete as $areaDeliveryModuleRemoved) { @@ -2510,10 +2478,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related AreaDeliveryModule objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AreaDeliveryModule objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AreaDeliveryModule objects. * @throws PropelException */ public function countAreaDeliveryModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2545,8 +2513,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildAreaDeliveryModule object to this object * through the ChildAreaDeliveryModule foreign key attribute. * - * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildAreaDeliveryModule $l ChildAreaDeliveryModule + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addAreaDeliveryModule(ChildAreaDeliveryModule $l) { @@ -2573,7 +2541,7 @@ abstract class Module implements ActiveRecordInterface /** * @param AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to remove. - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function removeAreaDeliveryModule($areaDeliveryModule) { @@ -2590,7 +2558,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2602,9 +2569,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects */ public function getAreaDeliveryModulesJoinArea($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2644,8 +2611,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2667,8 +2634,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProfileModule[] List of ChildProfileModule objects * @throws PropelException */ @@ -2724,15 +2691,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profileModules A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $profileModules A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setProfileModules(Collection $profileModules, ConnectionInterface $con = null) { $profileModulesToDelete = $this->getProfileModules(new Criteria(), $con)->diff($profileModules); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2756,10 +2722,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related ProfileModule objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProfileModule objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProfileModule objects. * @throws PropelException */ public function countProfileModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2791,8 +2757,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildProfileModule object to this object * through the ChildProfileModule foreign key attribute. * - * @param ChildProfileModule $l ChildProfileModule - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildProfileModule $l ChildProfileModule + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addProfileModule(ChildProfileModule $l) { @@ -2819,7 +2785,7 @@ abstract class Module implements ActiveRecordInterface /** * @param ProfileModule $profileModule The profileModule object to remove. - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function removeProfileModule($profileModule) { @@ -2836,7 +2802,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2848,9 +2813,9 @@ abstract class Module implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Module. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProfileModule[] List of ChildProfileModule objects */ public function getProfileModulesJoinProfile($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2890,8 +2855,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2913,8 +2878,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildModuleImage[] List of ChildModuleImage objects * @throws PropelException */ @@ -2970,15 +2935,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $moduleImages A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $moduleImages A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setModuleImages(Collection $moduleImages, ConnectionInterface $con = null) { $moduleImagesToDelete = $this->getModuleImages(new Criteria(), $con)->diff($moduleImages); - $this->moduleImagesScheduledForDeletion = $moduleImagesToDelete; foreach ($moduleImagesToDelete as $moduleImageRemoved) { @@ -2999,10 +2963,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related ModuleImage objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ModuleImage objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ModuleImage objects. * @throws PropelException */ public function countModuleImages(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3034,8 +2998,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildModuleImage object to this object * through the ChildModuleImage foreign key attribute. * - * @param ChildModuleImage $l ChildModuleImage - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildModuleImage $l ChildModuleImage + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addModuleImage(ChildModuleImage $l) { @@ -3108,8 +3072,8 @@ abstract class Module implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3131,8 +3095,8 @@ abstract class Module implements ActiveRecordInterface * If this ChildModule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildModuleI18n[] List of ChildModuleI18n objects * @throws PropelException */ @@ -3188,15 +3152,14 @@ abstract class Module implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $moduleI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModule The current object (for fluent API support) + * @param Collection $moduleI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModule The current object (for fluent API support) */ public function setModuleI18ns(Collection $moduleI18ns, ConnectionInterface $con = null) { $moduleI18nsToDelete = $this->getModuleI18ns(new Criteria(), $con)->diff($moduleI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -3220,10 +3183,10 @@ abstract class Module implements ActiveRecordInterface /** * Returns the number of related ModuleI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ModuleI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ModuleI18n objects. * @throws PropelException */ public function countModuleI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3255,8 +3218,8 @@ abstract class Module implements ActiveRecordInterface * Method called to associate a ChildModuleI18n object to this object * through the ChildModuleI18n foreign key attribute. * - * @param ChildModuleI18n $l ChildModuleI18n - * @return \Thelia\Model\Module The current object (for fluent API support) + * @param ChildModuleI18n $l ChildModuleI18n + * @return \Thelia\Model\Module The current object (for fluent API support) */ public function addModuleI18n(ChildModuleI18n $l) { @@ -3286,7 +3249,7 @@ abstract class Module implements ActiveRecordInterface } /** - * @param ModuleI18n $moduleI18n The moduleI18n object to remove. + * @param ModuleI18n $moduleI18n The moduleI18n object to remove. * @return ChildModule The current object (for fluent API support) */ public function removeModuleI18n($moduleI18n) @@ -3331,7 +3294,7 @@ abstract class Module implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3395,7 +3358,7 @@ abstract class Module implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -3409,9 +3372,9 @@ abstract class Module implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -3423,7 +3386,7 @@ abstract class Module implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -3433,8 +3396,8 @@ abstract class Module implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildModuleI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -3467,10 +3430,10 @@ abstract class Module implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildModule The current object (for fluent API support) + * @return ChildModule The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -3495,7 +3458,7 @@ abstract class Module implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildModuleI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -3503,7 +3466,6 @@ abstract class Module implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -3514,7 +3476,6 @@ abstract class Module implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -3527,7 +3488,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -3538,7 +3498,6 @@ abstract class Module implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -3551,7 +3510,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -3562,7 +3520,6 @@ abstract class Module implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -3575,7 +3532,6 @@ abstract class Module implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -3586,7 +3542,6 @@ abstract class Module implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -3675,7 +3630,6 @@ abstract class Module implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php index 949bdec16..c7f101510 100644 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -26,7 +26,6 @@ abstract class ModuleI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ModuleI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ModuleI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ModuleI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->aModule = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ModuleI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ModuleI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ModuleI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ModuleI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ModuleI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ModuleI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ModuleI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ModuleI18n implements ActiveRecordInterface if ($this->isColumnModified(ModuleI18nTableMap::DESCRIPTION)) $criteria->add(ModuleI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ModuleI18nTableMap::CHAPO)) $criteria->add(ModuleI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ModuleI18nTableMap::POSTSCRIPTUM)) $criteria->add(ModuleI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ModuleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ModuleI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ModuleI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ModuleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ModuleI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ModuleI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\ModuleI18n The current object (for fluent API support) * @throws PropelException */ public function setModule(ChildModule $v = null) @@ -1247,16 +1231,14 @@ abstract class ModuleI18n implements ActiveRecordInterface $v->addModuleI18n($this); } - return $this; } - /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModule(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ModuleI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ModuleI18nQuery.php b/core/lib/Thelia/Model/Base/ModuleI18nQuery.php index 9bf96ccd5..c5640bdbe 100644 --- a/core/lib/Thelia/Model/Base/ModuleI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleI18nQuery.php @@ -67,9 +67,9 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ModuleI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ModuleI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Returns a new ChildModuleI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildModuleI18nQuery */ @@ -140,10 +140,10 @@ abstract class ModuleI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildModuleI18n A model object, or null if the key is not found + * @return ChildModuleI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildModuleI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ModuleI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ModuleI18nQuery extends ModelCriteria * * @see filterByModule() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ModuleI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ModuleI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ModuleI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ModuleI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ModuleI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Module relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ModuleI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildModuleI18n $moduleI18n Object to remove from the list of results + * @param ChildModuleI18n $moduleI18n Object to remove from the list of results * * @return ChildModuleI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Deletes all rows from the module_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ModuleI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildModuleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildModuleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildModuleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ModuleI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ModuleI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ModuleImage.php b/core/lib/Thelia/Model/Base/ModuleImage.php index f31c11d39..51f767cb6 100644 --- a/core/lib/Thelia/Model/Base/ModuleImage.php +++ b/core/lib/Thelia/Model/Base/ModuleImage.php @@ -32,7 +32,6 @@ abstract class ModuleImage implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ModuleImageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ModuleImage implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ModuleImage The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [module_id] column value. * - * @return int + * @return int */ public function getModuleId() { - return $this->module_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class ModuleImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class ModuleImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class ModuleImage implements ActiveRecordInterface $this->modifiedColumns[ModuleImageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [module_id] column. * - * @param int $v new value - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setModuleId($v) { @@ -518,15 +512,14 @@ abstract class ModuleImage implements ActiveRecordInterface $this->aModule = null; } - return $this; } // setModuleId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class ModuleImage implements ActiveRecordInterface $this->modifiedColumns[ModuleImageTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class ModuleImage implements ActiveRecordInterface $this->modifiedColumns[ModuleImageTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class ModuleImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class ModuleImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class ModuleImage implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ModuleImage::setDeleted() @@ -790,8 +779,8 @@ abstract class ModuleImage implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class ModuleImage implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class ModuleImage implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class ModuleImage implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class ModuleImage implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class ModuleImage implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class ModuleImage implements ActiveRecordInterface if ($this->isColumnModified(ModuleImageTableMap::POSITION)) $criteria->add(ModuleImageTableMap::POSITION, $this->position); if ($this->isColumnModified(ModuleImageTableMap::CREATED_AT)) $criteria->add(ModuleImageTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ModuleImageTableMap::UPDATED_AT)) $criteria->add(ModuleImageTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class ModuleImage implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class ModuleImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ModuleImage (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ModuleImage (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class ModuleImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ModuleImage Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ModuleImage Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) * @throws PropelException */ public function setModule(ChildModule $v = null) @@ -1336,16 +1323,14 @@ abstract class ModuleImage implements ActiveRecordInterface $v->addModuleImage($this); } - return $this; } - /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModule(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class ModuleImage implements ActiveRecordInterface return $this->aModule; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class ModuleImage implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class ModuleImage implements ActiveRecordInterface * If this ChildModuleImage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildModuleImageI18n[] List of ChildModuleImageI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class ModuleImage implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $moduleImageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildModuleImage The current object (for fluent API support) + * @param Collection $moduleImageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildModuleImage The current object (for fluent API support) */ public function setModuleImageI18ns(Collection $moduleImageI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Returns the number of related ModuleImageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ModuleImageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ModuleImageI18n objects. * @throws PropelException */ public function countModuleImageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class ModuleImage implements ActiveRecordInterface * Method called to associate a ChildModuleImageI18n object to this object * through the ChildModuleImageI18n foreign key attribute. * - * @param ChildModuleImageI18n $l ChildModuleImageI18n - * @return \Thelia\Model\ModuleImage The current object (for fluent API support) + * @param ChildModuleImageI18n $l ChildModuleImageI18n + * @return \Thelia\Model\ModuleImage The current object (for fluent API support) */ public function addModuleImageI18n(ChildModuleImageI18n $l) { @@ -1587,7 +1571,7 @@ abstract class ModuleImage implements ActiveRecordInterface } /** - * @param ModuleImageI18n $moduleImageI18n The moduleImageI18n object to remove. + * @param ModuleImageI18n $moduleImageI18n The moduleImageI18n object to remove. * @return ChildModuleImage The current object (for fluent API support) */ public function removeModuleImageI18n($moduleImageI18n) @@ -1630,7 +1614,7 @@ abstract class ModuleImage implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildModuleImage The current object (for fluent API support) + * @return ChildModuleImage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildModuleImage The current object (for fluent API support) + * @return ChildModuleImage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildModuleImageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildModuleImage The current object (for fluent API support) + * @return ChildModuleImage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class ModuleImage implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildModuleImageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/ModuleImageI18n.php b/core/lib/Thelia/Model/Base/ModuleImageI18n.php index 0e7645470..7ba0cac68 100644 --- a/core/lib/Thelia/Model/Base/ModuleImageI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleImageI18n.php @@ -26,7 +26,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ModuleImageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ModuleImageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->aModuleImage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleImageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleImageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleImageI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleImageI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $this->modifiedColumns[ModuleImageI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ModuleImageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ModuleImageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface if ($this->isColumnModified(ModuleImageI18nTableMap::DESCRIPTION)) $criteria->add(ModuleImageI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ModuleImageI18nTableMap::CHAPO)) $criteria->add(ModuleImageI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ModuleImageI18nTableMap::POSTSCRIPTUM)) $criteria->add(ModuleImageI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ModuleImageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ModuleImageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ModuleImageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ModuleImageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ModuleImageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ModuleImageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildModuleImage object. * - * @param ChildModuleImage $v - * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) + * @param ChildModuleImage $v + * @return \Thelia\Model\ModuleImageI18n The current object (for fluent API support) * @throws PropelException */ public function setModuleImage(ChildModuleImage $v = null) @@ -1247,16 +1231,14 @@ abstract class ModuleImageI18n implements ActiveRecordInterface $v->addModuleImageI18n($this); } - return $this; } - /** * Get the associated ChildModuleImage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModuleImage The associated ChildModuleImage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModuleImage The associated ChildModuleImage object. * @throws PropelException */ public function getModuleImage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ModuleImageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ModuleImageI18nQuery.php b/core/lib/Thelia/Model/Base/ModuleImageI18nQuery.php index 50e7e61dd..520de8aec 100644 --- a/core/lib/Thelia/Model/Base/ModuleImageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleImageI18nQuery.php @@ -67,9 +67,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ModuleImageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ModuleImageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Returns a new ChildModuleImageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildModuleImageI18nQuery */ @@ -140,10 +140,10 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildModuleImageI18n A model object, or null if the key is not found + * @return ChildModuleImageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildModuleImageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * * @see filterByModuleImage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ModuleImage object * * @param \Thelia\Model\ModuleImage|ObjectCollection $moduleImage The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ModuleImageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleImageQuery A secondary query class using the current class as primary query */ public function useModuleImageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildModuleImageI18n $moduleImageI18n Object to remove from the list of results + * @param ChildModuleImageI18n $moduleImageI18n Object to remove from the list of results * * @return ChildModuleImageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Deletes all rows from the module_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ModuleImageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildModuleImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildModuleImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildModuleImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ModuleImageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ModuleImageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ModuleImageQuery.php b/core/lib/Thelia/Model/Base/ModuleImageQuery.php index e5813c649..339d1afb8 100644 --- a/core/lib/Thelia/Model/Base/ModuleImageQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleImageQuery.php @@ -72,9 +72,9 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ModuleImageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ModuleImage', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Returns a new ChildModuleImageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildModuleImageQuery */ @@ -114,7 +114,7 @@ abstract class ModuleImageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildModuleImage|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ModuleImageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildModuleImage A model object, or null if the key is not found + * @return ChildModuleImage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildModuleImage|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ModuleImageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildModuleImageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ModuleImageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildModuleImageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ModuleImageTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ModuleImageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class ModuleImageQuery extends ModelCriteria * * @see filterByModule() * - * @param mixed $moduleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $moduleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class ModuleImageQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class ModuleImageQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class ModuleImageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class ModuleImageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Module relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class ModuleImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ModuleImageI18n object * - * @param \Thelia\Model\ModuleImageI18n|ObjectCollection $moduleImageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ModuleImageI18n|ObjectCollection $moduleImageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleImageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class ModuleImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleImageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleImageI18nQuery A secondary query class using the current class as primary query */ public function useModuleImageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildModuleImage $moduleImage Object to remove from the list of results + * @param ChildModuleImage $moduleImage Object to remove from the list of results * * @return ChildModuleImageQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Deletes all rows from the module_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildModuleImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildModuleImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildModuleImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class ModuleImageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ModuleImageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class ModuleImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class ModuleImageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleImageQuery The current query, for fluid interface + * @return ChildModuleImageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class ModuleImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleImageI18nQuery A secondary query class using the current class as primary query + * @return ChildModuleImageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php index 006bfbe7a..d7f8cefb4 100644 --- a/core/lib/Thelia/Model/Base/ModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleQuery.php @@ -96,9 +96,9 @@ abstract class ModuleQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ModuleQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Module', $modelAlias = null) { @@ -108,8 +108,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Returns a new ChildModuleQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildModuleQuery */ @@ -138,7 +138,7 @@ abstract class ModuleQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildModule|array|mixed the result, formatted by the current formatter @@ -169,10 +169,10 @@ abstract class ModuleQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildModule A model object, or null if the key is not found + * @return ChildModule A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -199,8 +199,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildModule|array|mixed the result, formatted by the current formatter */ @@ -220,8 +220,8 @@ abstract class ModuleQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -242,26 +242,24 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildModuleQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ModuleTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildModuleQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ModuleTableMap::ID, $keys, Criteria::IN); } @@ -275,11 +273,11 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -315,9 +313,9 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -345,11 +343,11 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByType(array('min' => 12)); // WHERE type > 12 * * - * @param mixed $type The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $type The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -386,11 +384,11 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByActivate(array('min' => 12)); // WHERE activate > 12 * * - * @param mixed $activate The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $activate The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -427,11 +425,11 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -467,9 +465,9 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByFullNamespace('%fooValue%'); // WHERE full_namespace LIKE '%fooValue%' * * - * @param string $fullNamespace The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $fullNamespace The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -497,13 +495,13 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -540,13 +538,13 @@ abstract class ModuleQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -576,8 +574,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -599,8 +597,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderRelatedByPaymentModuleId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -633,11 +631,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderRelatedByPaymentModuleIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -649,8 +647,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -672,8 +670,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderRelatedByDeliveryModuleId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -706,11 +704,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderRelatedByDeliveryModuleIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -722,8 +720,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AreaDeliveryModule object * - * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -745,8 +743,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AreaDeliveryModule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -779,11 +777,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query */ public function useAreaDeliveryModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -795,8 +793,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProfileModule object * - * @param \Thelia\Model\ProfileModule|ObjectCollection $profileModule the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProfileModule|ObjectCollection $profileModule the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -818,8 +816,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProfileModule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -852,11 +850,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query */ public function useProfileModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -868,8 +866,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ModuleImage object * - * @param \Thelia\Model\ModuleImage|ObjectCollection $moduleImage the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ModuleImage|ObjectCollection $moduleImage the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -891,8 +889,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -925,11 +923,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleImageQuery A secondary query class using the current class as primary query */ public function useModuleImageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -941,8 +939,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ModuleI18n object * - * @param \Thelia\Model\ModuleI18n|ObjectCollection $moduleI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ModuleI18n|ObjectCollection $moduleI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildModuleQuery The current query, for fluid interface */ @@ -964,8 +962,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildModuleQuery The current query, for fluid interface */ @@ -998,11 +996,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleI18nQuery A secondary query class using the current class as primary query */ public function useModuleI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -1014,7 +1012,7 @@ abstract class ModuleQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildModule $module Object to remove from the list of results + * @param ChildModule $module Object to remove from the list of results * * @return ChildModuleQuery The current query, for fluid interface */ @@ -1030,8 +1028,8 @@ abstract class ModuleQuery extends ModelCriteria /** * Deletes all rows from the module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1062,13 +1060,13 @@ abstract class ModuleQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildModule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildModule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1088,7 +1086,6 @@ abstract class ModuleQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ModuleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1107,9 +1104,9 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1119,9 +1116,9 @@ abstract class ModuleQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1131,7 +1128,7 @@ abstract class ModuleQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1141,7 +1138,7 @@ abstract class ModuleQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1151,7 +1148,7 @@ abstract class ModuleQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1161,7 +1158,7 @@ abstract class ModuleQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1173,11 +1170,11 @@ abstract class ModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1192,10 +1189,10 @@ abstract class ModuleQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleQuery The current query, for fluid interface + * @return ChildModuleQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1212,11 +1209,11 @@ abstract class ModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildModuleI18nQuery A secondary query class using the current class as primary query + * @return ChildModuleI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Newsletter.php b/core/lib/Thelia/Model/Base/Newsletter.php index 7c9ca03a6..0ef493955 100644 --- a/core/lib/Thelia/Model/Base/Newsletter.php +++ b/core/lib/Thelia/Model/Base/Newsletter.php @@ -9,7 +9,6 @@ use Propel\Runtime\Propel; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveRecord\ActiveRecordInterface; -use Propel\Runtime\Collection\Collection; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\BadMethodCallException; use Propel\Runtime\Exception\PropelException; @@ -27,7 +26,6 @@ abstract class Newsletter implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\NewsletterTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -313,9 +311,9 @@ abstract class Newsletter implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Newsletter The current object, for fluid interface */ @@ -365,55 +363,50 @@ abstract class Newsletter implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [email] column value. * - * @return string + * @return string */ public function getEmail() { - return $this->email; } /** * Get the [firstname] column value. * - * @return string + * @return string */ public function getFirstname() { - return $this->firstname; } /** * Get the [lastname] column value. * - * @return string + * @return string */ public function getLastname() { - return $this->lastname; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } @@ -421,8 +414,8 @@ abstract class Newsletter implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -441,8 +434,8 @@ abstract class Newsletter implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +453,8 @@ abstract class Newsletter implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setId($v) { @@ -474,15 +467,14 @@ abstract class Newsletter implements ActiveRecordInterface $this->modifiedColumns[NewsletterTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [email] column. * - * @param string $v new value - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setEmail($v) { @@ -495,15 +487,14 @@ abstract class Newsletter implements ActiveRecordInterface $this->modifiedColumns[NewsletterTableMap::EMAIL] = true; } - return $this; } // setEmail() /** * Set the value of [firstname] column. * - * @param string $v new value - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setFirstname($v) { @@ -516,15 +507,14 @@ abstract class Newsletter implements ActiveRecordInterface $this->modifiedColumns[NewsletterTableMap::FIRSTNAME] = true; } - return $this; } // setFirstname() /** * Set the value of [lastname] column. * - * @param string $v new value - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setLastname($v) { @@ -537,15 +527,14 @@ abstract class Newsletter implements ActiveRecordInterface $this->modifiedColumns[NewsletterTableMap::LASTNAME] = true; } - return $this; } // setLastname() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setLocale($v) { @@ -558,16 +547,15 @@ abstract class Newsletter implements ActiveRecordInterface $this->modifiedColumns[NewsletterTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -579,16 +567,15 @@ abstract class Newsletter implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Newsletter The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Newsletter The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -600,7 +587,6 @@ abstract class Newsletter implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -704,10 +690,10 @@ abstract class Newsletter implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -742,7 +728,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Newsletter::setDeleted() @@ -785,8 +771,8 @@ abstract class Newsletter implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -847,8 +833,8 @@ abstract class Newsletter implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -879,7 +865,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -969,7 +955,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -985,12 +971,12 @@ abstract class Newsletter implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1004,7 +990,7 @@ abstract class Newsletter implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1043,11 +1029,11 @@ abstract class Newsletter implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion * * @return array an associative array containing the field names (as keys) and field values */ @@ -1072,19 +1058,18 @@ abstract class Newsletter implements ActiveRecordInterface $result[$key] = $virtualColumn; } - return $result; } /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1098,8 +1083,8 @@ abstract class Newsletter implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1142,8 +1127,8 @@ abstract class Newsletter implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1175,7 +1160,6 @@ abstract class Newsletter implements ActiveRecordInterface if ($this->isColumnModified(NewsletterTableMap::LOCALE)) $criteria->add(NewsletterTableMap::LOCALE, $this->locale); if ($this->isColumnModified(NewsletterTableMap::CREATED_AT)) $criteria->add(NewsletterTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(NewsletterTableMap::UPDATED_AT)) $criteria->add(NewsletterTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1197,7 +1181,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1207,7 +1191,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1221,7 +1205,6 @@ abstract class Newsletter implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1231,9 +1214,9 @@ abstract class Newsletter implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Newsletter (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Newsletter (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1258,8 +1241,8 @@ abstract class Newsletter implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Newsletter Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Newsletter Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1298,7 +1281,7 @@ abstract class Newsletter implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1322,7 +1305,7 @@ abstract class Newsletter implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildNewsletter The current object (for fluent API support) + * @return ChildNewsletter The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/NewsletterQuery.php b/core/lib/Thelia/Model/Base/NewsletterQuery.php index 7968412cf..3ed92a3fb 100644 --- a/core/lib/Thelia/Model/Base/NewsletterQuery.php +++ b/core/lib/Thelia/Model/Base/NewsletterQuery.php @@ -64,9 +64,9 @@ abstract class NewsletterQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\NewsletterQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Newsletter', $modelAlias = null) { @@ -76,8 +76,8 @@ abstract class NewsletterQuery extends ModelCriteria /** * Returns a new ChildNewsletterQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildNewsletterQuery */ @@ -106,7 +106,7 @@ abstract class NewsletterQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildNewsletter|array|mixed the result, formatted by the current formatter @@ -137,10 +137,10 @@ abstract class NewsletterQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildNewsletter A model object, or null if the key is not found + * @return ChildNewsletter A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -167,8 +167,8 @@ abstract class NewsletterQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildNewsletter|array|mixed the result, formatted by the current formatter */ @@ -188,8 +188,8 @@ abstract class NewsletterQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -210,26 +210,24 @@ abstract class NewsletterQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildNewsletterQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(NewsletterTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildNewsletterQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(NewsletterTableMap::ID, $keys, Criteria::IN); } @@ -243,11 +241,11 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -283,9 +281,9 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByEmail('%fooValue%'); // WHERE email LIKE '%fooValue%' * * - * @param string $email The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $email The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -312,9 +310,9 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%' * * - * @param string $firstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $firstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -341,9 +339,9 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%' * * - * @param string $lastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -370,9 +368,9 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -400,13 +398,13 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -443,13 +441,13 @@ abstract class NewsletterQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -479,7 +477,7 @@ abstract class NewsletterQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildNewsletter $newsletter Object to remove from the list of results + * @param ChildNewsletter $newsletter Object to remove from the list of results * * @return ChildNewsletterQuery The current query, for fluid interface */ @@ -495,8 +493,8 @@ abstract class NewsletterQuery extends ModelCriteria /** * Deletes all rows from the newsletter table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -527,13 +525,13 @@ abstract class NewsletterQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildNewsletter or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildNewsletter object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildNewsletter object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -553,7 +551,6 @@ abstract class NewsletterQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - NewsletterTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -572,9 +569,9 @@ abstract class NewsletterQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -584,9 +581,9 @@ abstract class NewsletterQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -596,7 +593,7 @@ abstract class NewsletterQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -606,7 +603,7 @@ abstract class NewsletterQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -616,7 +613,7 @@ abstract class NewsletterQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -626,7 +623,7 @@ abstract class NewsletterQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildNewsletterQuery The current query, for fluid interface + * @return ChildNewsletterQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index 596829b3e..0d3d67c1f 100644 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -44,7 +44,6 @@ abstract class Order implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -466,9 +465,9 @@ abstract class Order implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Order The current object, for fluid interface */ @@ -518,55 +517,50 @@ abstract class Order implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [ref] column value. * - * @return string + * @return string */ public function getRef() { - return $this->ref; } /** * Get the [customer_id] column value. * - * @return int + * @return int */ public function getCustomerId() { - return $this->customer_id; } /** * Get the [invoice_order_address_id] column value. * - * @return int + * @return int */ public function getInvoiceOrderAddressId() { - return $this->invoice_order_address_id; } /** * Get the [delivery_order_address_id] column value. * - * @return int + * @return int */ public function getDeliveryOrderAddressId() { - return $this->delivery_order_address_id; } @@ -574,8 +568,8 @@ abstract class Order implements ActiveRecordInterface * Get the [optionally formatted] temporal [invoice_date] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 * @@ -593,121 +587,110 @@ abstract class Order implements ActiveRecordInterface /** * Get the [currency_id] column value. * - * @return int + * @return int */ public function getCurrencyId() { - return $this->currency_id; } /** * Get the [currency_rate] column value. * - * @return double + * @return double */ public function getCurrencyRate() { - return $this->currency_rate; } /** * Get the [transaction_ref] column value. * transaction reference - usually use to identify a transaction with banking modules - * @return string + * @return string */ public function getTransactionRef() { - return $this->transaction_ref; } /** * Get the [delivery_ref] column value. * delivery reference - usually use to identify a delivery progress on a distant delivery tracker website - * @return string + * @return string */ public function getDeliveryRef() { - return $this->delivery_ref; } /** * Get the [invoice_ref] column value. * the invoice reference - * @return string + * @return string */ public function getInvoiceRef() { - return $this->invoice_ref; } /** * Get the [discount] column value. * - * @return double + * @return double */ public function getDiscount() { - return $this->discount; } /** * Get the [postage] column value. * - * @return double + * @return double */ public function getPostage() { - return $this->postage; } /** * Get the [payment_module_id] column value. * - * @return int + * @return int */ public function getPaymentModuleId() { - return $this->payment_module_id; } /** * Get the [delivery_module_id] column value. * - * @return int + * @return int */ public function getDeliveryModuleId() { - return $this->delivery_module_id; } /** * Get the [status_id] column value. * - * @return int + * @return int */ public function getStatusId() { - return $this->status_id; } /** * Get the [lang_id] column value. * - * @return int + * @return int */ public function getLangId() { - return $this->lang_id; } @@ -715,8 +698,8 @@ abstract class Order implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -735,8 +718,8 @@ abstract class Order implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -754,8 +737,8 @@ abstract class Order implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setId($v) { @@ -768,15 +751,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [ref] column. * - * @param string $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setRef($v) { @@ -789,15 +771,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::REF] = true; } - return $this; } // setRef() /** * Set the value of [customer_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setCustomerId($v) { @@ -814,15 +795,14 @@ abstract class Order implements ActiveRecordInterface $this->aCustomer = null; } - return $this; } // setCustomerId() /** * Set the value of [invoice_order_address_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setInvoiceOrderAddressId($v) { @@ -839,15 +819,14 @@ abstract class Order implements ActiveRecordInterface $this->aOrderAddressRelatedByInvoiceOrderAddressId = null; } - return $this; } // setInvoiceOrderAddressId() /** * Set the value of [delivery_order_address_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setDeliveryOrderAddressId($v) { @@ -864,16 +843,15 @@ abstract class Order implements ActiveRecordInterface $this->aOrderAddressRelatedByDeliveryOrderAddressId = null; } - return $this; } // setDeliveryOrderAddressId() /** * Sets the value of [invoice_date] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setInvoiceDate($v) { @@ -885,15 +863,14 @@ abstract class Order implements ActiveRecordInterface } } // if either are not null - return $this; } // setInvoiceDate() /** * Set the value of [currency_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setCurrencyId($v) { @@ -910,15 +887,14 @@ abstract class Order implements ActiveRecordInterface $this->aCurrency = null; } - return $this; } // setCurrencyId() /** * Set the value of [currency_rate] column. * - * @param double $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setCurrencyRate($v) { @@ -931,15 +907,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::CURRENCY_RATE] = true; } - return $this; } // setCurrencyRate() /** * Set the value of [transaction_ref] column. * transaction reference - usually use to identify a transaction with banking modules - * @param string $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setTransactionRef($v) { @@ -952,15 +927,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::TRANSACTION_REF] = true; } - return $this; } // setTransactionRef() /** * Set the value of [delivery_ref] column. * delivery reference - usually use to identify a delivery progress on a distant delivery tracker website - * @param string $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setDeliveryRef($v) { @@ -973,15 +947,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::DELIVERY_REF] = true; } - return $this; } // setDeliveryRef() /** * Set the value of [invoice_ref] column. * the invoice reference - * @param string $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setInvoiceRef($v) { @@ -994,15 +967,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::INVOICE_REF] = true; } - return $this; } // setInvoiceRef() /** * Set the value of [discount] column. * - * @param double $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setDiscount($v) { @@ -1015,15 +987,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::DISCOUNT] = true; } - return $this; } // setDiscount() /** * Set the value of [postage] column. * - * @param double $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setPostage($v) { @@ -1036,15 +1007,14 @@ abstract class Order implements ActiveRecordInterface $this->modifiedColumns[OrderTableMap::POSTAGE] = true; } - return $this; } // setPostage() /** * Set the value of [payment_module_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setPaymentModuleId($v) { @@ -1061,15 +1031,14 @@ abstract class Order implements ActiveRecordInterface $this->aModuleRelatedByPaymentModuleId = null; } - return $this; } // setPaymentModuleId() /** * Set the value of [delivery_module_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setDeliveryModuleId($v) { @@ -1086,15 +1055,14 @@ abstract class Order implements ActiveRecordInterface $this->aModuleRelatedByDeliveryModuleId = null; } - return $this; } // setDeliveryModuleId() /** * Set the value of [status_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setStatusId($v) { @@ -1111,15 +1079,14 @@ abstract class Order implements ActiveRecordInterface $this->aOrderStatus = null; } - return $this; } // setStatusId() /** * Set the value of [lang_id] column. * - * @param int $v new value - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setLangId($v) { @@ -1136,16 +1103,15 @@ abstract class Order implements ActiveRecordInterface $this->aLang = null; } - return $this; } // setLangId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -1157,16 +1123,15 @@ abstract class Order implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -1178,7 +1143,6 @@ abstract class Order implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1345,10 +1309,10 @@ abstract class Order implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1395,7 +1359,7 @@ abstract class Order implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Order::setDeleted() @@ -1438,8 +1402,8 @@ abstract class Order implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1500,8 +1464,8 @@ abstract class Order implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1627,7 +1591,7 @@ abstract class Order implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1789,7 +1753,7 @@ abstract class Order implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1805,12 +1769,12 @@ abstract class Order implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1824,7 +1788,7 @@ abstract class Order implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1899,12 +1863,12 @@ abstract class Order implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1980,12 +1944,12 @@ abstract class Order implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1999,8 +1963,8 @@ abstract class Order implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -2079,8 +2043,8 @@ abstract class Order implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -2136,7 +2100,6 @@ abstract class Order implements ActiveRecordInterface if ($this->isColumnModified(OrderTableMap::LANG_ID)) $criteria->add(OrderTableMap::LANG_ID, $this->lang_id); if ($this->isColumnModified(OrderTableMap::CREATED_AT)) $criteria->add(OrderTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderTableMap::UPDATED_AT)) $criteria->add(OrderTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -2158,7 +2121,7 @@ abstract class Order implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -2168,7 +2131,7 @@ abstract class Order implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -2182,7 +2145,6 @@ abstract class Order implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -2192,9 +2154,9 @@ abstract class Order implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Order (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Order (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -2251,8 +2213,8 @@ abstract class Order implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Order Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Order Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -2268,8 +2230,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildCurrency object. * - * @param ChildCurrency $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildCurrency $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setCurrency(ChildCurrency $v = null) @@ -2288,7 +2250,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrder($this); } - return $this; } @@ -2296,8 +2257,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildCurrency object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCurrency The associated ChildCurrency object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCurrency The associated ChildCurrency object. * @throws PropelException */ public function getCurrency(ConnectionInterface $con = null) @@ -2319,8 +2280,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildCustomer object. * - * @param ChildCustomer $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildCustomer $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setCustomer(ChildCustomer $v = null) @@ -2339,7 +2300,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrder($this); } - return $this; } @@ -2347,8 +2307,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildCustomer object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCustomer The associated ChildCustomer object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCustomer The associated ChildCustomer object. * @throws PropelException */ public function getCustomer(ConnectionInterface $con = null) @@ -2370,8 +2330,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderAddress object. * - * @param ChildOrderAddress $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildOrderAddress $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setOrderAddressRelatedByInvoiceOrderAddressId(ChildOrderAddress $v = null) @@ -2390,7 +2350,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrderRelatedByInvoiceOrderAddressId($this); } - return $this; } @@ -2398,8 +2357,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildOrderAddress object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderAddress The associated ChildOrderAddress object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderAddress The associated ChildOrderAddress object. * @throws PropelException */ public function getOrderAddressRelatedByInvoiceOrderAddressId(ConnectionInterface $con = null) @@ -2421,8 +2380,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderAddress object. * - * @param ChildOrderAddress $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildOrderAddress $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setOrderAddressRelatedByDeliveryOrderAddressId(ChildOrderAddress $v = null) @@ -2441,7 +2400,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrderRelatedByDeliveryOrderAddressId($this); } - return $this; } @@ -2449,8 +2407,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildOrderAddress object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderAddress The associated ChildOrderAddress object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderAddress The associated ChildOrderAddress object. * @throws PropelException */ public function getOrderAddressRelatedByDeliveryOrderAddressId(ConnectionInterface $con = null) @@ -2472,8 +2430,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderStatus object. * - * @param ChildOrderStatus $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildOrderStatus $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setOrderStatus(ChildOrderStatus $v = null) @@ -2492,7 +2450,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrder($this); } - return $this; } @@ -2500,8 +2457,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildOrderStatus object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderStatus The associated ChildOrderStatus object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderStatus The associated ChildOrderStatus object. * @throws PropelException */ public function getOrderStatus(ConnectionInterface $con = null) @@ -2523,8 +2480,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setModuleRelatedByPaymentModuleId(ChildModule $v = null) @@ -2543,7 +2500,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrderRelatedByPaymentModuleId($this); } - return $this; } @@ -2551,8 +2507,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModuleRelatedByPaymentModuleId(ConnectionInterface $con = null) @@ -2574,8 +2530,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setModuleRelatedByDeliveryModuleId(ChildModule $v = null) @@ -2594,7 +2550,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrderRelatedByDeliveryModuleId($this); } - return $this; } @@ -2602,8 +2557,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModuleRelatedByDeliveryModuleId(ConnectionInterface $con = null) @@ -2625,8 +2580,8 @@ abstract class Order implements ActiveRecordInterface /** * Declares an association between this object and a ChildLang object. * - * @param ChildLang $v - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildLang $v + * @return \Thelia\Model\Order The current object (for fluent API support) * @throws PropelException */ public function setLang(ChildLang $v = null) @@ -2645,7 +2600,6 @@ abstract class Order implements ActiveRecordInterface $v->addOrder($this); } - return $this; } @@ -2653,8 +2607,8 @@ abstract class Order implements ActiveRecordInterface /** * Get the associated ChildLang object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildLang The associated ChildLang object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildLang The associated ChildLang object. * @throws PropelException */ public function getLang(ConnectionInterface $con = null) @@ -2679,7 +2633,7 @@ abstract class Order implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -2721,8 +2675,8 @@ abstract class Order implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2744,8 +2698,8 @@ abstract class Order implements ActiveRecordInterface * If this ChildOrder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrderProduct[] List of ChildOrderProduct objects * @throws PropelException */ @@ -2801,15 +2755,14 @@ abstract class Order implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orderProducts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrder The current object (for fluent API support) + * @param Collection $orderProducts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrder The current object (for fluent API support) */ public function setOrderProducts(Collection $orderProducts, ConnectionInterface $con = null) { $orderProductsToDelete = $this->getOrderProducts(new Criteria(), $con)->diff($orderProducts); - $this->orderProductsScheduledForDeletion = $orderProductsToDelete; foreach ($orderProductsToDelete as $orderProductRemoved) { @@ -2830,10 +2783,10 @@ abstract class Order implements ActiveRecordInterface /** * Returns the number of related OrderProduct objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related OrderProduct objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related OrderProduct objects. * @throws PropelException */ public function countOrderProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2865,8 +2818,8 @@ abstract class Order implements ActiveRecordInterface * Method called to associate a ChildOrderProduct object to this object * through the ChildOrderProduct foreign key attribute. * - * @param ChildOrderProduct $l ChildOrderProduct - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildOrderProduct $l ChildOrderProduct + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function addOrderProduct(ChildOrderProduct $l) { @@ -2893,7 +2846,7 @@ abstract class Order implements ActiveRecordInterface /** * @param OrderProduct $orderProduct The orderProduct object to remove. - * @return ChildOrder The current object (for fluent API support) + * @return ChildOrder The current object (for fluent API support) */ public function removeOrderProduct($orderProduct) { @@ -2939,8 +2892,8 @@ abstract class Order implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2962,8 +2915,8 @@ abstract class Order implements ActiveRecordInterface * If this ChildOrder is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrderCoupon[] List of ChildOrderCoupon objects * @throws PropelException */ @@ -3019,15 +2972,14 @@ abstract class Order implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orderCoupons A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrder The current object (for fluent API support) + * @param Collection $orderCoupons A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrder The current object (for fluent API support) */ public function setOrderCoupons(Collection $orderCoupons, ConnectionInterface $con = null) { $orderCouponsToDelete = $this->getOrderCoupons(new Criteria(), $con)->diff($orderCoupons); - $this->orderCouponsScheduledForDeletion = $orderCouponsToDelete; foreach ($orderCouponsToDelete as $orderCouponRemoved) { @@ -3048,10 +3000,10 @@ abstract class Order implements ActiveRecordInterface /** * Returns the number of related OrderCoupon objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related OrderCoupon objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related OrderCoupon objects. * @throws PropelException */ public function countOrderCoupons(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3083,8 +3035,8 @@ abstract class Order implements ActiveRecordInterface * Method called to associate a ChildOrderCoupon object to this object * through the ChildOrderCoupon foreign key attribute. * - * @param ChildOrderCoupon $l ChildOrderCoupon - * @return \Thelia\Model\Order The current object (for fluent API support) + * @param ChildOrderCoupon $l ChildOrderCoupon + * @return \Thelia\Model\Order The current object (for fluent API support) */ public function addOrderCoupon(ChildOrderCoupon $l) { @@ -3111,7 +3063,7 @@ abstract class Order implements ActiveRecordInterface /** * @param OrderCoupon $orderCoupon The orderCoupon object to remove. - * @return ChildOrder The current object (for fluent API support) + * @return ChildOrder The current object (for fluent API support) */ public function removeOrderCoupon($orderCoupon) { @@ -3166,7 +3118,7 @@ abstract class Order implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -3210,7 +3162,7 @@ abstract class Order implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrder The current object (for fluent API support) + * @return ChildOrder The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -3295,7 +3247,6 @@ abstract class Order implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php index e4743618f..1831d05ec 100644 --- a/core/lib/Thelia/Model/Base/OrderAddress.php +++ b/core/lib/Thelia/Model/Base/OrderAddress.php @@ -30,7 +30,6 @@ abstract class OrderAddress implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderAddressTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -382,9 +381,9 @@ abstract class OrderAddress implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderAddress The current object, for fluid interface */ @@ -434,132 +433,120 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [customer_title_id] column value. * - * @return int + * @return int */ public function getCustomerTitleId() { - return $this->customer_title_id; } /** * Get the [company] column value. * - * @return string + * @return string */ public function getCompany() { - return $this->company; } /** * Get the [firstname] column value. * - * @return string + * @return string */ public function getFirstname() { - return $this->firstname; } /** * Get the [lastname] column value. * - * @return string + * @return string */ public function getLastname() { - return $this->lastname; } /** * Get the [address1] column value. * - * @return string + * @return string */ public function getAddress1() { - return $this->address1; } /** * Get the [address2] column value. * - * @return string + * @return string */ public function getAddress2() { - return $this->address2; } /** * Get the [address3] column value. * - * @return string + * @return string */ public function getAddress3() { - return $this->address3; } /** * Get the [zipcode] column value. * - * @return string + * @return string */ public function getZipcode() { - return $this->zipcode; } /** * Get the [city] column value. * - * @return string + * @return string */ public function getCity() { - return $this->city; } /** * Get the [phone] column value. * - * @return string + * @return string */ public function getPhone() { - return $this->phone; } /** * Get the [country_id] column value. * - * @return int + * @return int */ public function getCountryId() { - return $this->country_id; } @@ -567,8 +554,8 @@ abstract class OrderAddress implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -587,8 +574,8 @@ abstract class OrderAddress implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -606,8 +593,8 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setId($v) { @@ -620,15 +607,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [customer_title_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setCustomerTitleId($v) { @@ -641,15 +627,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::CUSTOMER_TITLE_ID] = true; } - return $this; } // setCustomerTitleId() /** * Set the value of [company] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setCompany($v) { @@ -662,15 +647,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::COMPANY] = true; } - return $this; } // setCompany() /** * Set the value of [firstname] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setFirstname($v) { @@ -683,15 +667,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::FIRSTNAME] = true; } - return $this; } // setFirstname() /** * Set the value of [lastname] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setLastname($v) { @@ -704,15 +687,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::LASTNAME] = true; } - return $this; } // setLastname() /** * Set the value of [address1] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setAddress1($v) { @@ -725,15 +707,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::ADDRESS1] = true; } - return $this; } // setAddress1() /** * Set the value of [address2] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setAddress2($v) { @@ -746,15 +727,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::ADDRESS2] = true; } - return $this; } // setAddress2() /** * Set the value of [address3] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setAddress3($v) { @@ -767,15 +747,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::ADDRESS3] = true; } - return $this; } // setAddress3() /** * Set the value of [zipcode] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setZipcode($v) { @@ -788,15 +767,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::ZIPCODE] = true; } - return $this; } // setZipcode() /** * Set the value of [city] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setCity($v) { @@ -809,15 +787,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::CITY] = true; } - return $this; } // setCity() /** * Set the value of [phone] column. * - * @param string $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setPhone($v) { @@ -830,15 +807,14 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::PHONE] = true; } - return $this; } // setPhone() /** * Set the value of [country_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setCountryId($v) { @@ -851,16 +827,15 @@ abstract class OrderAddress implements ActiveRecordInterface $this->modifiedColumns[OrderAddressTableMap::COUNTRY_ID] = true; } - return $this; } // setCountryId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -872,16 +847,15 @@ abstract class OrderAddress implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -893,7 +867,6 @@ abstract class OrderAddress implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1018,10 +991,10 @@ abstract class OrderAddress implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1060,7 +1033,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderAddress::setDeleted() @@ -1103,8 +1076,8 @@ abstract class OrderAddress implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1165,8 +1138,8 @@ abstract class OrderAddress implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1231,7 +1204,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1363,7 +1336,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1379,12 +1352,12 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1398,7 +1371,7 @@ abstract class OrderAddress implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1458,12 +1431,12 @@ abstract class OrderAddress implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1510,12 +1483,12 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1529,8 +1502,8 @@ abstract class OrderAddress implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1594,8 +1567,8 @@ abstract class OrderAddress implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1641,7 +1614,6 @@ abstract class OrderAddress implements ActiveRecordInterface if ($this->isColumnModified(OrderAddressTableMap::COUNTRY_ID)) $criteria->add(OrderAddressTableMap::COUNTRY_ID, $this->country_id); if ($this->isColumnModified(OrderAddressTableMap::CREATED_AT)) $criteria->add(OrderAddressTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderAddressTableMap::UPDATED_AT)) $criteria->add(OrderAddressTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1663,7 +1635,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1673,7 +1645,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1687,7 +1659,6 @@ abstract class OrderAddress implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1697,9 +1668,9 @@ abstract class OrderAddress implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderAddress (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderAddress (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1751,8 +1722,8 @@ abstract class OrderAddress implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderAddress Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderAddress Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1771,7 +1742,7 @@ abstract class OrderAddress implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1813,8 +1784,8 @@ abstract class OrderAddress implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1836,8 +1807,8 @@ abstract class OrderAddress implements ActiveRecordInterface * If this ChildOrderAddress is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -1893,15 +1864,14 @@ abstract class OrderAddress implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $ordersRelatedByInvoiceOrderAddressId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderAddress The current object (for fluent API support) + * @param Collection $ordersRelatedByInvoiceOrderAddressId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderAddress The current object (for fluent API support) */ public function setOrdersRelatedByInvoiceOrderAddressId(Collection $ordersRelatedByInvoiceOrderAddressId, ConnectionInterface $con = null) { $ordersRelatedByInvoiceOrderAddressIdToDelete = $this->getOrdersRelatedByInvoiceOrderAddressId(new Criteria(), $con)->diff($ordersRelatedByInvoiceOrderAddressId); - $this->ordersRelatedByInvoiceOrderAddressIdScheduledForDeletion = $ordersRelatedByInvoiceOrderAddressIdToDelete; foreach ($ordersRelatedByInvoiceOrderAddressIdToDelete as $orderRelatedByInvoiceOrderAddressIdRemoved) { @@ -1922,10 +1892,10 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrdersRelatedByInvoiceOrderAddressId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1957,8 +1927,8 @@ abstract class OrderAddress implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function addOrderRelatedByInvoiceOrderAddressId(ChildOrder $l) { @@ -1985,7 +1955,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * @param OrderRelatedByInvoiceOrderAddressId $orderRelatedByInvoiceOrderAddressId The orderRelatedByInvoiceOrderAddressId object to remove. - * @return ChildOrderAddress The current object (for fluent API support) + * @return ChildOrderAddress The current object (for fluent API support) */ public function removeOrderRelatedByInvoiceOrderAddressId($orderRelatedByInvoiceOrderAddressId) { @@ -2002,7 +1972,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2014,9 +1983,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2027,7 +1996,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByInvoiceOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2039,9 +2007,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2052,7 +2020,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByInvoiceOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2064,9 +2031,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2077,7 +2044,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByInvoiceOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2089,9 +2055,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2102,7 +2068,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByInvoiceOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2114,9 +2079,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2127,7 +2092,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByInvoiceOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2139,9 +2103,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByInvoiceOrderAddressIdJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2181,8 +2145,8 @@ abstract class OrderAddress implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2204,8 +2168,8 @@ abstract class OrderAddress implements ActiveRecordInterface * If this ChildOrderAddress is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -2261,15 +2225,14 @@ abstract class OrderAddress implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $ordersRelatedByDeliveryOrderAddressId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderAddress The current object (for fluent API support) + * @param Collection $ordersRelatedByDeliveryOrderAddressId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderAddress The current object (for fluent API support) */ public function setOrdersRelatedByDeliveryOrderAddressId(Collection $ordersRelatedByDeliveryOrderAddressId, ConnectionInterface $con = null) { $ordersRelatedByDeliveryOrderAddressIdToDelete = $this->getOrdersRelatedByDeliveryOrderAddressId(new Criteria(), $con)->diff($ordersRelatedByDeliveryOrderAddressId); - $this->ordersRelatedByDeliveryOrderAddressIdScheduledForDeletion = $ordersRelatedByDeliveryOrderAddressIdToDelete; foreach ($ordersRelatedByDeliveryOrderAddressIdToDelete as $orderRelatedByDeliveryOrderAddressIdRemoved) { @@ -2290,10 +2253,10 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrdersRelatedByDeliveryOrderAddressId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2325,8 +2288,8 @@ abstract class OrderAddress implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\OrderAddress The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\OrderAddress The current object (for fluent API support) */ public function addOrderRelatedByDeliveryOrderAddressId(ChildOrder $l) { @@ -2353,7 +2316,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * @param OrderRelatedByDeliveryOrderAddressId $orderRelatedByDeliveryOrderAddressId The orderRelatedByDeliveryOrderAddressId object to remove. - * @return ChildOrderAddress The current object (for fluent API support) + * @return ChildOrderAddress The current object (for fluent API support) */ public function removeOrderRelatedByDeliveryOrderAddressId($orderRelatedByDeliveryOrderAddressId) { @@ -2370,7 +2333,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2382,9 +2344,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2395,7 +2357,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2407,9 +2368,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2420,7 +2381,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2432,9 +2392,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinOrderStatus($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2445,7 +2405,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2457,9 +2416,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2470,7 +2429,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2482,9 +2440,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2495,7 +2453,6 @@ abstract class OrderAddress implements ActiveRecordInterface return $this->getOrdersRelatedByDeliveryOrderAddressId($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2507,9 +2464,9 @@ abstract class OrderAddress implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderAddress. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersRelatedByDeliveryOrderAddressIdJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2553,7 +2510,7 @@ abstract class OrderAddress implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2589,7 +2546,7 @@ abstract class OrderAddress implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderAddress The current object (for fluent API support) + * @return ChildOrderAddress The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2674,7 +2631,6 @@ abstract class OrderAddress implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/OrderAddressQuery.php b/core/lib/Thelia/Model/Base/OrderAddressQuery.php index 575e24338..abd51c699 100644 --- a/core/lib/Thelia/Model/Base/OrderAddressQuery.php +++ b/core/lib/Thelia/Model/Base/OrderAddressQuery.php @@ -103,9 +103,9 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderAddressQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderAddress', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Returns a new ChildOrderAddressQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderAddressQuery */ @@ -145,7 +145,7 @@ abstract class OrderAddressQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderAddress|array|mixed the result, formatted by the current formatter @@ -176,10 +176,10 @@ abstract class OrderAddressQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderAddress A model object, or null if the key is not found + * @return ChildOrderAddress A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -206,8 +206,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderAddress|array|mixed the result, formatted by the current formatter */ @@ -227,8 +227,8 @@ abstract class OrderAddressQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -249,26 +249,24 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderAddressQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderAddressTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderAddressQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderAddressTableMap::ID, $keys, Criteria::IN); } @@ -282,11 +280,11 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -323,11 +321,11 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByCustomerTitleId(array('min' => 12)); // WHERE customer_title_id > 12 * * - * @param mixed $customerTitleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $customerTitleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -363,9 +361,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByCompany('%fooValue%'); // WHERE company LIKE '%fooValue%' * * - * @param string $company The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $company The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -392,9 +390,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%' * * - * @param string $firstname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $firstname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -421,9 +419,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%' * * - * @param string $lastname The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $lastname The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -450,9 +448,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByAddress1('%fooValue%'); // WHERE address1 LIKE '%fooValue%' * * - * @param string $address1 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address1 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -479,9 +477,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByAddress2('%fooValue%'); // WHERE address2 LIKE '%fooValue%' * * - * @param string $address2 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address2 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -508,9 +506,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByAddress3('%fooValue%'); // WHERE address3 LIKE '%fooValue%' * * - * @param string $address3 The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $address3 The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -537,9 +535,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByZipcode('%fooValue%'); // WHERE zipcode LIKE '%fooValue%' * * - * @param string $zipcode The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $zipcode The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -566,9 +564,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByCity('%fooValue%'); // WHERE city LIKE '%fooValue%' * * - * @param string $city The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $city The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -595,9 +593,9 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByPhone('%fooValue%'); // WHERE phone LIKE '%fooValue%' * * - * @param string $phone The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $phone The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -625,11 +623,11 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByCountryId(array('min' => 12)); // WHERE country_id > 12 * * - * @param mixed $countryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $countryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -666,13 +664,13 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -709,13 +707,13 @@ abstract class OrderAddressQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -745,8 +743,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -768,8 +766,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderRelatedByInvoiceOrderAddressId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -802,11 +800,11 @@ abstract class OrderAddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderRelatedByInvoiceOrderAddressIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -818,8 +816,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -841,8 +839,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderRelatedByDeliveryOrderAddressId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -875,11 +873,11 @@ abstract class OrderAddressQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderRelatedByDeliveryOrderAddressIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -891,7 +889,7 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderAddress $orderAddress Object to remove from the list of results + * @param ChildOrderAddress $orderAddress Object to remove from the list of results * * @return ChildOrderAddressQuery The current query, for fluid interface */ @@ -907,8 +905,8 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Deletes all rows from the order_address table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -939,13 +937,13 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderAddress or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderAddress object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderAddress object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -965,7 +963,6 @@ abstract class OrderAddressQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderAddressTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -984,9 +981,9 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -996,9 +993,9 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1008,7 +1005,7 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1018,7 +1015,7 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1028,7 +1025,7 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1038,7 +1035,7 @@ abstract class OrderAddressQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderAddressQuery The current query, for fluid interface + * @return ChildOrderAddressQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderCoupon.php b/core/lib/Thelia/Model/Base/OrderCoupon.php index 25179228e..1ef3e03ce 100644 --- a/core/lib/Thelia/Model/Base/OrderCoupon.php +++ b/core/lib/Thelia/Model/Base/OrderCoupon.php @@ -29,7 +29,6 @@ abstract class OrderCoupon implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderCouponTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -368,9 +367,9 @@ abstract class OrderCoupon implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderCoupon The current object, for fluid interface */ @@ -420,88 +419,80 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [order_id] column value. * - * @return int + * @return int */ public function getOrderId() { - return $this->order_id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } /** * Get the [type] column value. * - * @return string + * @return string */ public function getType() { - return $this->type; } /** * Get the [amount] column value. * - * @return double + * @return double */ public function getAmount() { - return $this->amount; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [short_description] column value. * - * @return string + * @return string */ public function getShortDescription() { - return $this->short_description; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } @@ -509,8 +500,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [expiration_date] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -528,44 +519,40 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Get the [is_cumulative] column value. * - * @return boolean + * @return boolean */ public function getIsCumulative() { - return $this->is_cumulative; } /** * Get the [is_removing_postage] column value. * - * @return boolean + * @return boolean */ public function getIsRemovingPostage() { - return $this->is_removing_postage; } /** * Get the [is_available_on_special_offers] column value. * - * @return boolean + * @return boolean */ public function getIsAvailableOnSpecialOffers() { - return $this->is_available_on_special_offers; } /** * Get the [serialized_conditions] column value. * - * @return string + * @return string */ public function getSerializedConditions() { - return $this->serialized_conditions; } @@ -573,8 +560,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -593,8 +580,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -612,8 +599,8 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setId($v) { @@ -626,15 +613,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [order_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setOrderId($v) { @@ -651,15 +637,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->aOrder = null; } - return $this; } // setOrderId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setCode($v) { @@ -672,15 +657,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::CODE] = true; } - return $this; } // setCode() /** * Set the value of [type] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setType($v) { @@ -693,15 +677,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::TYPE] = true; } - return $this; } // setType() /** * Set the value of [amount] column. * - * @param double $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setAmount($v) { @@ -714,15 +697,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::AMOUNT] = true; } - return $this; } // setAmount() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setTitle($v) { @@ -735,15 +717,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [short_description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setShortDescription($v) { @@ -756,15 +737,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::SHORT_DESCRIPTION] = true; } - return $this; } // setShortDescription() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setDescription($v) { @@ -777,16 +757,15 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Sets the value of [expiration_date] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setExpirationDate($v) { @@ -798,7 +777,6 @@ abstract class OrderCoupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setExpirationDate() @@ -809,8 +787,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setIsCumulative($v) { @@ -827,7 +805,6 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::IS_CUMULATIVE] = true; } - return $this; } // setIsCumulative() @@ -838,8 +815,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setIsRemovingPostage($v) { @@ -856,7 +833,6 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::IS_REMOVING_POSTAGE] = true; } - return $this; } // setIsRemovingPostage() @@ -867,8 +843,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setIsAvailableOnSpecialOffers($v) { @@ -885,15 +861,14 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS] = true; } - return $this; } // setIsAvailableOnSpecialOffers() /** * Set the value of [serialized_conditions] column. * - * @param string $v new value - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setSerializedConditions($v) { @@ -906,16 +881,15 @@ abstract class OrderCoupon implements ActiveRecordInterface $this->modifiedColumns[OrderCouponTableMap::SERIALIZED_CONDITIONS] = true; } - return $this; } // setSerializedConditions() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -927,16 +901,15 @@ abstract class OrderCoupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -948,7 +921,6 @@ abstract class OrderCoupon implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1082,10 +1054,10 @@ abstract class OrderCoupon implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1121,7 +1093,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderCoupon::setDeleted() @@ -1164,8 +1136,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1226,8 +1198,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1270,7 +1242,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1408,7 +1380,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1424,12 +1396,12 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1443,7 +1415,7 @@ abstract class OrderCoupon implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1506,12 +1478,12 @@ abstract class OrderCoupon implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1556,12 +1528,12 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1575,8 +1547,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1643,8 +1615,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1692,7 +1664,6 @@ abstract class OrderCoupon implements ActiveRecordInterface if ($this->isColumnModified(OrderCouponTableMap::SERIALIZED_CONDITIONS)) $criteria->add(OrderCouponTableMap::SERIALIZED_CONDITIONS, $this->serialized_conditions); if ($this->isColumnModified(OrderCouponTableMap::CREATED_AT)) $criteria->add(OrderCouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderCouponTableMap::UPDATED_AT)) $criteria->add(OrderCouponTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1714,7 +1685,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1724,7 +1695,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1738,7 +1709,6 @@ abstract class OrderCoupon implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1748,9 +1718,9 @@ abstract class OrderCoupon implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderCoupon (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderCoupon (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1783,8 +1753,8 @@ abstract class OrderCoupon implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderCoupon Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderCoupon Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1800,8 +1770,8 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrder object. * - * @param ChildOrder $v - * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) + * @param ChildOrder $v + * @return \Thelia\Model\OrderCoupon The current object (for fluent API support) * @throws PropelException */ public function setOrder(ChildOrder $v = null) @@ -1820,7 +1790,6 @@ abstract class OrderCoupon implements ActiveRecordInterface $v->addOrderCoupon($this); } - return $this; } @@ -1828,8 +1797,8 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Get the associated ChildOrder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrder The associated ChildOrder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrder The associated ChildOrder object. * @throws PropelException */ public function getOrder(ConnectionInterface $con = null) @@ -1882,7 +1851,7 @@ abstract class OrderCoupon implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1907,7 +1876,7 @@ abstract class OrderCoupon implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderCoupon The current object (for fluent API support) + * @return ChildOrderCoupon The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/OrderCouponQuery.php b/core/lib/Thelia/Model/Base/OrderCouponQuery.php index 037a8f695..6bd10fe31 100644 --- a/core/lib/Thelia/Model/Base/OrderCouponQuery.php +++ b/core/lib/Thelia/Model/Base/OrderCouponQuery.php @@ -103,9 +103,9 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderCouponQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderCoupon', $modelAlias = null) { @@ -115,8 +115,8 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Returns a new ChildOrderCouponQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderCouponQuery */ @@ -145,7 +145,7 @@ abstract class OrderCouponQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderCoupon|array|mixed the result, formatted by the current formatter @@ -176,10 +176,10 @@ abstract class OrderCouponQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderCoupon A model object, or null if the key is not found + * @return ChildOrderCoupon A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -206,8 +206,8 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderCoupon|array|mixed the result, formatted by the current formatter */ @@ -227,8 +227,8 @@ abstract class OrderCouponQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -249,26 +249,24 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderCouponQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderCouponTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderCouponQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderCouponTableMap::ID, $keys, Criteria::IN); } @@ -282,11 +280,11 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -325,11 +323,11 @@ abstract class OrderCouponQuery extends ModelCriteria * * @see filterByOrder() * - * @param mixed $orderId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $orderId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -365,9 +363,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -394,9 +392,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $type The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $type The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -424,11 +422,11 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByAmount(array('min' => 12)); // WHERE amount > 12 * * - * @param mixed $amount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $amount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -464,9 +462,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -493,9 +491,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' * * - * @param string $shortDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $shortDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -522,9 +520,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -552,13 +550,13 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' * * - * @param mixed $expirationDate The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $expirationDate The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -594,12 +592,12 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByIsCumulative('yes'); // WHERE is_cumulative = true * * - * @param boolean|string $isCumulative The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isCumulative The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -621,12 +619,12 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByIsRemovingPostage('yes'); // WHERE is_removing_postage = true * * - * @param boolean|string $isRemovingPostage The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isRemovingPostage The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -648,12 +646,12 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByIsAvailableOnSpecialOffers('yes'); // WHERE is_available_on_special_offers = true * * - * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -675,9 +673,9 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterBySerializedConditions('%fooValue%'); // WHERE serialized_conditions LIKE '%fooValue%' * * - * @param string $serializedConditions The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedConditions The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -705,13 +703,13 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -748,13 +746,13 @@ abstract class OrderCouponQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -784,8 +782,8 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -809,8 +807,8 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -843,11 +841,11 @@ abstract class OrderCouponQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -859,7 +857,7 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderCoupon $orderCoupon Object to remove from the list of results + * @param ChildOrderCoupon $orderCoupon Object to remove from the list of results * * @return ChildOrderCouponQuery The current query, for fluid interface */ @@ -875,8 +873,8 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Deletes all rows from the order_coupon table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -907,13 +905,13 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderCoupon or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderCoupon object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderCoupon object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -933,7 +931,6 @@ abstract class OrderCouponQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderCouponTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -952,9 +949,9 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -964,9 +961,9 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -976,7 +973,7 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -986,7 +983,7 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -996,7 +993,7 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1006,7 +1003,7 @@ abstract class OrderCouponQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderCouponQuery The current query, for fluid interface + * @return ChildOrderCouponQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php index 0e65ba671..a6271f81b 100644 --- a/core/lib/Thelia/Model/Base/OrderProduct.php +++ b/core/lib/Thelia/Model/Base/OrderProduct.php @@ -34,7 +34,6 @@ abstract class OrderProduct implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -427,9 +426,9 @@ abstract class OrderProduct implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderProduct The current object, for fluid interface */ @@ -479,198 +478,180 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [order_id] column value. * - * @return int + * @return int */ public function getOrderId() { - return $this->order_id; } /** * Get the [product_ref] column value. * - * @return string + * @return string */ public function getProductRef() { - return $this->product_ref; } /** * Get the [product_sale_elements_ref] column value. * - * @return string + * @return string */ public function getProductSaleElementsRef() { - return $this->product_sale_elements_ref; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Get the [quantity] column value. * - * @return double + * @return double */ public function getQuantity() { - return $this->quantity; } /** * Get the [price] column value. * - * @return double + * @return double */ public function getPrice() { - return $this->price; } /** * Get the [promo_price] column value. * - * @return string + * @return string */ public function getPromoPrice() { - return $this->promo_price; } /** * Get the [was_new] column value. * - * @return int + * @return int */ public function getWasNew() { - return $this->was_new; } /** * Get the [was_in_promo] column value. * - * @return int + * @return int */ public function getWasInPromo() { - return $this->was_in_promo; } /** * Get the [weight] column value. * - * @return string + * @return string */ public function getWeight() { - return $this->weight; } /** * Get the [ean_code] column value. * - * @return string + * @return string */ public function getEanCode() { - return $this->ean_code; } /** * Get the [tax_rule_title] column value. * - * @return string + * @return string */ public function getTaxRuleTitle() { - return $this->tax_rule_title; } /** * Get the [tax_rule_description] column value. * - * @return string + * @return string */ public function getTaxRuleDescription() { - return $this->tax_rule_description; } /** * Get the [parent] column value. * not managed yet - * @return int + * @return int */ public function getParent() { - return $this->parent; } @@ -678,8 +659,8 @@ abstract class OrderProduct implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -698,8 +679,8 @@ abstract class OrderProduct implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -717,8 +698,8 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setId($v) { @@ -731,15 +712,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [order_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setOrderId($v) { @@ -756,15 +736,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->aOrder = null; } - return $this; } // setOrderId() /** * Set the value of [product_ref] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setProductRef($v) { @@ -777,15 +756,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::PRODUCT_REF] = true; } - return $this; } // setProductRef() /** * Set the value of [product_sale_elements_ref] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setProductSaleElementsRef($v) { @@ -798,15 +776,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF] = true; } - return $this; } // setProductSaleElementsRef() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setTitle($v) { @@ -819,15 +796,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setChapo($v) { @@ -840,15 +816,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setDescription($v) { @@ -861,15 +836,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -882,15 +856,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() /** * Set the value of [quantity] column. * - * @param double $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setQuantity($v) { @@ -903,15 +876,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::QUANTITY] = true; } - return $this; } // setQuantity() /** * Set the value of [price] column. * - * @param double $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setPrice($v) { @@ -924,15 +896,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::PRICE] = true; } - return $this; } // setPrice() /** * Set the value of [promo_price] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setPromoPrice($v) { @@ -945,15 +916,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::PROMO_PRICE] = true; } - return $this; } // setPromoPrice() /** * Set the value of [was_new] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setWasNew($v) { @@ -966,15 +936,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::WAS_NEW] = true; } - return $this; } // setWasNew() /** * Set the value of [was_in_promo] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setWasInPromo($v) { @@ -987,15 +956,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::WAS_IN_PROMO] = true; } - return $this; } // setWasInPromo() /** * Set the value of [weight] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setWeight($v) { @@ -1008,15 +976,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::WEIGHT] = true; } - return $this; } // setWeight() /** * Set the value of [ean_code] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setEanCode($v) { @@ -1029,15 +996,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::EAN_CODE] = true; } - return $this; } // setEanCode() /** * Set the value of [tax_rule_title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setTaxRuleTitle($v) { @@ -1050,15 +1016,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::TAX_RULE_TITLE] = true; } - return $this; } // setTaxRuleTitle() /** * Set the value of [tax_rule_description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setTaxRuleDescription($v) { @@ -1071,15 +1036,14 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::TAX_RULE_DESCRIPTION] = true; } - return $this; } // setTaxRuleDescription() /** * Set the value of [parent] column. * not managed yet - * @param int $v new value - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setParent($v) { @@ -1092,16 +1056,15 @@ abstract class OrderProduct implements ActiveRecordInterface $this->modifiedColumns[OrderProductTableMap::PARENT] = true; } - return $this; } // setParent() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -1113,16 +1076,15 @@ abstract class OrderProduct implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -1134,7 +1096,6 @@ abstract class OrderProduct implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -1280,10 +1241,10 @@ abstract class OrderProduct implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1323,7 +1284,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderProduct::setDeleted() @@ -1366,8 +1327,8 @@ abstract class OrderProduct implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1428,8 +1389,8 @@ abstract class OrderProduct implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1506,7 +1467,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1674,7 +1635,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1690,12 +1651,12 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1709,7 +1670,7 @@ abstract class OrderProduct implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1787,12 +1748,12 @@ abstract class OrderProduct implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1848,12 +1809,12 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1867,8 +1828,8 @@ abstract class OrderProduct implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1950,8 +1911,8 @@ abstract class OrderProduct implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -2009,7 +1970,6 @@ abstract class OrderProduct implements ActiveRecordInterface if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent); if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) $criteria->add(OrderProductTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) $criteria->add(OrderProductTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -2031,7 +1991,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -2041,7 +2001,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -2055,7 +2015,6 @@ abstract class OrderProduct implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -2065,9 +2024,9 @@ abstract class OrderProduct implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderProduct (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderProduct (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -2125,8 +2084,8 @@ abstract class OrderProduct implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderProduct Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderProduct Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -2142,8 +2101,8 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrder object. * - * @param ChildOrder $v - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param ChildOrder $v + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) * @throws PropelException */ public function setOrder(ChildOrder $v = null) @@ -2162,7 +2121,6 @@ abstract class OrderProduct implements ActiveRecordInterface $v->addOrderProduct($this); } - return $this; } @@ -2170,8 +2128,8 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Get the associated ChildOrder object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrder The associated ChildOrder object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrder The associated ChildOrder object. * @throws PropelException */ public function getOrder(ConnectionInterface $con = null) @@ -2196,7 +2154,7 @@ abstract class OrderProduct implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -2238,8 +2196,8 @@ abstract class OrderProduct implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2261,8 +2219,8 @@ abstract class OrderProduct implements ActiveRecordInterface * If this ChildOrderProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrderProductAttributeCombination[] List of ChildOrderProductAttributeCombination objects * @throws PropelException */ @@ -2318,15 +2276,14 @@ abstract class OrderProduct implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orderProductAttributeCombinations A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderProduct The current object (for fluent API support) + * @param Collection $orderProductAttributeCombinations A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderProduct The current object (for fluent API support) */ public function setOrderProductAttributeCombinations(Collection $orderProductAttributeCombinations, ConnectionInterface $con = null) { $orderProductAttributeCombinationsToDelete = $this->getOrderProductAttributeCombinations(new Criteria(), $con)->diff($orderProductAttributeCombinations); - $this->orderProductAttributeCombinationsScheduledForDeletion = $orderProductAttributeCombinationsToDelete; foreach ($orderProductAttributeCombinationsToDelete as $orderProductAttributeCombinationRemoved) { @@ -2347,10 +2304,10 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Returns the number of related OrderProductAttributeCombination objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related OrderProductAttributeCombination objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related OrderProductAttributeCombination objects. * @throws PropelException */ public function countOrderProductAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2382,8 +2339,8 @@ abstract class OrderProduct implements ActiveRecordInterface * Method called to associate a ChildOrderProductAttributeCombination object to this object * through the ChildOrderProductAttributeCombination foreign key attribute. * - * @param ChildOrderProductAttributeCombination $l ChildOrderProductAttributeCombination - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param ChildOrderProductAttributeCombination $l ChildOrderProductAttributeCombination + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function addOrderProductAttributeCombination(ChildOrderProductAttributeCombination $l) { @@ -2410,7 +2367,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * @param OrderProductAttributeCombination $orderProductAttributeCombination The orderProductAttributeCombination object to remove. - * @return ChildOrderProduct The current object (for fluent API support) + * @return ChildOrderProduct The current object (for fluent API support) */ public function removeOrderProductAttributeCombination($orderProductAttributeCombination) { @@ -2456,8 +2413,8 @@ abstract class OrderProduct implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2479,8 +2436,8 @@ abstract class OrderProduct implements ActiveRecordInterface * If this ChildOrderProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrderProductTax[] List of ChildOrderProductTax objects * @throws PropelException */ @@ -2536,15 +2493,14 @@ abstract class OrderProduct implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orderProductTaxes A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderProduct The current object (for fluent API support) + * @param Collection $orderProductTaxes A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderProduct The current object (for fluent API support) */ public function setOrderProductTaxes(Collection $orderProductTaxes, ConnectionInterface $con = null) { $orderProductTaxesToDelete = $this->getOrderProductTaxes(new Criteria(), $con)->diff($orderProductTaxes); - $this->orderProductTaxesScheduledForDeletion = $orderProductTaxesToDelete; foreach ($orderProductTaxesToDelete as $orderProductTaxRemoved) { @@ -2565,10 +2521,10 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Returns the number of related OrderProductTax objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related OrderProductTax objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related OrderProductTax objects. * @throws PropelException */ public function countOrderProductTaxes(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2600,8 +2556,8 @@ abstract class OrderProduct implements ActiveRecordInterface * Method called to associate a ChildOrderProductTax object to this object * through the ChildOrderProductTax foreign key attribute. * - * @param ChildOrderProductTax $l ChildOrderProductTax - * @return \Thelia\Model\OrderProduct The current object (for fluent API support) + * @param ChildOrderProductTax $l ChildOrderProductTax + * @return \Thelia\Model\OrderProduct The current object (for fluent API support) */ public function addOrderProductTax(ChildOrderProductTax $l) { @@ -2627,7 +2583,7 @@ abstract class OrderProduct implements ActiveRecordInterface } /** - * @param OrderProductTax $orderProductTax The orderProductTax object to remove. + * @param OrderProductTax $orderProductTax The orderProductTax object to remove. * @return ChildOrderProduct The current object (for fluent API support) */ public function removeOrderProductTax($orderProductTax) @@ -2684,7 +2640,7 @@ abstract class OrderProduct implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2721,7 +2677,7 @@ abstract class OrderProduct implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderProduct The current object (for fluent API support) + * @return ChildOrderProduct The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2806,7 +2762,6 @@ abstract class OrderProduct implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php index c1ea23848..51f090359 100644 --- a/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php +++ b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php @@ -29,7 +29,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductAttributeCombinationTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -350,9 +349,9 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderProductAttributeCombination The current object, for fluid interface */ @@ -402,110 +401,100 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [order_product_id] column value. * - * @return int + * @return int */ public function getOrderProductId() { - return $this->order_product_id; } /** * Get the [attribute_title] column value. * - * @return string + * @return string */ public function getAttributeTitle() { - return $this->attribute_title; } /** * Get the [attribute_chapo] column value. * - * @return string + * @return string */ public function getAttributeChapo() { - return $this->attribute_chapo; } /** * Get the [attribute_description] column value. * - * @return string + * @return string */ public function getAttributeDescription() { - return $this->attribute_description; } /** * Get the [attribute_postscriptum] column value. * - * @return string + * @return string */ public function getAttributePostscriptum() { - return $this->attribute_postscriptum; } /** * Get the [attribute_av_title] column value. * - * @return string + * @return string */ public function getAttributeAvTitle() { - return $this->attribute_av_title; } /** * Get the [attribute_av_chapo] column value. * - * @return string + * @return string */ public function getAttributeAvChapo() { - return $this->attribute_av_chapo; } /** * Get the [attribute_av_description] column value. * - * @return string + * @return string */ public function getAttributeAvDescription() { - return $this->attribute_av_description; } /** * Get the [attribute_av_postscriptum] column value. * - * @return string + * @return string */ public function getAttributeAvPostscriptum() { - return $this->attribute_av_postscriptum; } @@ -513,8 +502,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -533,8 +522,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -552,8 +541,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setId($v) { @@ -566,15 +555,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [order_product_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setOrderProductId($v) { @@ -591,15 +579,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->aOrderProduct = null; } - return $this; } // setOrderProductId() /** * Set the value of [attribute_title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeTitle($v) { @@ -612,15 +599,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE] = true; } - return $this; } // setAttributeTitle() /** * Set the value of [attribute_chapo] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeChapo($v) { @@ -633,15 +619,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO] = true; } - return $this; } // setAttributeChapo() /** * Set the value of [attribute_description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeDescription($v) { @@ -654,15 +639,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION] = true; } - return $this; } // setAttributeDescription() /** * Set the value of [attribute_postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributePostscriptum($v) { @@ -675,15 +659,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUM] = true; } - return $this; } // setAttributePostscriptum() /** * Set the value of [attribute_av_title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeAvTitle($v) { @@ -696,15 +679,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE] = true; } - return $this; } // setAttributeAvTitle() /** * Set the value of [attribute_av_chapo] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeAvChapo($v) { @@ -717,15 +699,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO] = true; } - return $this; } // setAttributeAvChapo() /** * Set the value of [attribute_av_description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeAvDescription($v) { @@ -738,15 +719,14 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION] = true; } - return $this; } // setAttributeAvDescription() /** * Set the value of [attribute_av_postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setAttributeAvPostscriptum($v) { @@ -759,16 +739,15 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $this->modifiedColumns[OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM] = true; } - return $this; } // setAttributeAvPostscriptum() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -780,16 +759,15 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -801,7 +779,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -923,10 +900,10 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -962,7 +939,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderProductAttributeCombination::setDeleted() @@ -1005,8 +982,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1067,8 +1044,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1111,7 +1088,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1231,7 +1208,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1247,12 +1224,12 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1266,7 +1243,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1320,12 +1297,12 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1367,12 +1344,12 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1386,8 +1363,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1445,8 +1422,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1488,7 +1465,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $this->attribute_av_postscriptum); if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::CREATED_AT)) $criteria->add(OrderProductAttributeCombinationTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::UPDATED_AT)) $criteria->add(OrderProductAttributeCombinationTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1510,7 +1486,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1520,7 +1496,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1534,7 +1510,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1544,9 +1519,9 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderProductAttributeCombination (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderProductAttributeCombination (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1576,8 +1551,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderProductAttributeCombination Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderProductAttributeCombination Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1593,8 +1568,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderProduct object. * - * @param ChildOrderProduct $v - * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) + * @param ChildOrderProduct $v + * @return \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support) * @throws PropelException */ public function setOrderProduct(ChildOrderProduct $v = null) @@ -1613,7 +1588,6 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface $v->addOrderProductAttributeCombination($this); } - return $this; } @@ -1621,8 +1595,8 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Get the associated ChildOrderProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderProduct The associated ChildOrderProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderProduct The associated ChildOrderProduct object. * @throws PropelException */ public function getOrderProduct(ConnectionInterface $con = null) @@ -1672,7 +1646,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1697,7 +1671,7 @@ abstract class OrderProductAttributeCombination implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderProductAttributeCombination The current object (for fluent API support) + * @return ChildOrderProductAttributeCombination The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php index cddfb5bbc..88fadaf19 100644 --- a/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php +++ b/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php @@ -91,9 +91,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderProductAttributeCombinationQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProductAttributeCombination', $modelAlias = null) { @@ -103,8 +103,8 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Returns a new ChildOrderProductAttributeCombinationQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderProductAttributeCombinationQuery */ @@ -133,7 +133,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderProductAttributeCombination|array|mixed the result, formatted by the current formatter @@ -164,10 +164,10 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderProductAttributeCombination A model object, or null if the key is not found + * @return ChildOrderProductAttributeCombination A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -194,8 +194,8 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderProductAttributeCombination|array|mixed the result, formatted by the current formatter */ @@ -215,8 +215,8 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -237,26 +237,24 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $keys, Criteria::IN); } @@ -270,11 +268,11 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -313,11 +311,11 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * * @see filterByOrderProduct() * - * @param mixed $orderProductId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $orderProductId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -353,9 +351,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeTitle('%fooValue%'); // WHERE attribute_title LIKE '%fooValue%' * * - * @param string $attributeTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -382,9 +380,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeChapo('%fooValue%'); // WHERE attribute_chapo LIKE '%fooValue%' * * - * @param string $attributeChapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeChapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -411,9 +409,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeDescription('%fooValue%'); // WHERE attribute_description LIKE '%fooValue%' * * - * @param string $attributeDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -440,9 +438,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributePostscriptum('%fooValue%'); // WHERE attribute_postscriptum LIKE '%fooValue%' * * - * @param string $attributePostscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributePostscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -469,9 +467,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeAvTitle('%fooValue%'); // WHERE attribute_av_title LIKE '%fooValue%' * * - * @param string $attributeAvTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeAvTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -498,9 +496,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeAvChapo('%fooValue%'); // WHERE attribute_av_chapo LIKE '%fooValue%' * * - * @param string $attributeAvChapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeAvChapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -527,9 +525,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeAvDescription('%fooValue%'); // WHERE attribute_av_description LIKE '%fooValue%' * * - * @param string $attributeAvDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeAvDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -556,9 +554,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByAttributeAvPostscriptum('%fooValue%'); // WHERE attribute_av_postscriptum LIKE '%fooValue%' * * - * @param string $attributeAvPostscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $attributeAvPostscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -586,13 +584,13 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -629,13 +627,13 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -666,7 +664,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderProduct object * * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -690,8 +688,8 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -724,11 +722,11 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query */ public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -740,7 +738,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderProductAttributeCombination $orderProductAttributeCombination Object to remove from the list of results + * @param ChildOrderProductAttributeCombination $orderProductAttributeCombination Object to remove from the list of results * * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ @@ -756,8 +754,8 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Deletes all rows from the order_product_attribute_combination table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -788,13 +786,13 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderProductAttributeCombination or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderProductAttributeCombination object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderProductAttributeCombination object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -814,7 +812,6 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderProductAttributeCombinationTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -833,9 +830,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -845,9 +842,9 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -857,7 +854,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -867,7 +864,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -877,7 +874,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -887,7 +884,7 @@ abstract class OrderProductAttributeCombinationQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface + * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php index 4ab5d4721..762ee5566 100644 --- a/core/lib/Thelia/Model/Base/OrderProductQuery.php +++ b/core/lib/Thelia/Model/Base/OrderProductQuery.php @@ -131,9 +131,9 @@ abstract class OrderProductQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderProductQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProduct', $modelAlias = null) { @@ -143,8 +143,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Returns a new ChildOrderProductQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderProductQuery */ @@ -173,7 +173,7 @@ abstract class OrderProductQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter @@ -204,10 +204,10 @@ abstract class OrderProductQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderProduct A model object, or null if the key is not found + * @return ChildOrderProduct A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -234,8 +234,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter */ @@ -255,8 +255,8 @@ abstract class OrderProductQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -277,26 +277,24 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderProductQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderProductTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderProductQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderProductTableMap::ID, $keys, Criteria::IN); } @@ -310,11 +308,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -353,11 +351,11 @@ abstract class OrderProductQuery extends ModelCriteria * * @see filterByOrder() * - * @param mixed $orderId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $orderId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -393,9 +391,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByProductRef('%fooValue%'); // WHERE product_ref LIKE '%fooValue%' * * - * @param string $productRef The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $productRef The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -422,9 +420,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByProductSaleElementsRef('%fooValue%'); // WHERE product_sale_elements_ref LIKE '%fooValue%' * * - * @param string $productSaleElementsRef The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $productSaleElementsRef The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -451,9 +449,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -480,9 +478,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -509,9 +507,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -538,9 +536,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -568,11 +566,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12 * * - * @param mixed $quantity The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $quantity The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -609,11 +607,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByPrice(array('min' => 12)); // WHERE price > 12 * * - * @param mixed $price The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $price The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -649,9 +647,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByPromoPrice('%fooValue%'); // WHERE promo_price LIKE '%fooValue%' * * - * @param string $promoPrice The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $promoPrice The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -679,11 +677,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByWasNew(array('min' => 12)); // WHERE was_new > 12 * * - * @param mixed $wasNew The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $wasNew The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -720,11 +718,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByWasInPromo(array('min' => 12)); // WHERE was_in_promo > 12 * * - * @param mixed $wasInPromo The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $wasInPromo The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -760,9 +758,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByWeight('%fooValue%'); // WHERE weight LIKE '%fooValue%' * * - * @param string $weight The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $weight The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -789,9 +787,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByEanCode('%fooValue%'); // WHERE ean_code LIKE '%fooValue%' * * - * @param string $eanCode The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $eanCode The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -818,9 +816,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByTaxRuleTitle('%fooValue%'); // WHERE tax_rule_title LIKE '%fooValue%' * * - * @param string $taxRuleTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $taxRuleTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -847,9 +845,9 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByTaxRuleDescription('%fooValue%'); // WHERE tax_rule_description LIKE '%fooValue%' * * - * @param string $taxRuleDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $taxRuleDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -877,11 +875,11 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByParent(array('min' => 12)); // WHERE parent > 12 * * - * @param mixed $parent The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $parent The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -918,13 +916,13 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -961,13 +959,13 @@ abstract class OrderProductQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -997,8 +995,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1022,8 +1020,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1056,11 +1054,11 @@ abstract class OrderProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1072,8 +1070,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\OrderProductAttributeCombination object * - * @param \Thelia\Model\OrderProductAttributeCombination|ObjectCollection $orderProductAttributeCombination the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\OrderProductAttributeCombination|ObjectCollection $orderProductAttributeCombination the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1095,8 +1093,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderProductAttributeCombination relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1129,11 +1127,11 @@ abstract class OrderProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderProductAttributeCombinationQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderProductAttributeCombinationQuery A secondary query class using the current class as primary query */ public function useOrderProductAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1145,8 +1143,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\OrderProductTax object * - * @param \Thelia\Model\OrderProductTax|ObjectCollection $orderProductTax the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\OrderProductTax|ObjectCollection $orderProductTax the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1168,8 +1166,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderProductTax relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1202,11 +1200,11 @@ abstract class OrderProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderProductTaxQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderProductTaxQuery A secondary query class using the current class as primary query */ public function useOrderProductTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1218,7 +1216,7 @@ abstract class OrderProductQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderProduct $orderProduct Object to remove from the list of results + * @param ChildOrderProduct $orderProduct Object to remove from the list of results * * @return ChildOrderProductQuery The current query, for fluid interface */ @@ -1234,8 +1232,8 @@ abstract class OrderProductQuery extends ModelCriteria /** * Deletes all rows from the order_product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1266,13 +1264,13 @@ abstract class OrderProductQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderProduct or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderProduct object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderProduct object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1292,7 +1290,6 @@ abstract class OrderProductQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderProductTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1311,9 +1308,9 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1323,9 +1320,9 @@ abstract class OrderProductQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1335,7 +1332,7 @@ abstract class OrderProductQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1345,7 +1342,7 @@ abstract class OrderProductQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1355,7 +1352,7 @@ abstract class OrderProductQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1365,7 +1362,7 @@ abstract class OrderProductQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderProductQuery The current query, for fluid interface + * @return ChildOrderProductQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderProductTax.php b/core/lib/Thelia/Model/Base/OrderProductTax.php index b394dde60..4bfe7c369 100644 --- a/core/lib/Thelia/Model/Base/OrderProductTax.php +++ b/core/lib/Thelia/Model/Base/OrderProductTax.php @@ -29,7 +29,6 @@ abstract class OrderProductTax implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductTaxTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -326,9 +325,9 @@ abstract class OrderProductTax implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderProductTax The current object, for fluid interface */ @@ -378,66 +377,60 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [order_product_id] column value. * - * @return int + * @return int */ public function getOrderProductId() { - return $this->order_product_id; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [amount] column value. * - * @return double + * @return double */ public function getAmount() { - return $this->amount; } /** * Get the [promo_amount] column value. * - * @return double + * @return double */ public function getPromoAmount() { - return $this->promo_amount; } @@ -445,8 +438,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -465,8 +458,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -484,8 +477,8 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setId($v) { @@ -498,15 +491,14 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->modifiedColumns[OrderProductTaxTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [order_product_id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setOrderProductId($v) { @@ -523,15 +515,14 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->aOrderProduct = null; } - return $this; } // setOrderProductId() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setTitle($v) { @@ -544,15 +535,14 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->modifiedColumns[OrderProductTaxTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setDescription($v) { @@ -565,15 +555,14 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->modifiedColumns[OrderProductTaxTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [amount] column. * - * @param double $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setAmount($v) { @@ -586,15 +575,14 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->modifiedColumns[OrderProductTaxTableMap::AMOUNT] = true; } - return $this; } // setAmount() /** * Set the value of [promo_amount] column. * - * @param double $v new value - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setPromoAmount($v) { @@ -607,16 +595,15 @@ abstract class OrderProductTax implements ActiveRecordInterface $this->modifiedColumns[OrderProductTaxTableMap::PROMO_AMOUNT] = true; } - return $this; } // setPromoAmount() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -628,16 +615,15 @@ abstract class OrderProductTax implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -649,7 +635,6 @@ abstract class OrderProductTax implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -759,10 +744,10 @@ abstract class OrderProductTax implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -798,7 +783,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderProductTax::setDeleted() @@ -841,8 +826,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -903,8 +888,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -947,7 +932,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1043,7 +1028,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1059,12 +1044,12 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1078,7 +1063,7 @@ abstract class OrderProductTax implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1120,12 +1105,12 @@ abstract class OrderProductTax implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1163,12 +1148,12 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1182,8 +1167,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1229,8 +1214,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1264,7 +1249,6 @@ abstract class OrderProductTax implements ActiveRecordInterface if ($this->isColumnModified(OrderProductTaxTableMap::PROMO_AMOUNT)) $criteria->add(OrderProductTaxTableMap::PROMO_AMOUNT, $this->promo_amount); if ($this->isColumnModified(OrderProductTaxTableMap::CREATED_AT)) $criteria->add(OrderProductTaxTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderProductTaxTableMap::UPDATED_AT)) $criteria->add(OrderProductTaxTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1286,7 +1270,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1296,7 +1280,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1310,7 +1294,6 @@ abstract class OrderProductTax implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1320,9 +1303,9 @@ abstract class OrderProductTax implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderProductTax (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderProductTax (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1348,8 +1331,8 @@ abstract class OrderProductTax implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderProductTax Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderProductTax Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1365,8 +1348,8 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderProduct object. * - * @param ChildOrderProduct $v - * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) + * @param ChildOrderProduct $v + * @return \Thelia\Model\OrderProductTax The current object (for fluent API support) * @throws PropelException */ public function setOrderProduct(ChildOrderProduct $v = null) @@ -1385,7 +1368,6 @@ abstract class OrderProductTax implements ActiveRecordInterface $v->addOrderProductTax($this); } - return $this; } @@ -1393,8 +1375,8 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Get the associated ChildOrderProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderProduct The associated ChildOrderProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderProduct The associated ChildOrderProduct object. * @throws PropelException */ public function getOrderProduct(ConnectionInterface $con = null) @@ -1440,7 +1422,7 @@ abstract class OrderProductTax implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1465,7 +1447,7 @@ abstract class OrderProductTax implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderProductTax The current object (for fluent API support) + * @return ChildOrderProductTax The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php b/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php index 4bb59bf0d..56802e645 100644 --- a/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php +++ b/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php @@ -75,9 +75,9 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderProductTaxQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProductTax', $modelAlias = null) { @@ -87,8 +87,8 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Returns a new ChildOrderProductTaxQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderProductTaxQuery */ @@ -117,7 +117,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderProductTax|array|mixed the result, formatted by the current formatter @@ -148,10 +148,10 @@ abstract class OrderProductTaxQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderProductTax A model object, or null if the key is not found + * @return ChildOrderProductTax A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -178,8 +178,8 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderProductTax|array|mixed the result, formatted by the current formatter */ @@ -199,8 +199,8 @@ abstract class OrderProductTaxQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -221,26 +221,24 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderProductTaxTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderProductTaxTableMap::ID, $keys, Criteria::IN); } @@ -254,11 +252,11 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -297,11 +295,11 @@ abstract class OrderProductTaxQuery extends ModelCriteria * * @see filterByOrderProduct() * - * @param mixed $orderProductId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $orderProductId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -337,9 +335,9 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -366,9 +364,9 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -396,11 +394,11 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByAmount(array('min' => 12)); // WHERE amount > 12 * * - * @param mixed $amount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $amount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -437,11 +435,11 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByPromoAmount(array('min' => 12)); // WHERE promo_amount > 12 * * - * @param mixed $promoAmount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $promoAmount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -478,13 +476,13 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -521,13 +519,13 @@ abstract class OrderProductTaxQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -558,7 +556,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderProduct object * * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class OrderProductTaxQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query */ public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -632,7 +630,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderProductTax $orderProductTax Object to remove from the list of results + * @param ChildOrderProductTax $orderProductTax Object to remove from the list of results * * @return ChildOrderProductTaxQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Deletes all rows from the order_product_tax table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderProductTax or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderProductTax object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderProductTax object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class OrderProductTaxQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderProductTaxTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class OrderProductTaxQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderProductTaxQuery The current query, for fluid interface + * @return ChildOrderProductTaxQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderQuery.php b/core/lib/Thelia/Model/Base/OrderQuery.php index 96aa3d30b..d2d430ff0 100644 --- a/core/lib/Thelia/Model/Base/OrderQuery.php +++ b/core/lib/Thelia/Model/Base/OrderQuery.php @@ -155,9 +155,9 @@ abstract class OrderQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Order', $modelAlias = null) { @@ -167,8 +167,8 @@ abstract class OrderQuery extends ModelCriteria /** * Returns a new ChildOrderQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderQuery */ @@ -197,7 +197,7 @@ abstract class OrderQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrder|array|mixed the result, formatted by the current formatter @@ -228,10 +228,10 @@ abstract class OrderQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrder A model object, or null if the key is not found + * @return ChildOrder A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -258,8 +258,8 @@ abstract class OrderQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrder|array|mixed the result, formatted by the current formatter */ @@ -279,8 +279,8 @@ abstract class OrderQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -301,26 +301,24 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderTableMap::ID, $keys, Criteria::IN); } @@ -334,11 +332,11 @@ abstract class OrderQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -374,9 +372,9 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%' * * - * @param string $ref The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $ref The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -406,11 +404,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByCustomer() * - * @param mixed $customerId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $customerId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -449,11 +447,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByOrderAddressRelatedByInvoiceOrderAddressId() * - * @param mixed $invoiceOrderAddressId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $invoiceOrderAddressId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -492,11 +490,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByOrderAddressRelatedByDeliveryOrderAddressId() * - * @param mixed $deliveryOrderAddressId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $deliveryOrderAddressId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -533,13 +531,13 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByInvoiceDate(array('max' => 'yesterday')); // WHERE invoice_date > '2011-03-13' * * - * @param mixed $invoiceDate The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $invoiceDate The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -578,11 +576,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByCurrency() * - * @param mixed $currencyId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $currencyId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -619,11 +617,11 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByCurrencyRate(array('min' => 12)); // WHERE currency_rate > 12 * * - * @param mixed $currencyRate The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $currencyRate The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -659,9 +657,9 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByTransactionRef('%fooValue%'); // WHERE transaction_ref LIKE '%fooValue%' * * - * @param string $transactionRef The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $transactionRef The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -688,9 +686,9 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByDeliveryRef('%fooValue%'); // WHERE delivery_ref LIKE '%fooValue%' * * - * @param string $deliveryRef The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $deliveryRef The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -717,9 +715,9 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByInvoiceRef('%fooValue%'); // WHERE invoice_ref LIKE '%fooValue%' * * - * @param string $invoiceRef The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $invoiceRef The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -747,11 +745,11 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByDiscount(array('min' => 12)); // WHERE discount > 12 * * - * @param mixed $discount The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $discount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -788,11 +786,11 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByPostage(array('min' => 12)); // WHERE postage > 12 * * - * @param mixed $postage The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $postage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -831,11 +829,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByModuleRelatedByPaymentModuleId() * - * @param mixed $paymentModuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $paymentModuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -874,11 +872,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByModuleRelatedByDeliveryModuleId() * - * @param mixed $deliveryModuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $deliveryModuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -917,11 +915,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByOrderStatus() * - * @param mixed $statusId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $statusId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -960,11 +958,11 @@ abstract class OrderQuery extends ModelCriteria * * @see filterByLang() * - * @param mixed $langId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $langId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1001,13 +999,13 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1044,13 +1042,13 @@ abstract class OrderQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1080,8 +1078,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Currency object * - * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1105,8 +1103,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Currency relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1139,11 +1137,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query */ public function useCurrencyQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1155,8 +1153,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Customer object * - * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1180,8 +1178,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Customer relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1214,11 +1212,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query */ public function useCustomerQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1231,7 +1229,7 @@ abstract class OrderQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderAddress object * * @param \Thelia\Model\OrderAddress|ObjectCollection $orderAddress The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1255,8 +1253,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderAddressRelatedByInvoiceOrderAddressId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1289,11 +1287,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderAddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderAddressQuery A secondary query class using the current class as primary query */ public function useOrderAddressRelatedByInvoiceOrderAddressIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1306,7 +1304,7 @@ abstract class OrderQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderAddress object * * @param \Thelia\Model\OrderAddress|ObjectCollection $orderAddress The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1330,8 +1328,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderAddressRelatedByDeliveryOrderAddressId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1364,11 +1362,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderAddressQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderAddressQuery A secondary query class using the current class as primary query */ public function useOrderAddressRelatedByDeliveryOrderAddressIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1381,7 +1379,7 @@ abstract class OrderQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderStatus object * * @param \Thelia\Model\OrderStatus|ObjectCollection $orderStatus The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1405,8 +1403,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderStatus relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1439,11 +1437,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderStatusQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderStatusQuery A secondary query class using the current class as primary query */ public function useOrderStatusQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1455,8 +1453,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1480,8 +1478,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleRelatedByPaymentModuleId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1514,11 +1512,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleRelatedByPaymentModuleIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1530,8 +1528,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1555,8 +1553,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ModuleRelatedByDeliveryModuleId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1589,11 +1587,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleRelatedByDeliveryModuleIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1605,8 +1603,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Lang object * - * @param \Thelia\Model\Lang|ObjectCollection $lang The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Lang|ObjectCollection $lang The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1630,8 +1628,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Lang relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1664,11 +1662,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\LangQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\LangQuery A secondary query class using the current class as primary query */ public function useLangQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1680,8 +1678,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\OrderProduct object * - * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1703,8 +1701,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1737,11 +1735,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query */ public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1753,8 +1751,8 @@ abstract class OrderQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\OrderCoupon object * - * @param \Thelia\Model\OrderCoupon|ObjectCollection $orderCoupon the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\OrderCoupon|ObjectCollection $orderCoupon the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1776,8 +1774,8 @@ abstract class OrderQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderCoupon relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1810,11 +1808,11 @@ abstract class OrderQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderCouponQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderCouponQuery A secondary query class using the current class as primary query */ public function useOrderCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1826,7 +1824,7 @@ abstract class OrderQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrder $order Object to remove from the list of results + * @param ChildOrder $order Object to remove from the list of results * * @return ChildOrderQuery The current query, for fluid interface */ @@ -1842,8 +1840,8 @@ abstract class OrderQuery extends ModelCriteria /** * Deletes all rows from the order table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1874,13 +1872,13 @@ abstract class OrderQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrder or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrder object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrder object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1900,7 +1898,6 @@ abstract class OrderQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1919,9 +1916,9 @@ abstract class OrderQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1931,9 +1928,9 @@ abstract class OrderQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1943,7 +1940,7 @@ abstract class OrderQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1953,7 +1950,7 @@ abstract class OrderQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1963,7 +1960,7 @@ abstract class OrderQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1973,7 +1970,7 @@ abstract class OrderQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderQuery The current query, for fluid interface + * @return ChildOrderQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php index 2e612d635..02512ff02 100644 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -32,7 +32,6 @@ abstract class OrderStatus implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderStatusTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -338,9 +337,9 @@ abstract class OrderStatus implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderStatus The current object, for fluid interface */ @@ -390,22 +389,20 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } @@ -413,8 +410,8 @@ abstract class OrderStatus implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -433,8 +430,8 @@ abstract class OrderStatus implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -452,8 +449,8 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function setId($v) { @@ -466,15 +463,14 @@ abstract class OrderStatus implements ActiveRecordInterface $this->modifiedColumns[OrderStatusTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function setCode($v) { @@ -487,16 +483,15 @@ abstract class OrderStatus implements ActiveRecordInterface $this->modifiedColumns[OrderStatusTableMap::CODE] = true; } - return $this; } // setCode() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -508,16 +503,15 @@ abstract class OrderStatus implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -529,7 +523,6 @@ abstract class OrderStatus implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -624,10 +617,10 @@ abstract class OrderStatus implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -666,7 +659,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderStatus::setDeleted() @@ -709,8 +702,8 @@ abstract class OrderStatus implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -771,8 +764,8 @@ abstract class OrderStatus implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -837,7 +830,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -909,7 +902,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -925,12 +918,12 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -944,7 +937,7 @@ abstract class OrderStatus implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -974,12 +967,12 @@ abstract class OrderStatus implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1016,12 +1009,12 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1035,8 +1028,8 @@ abstract class OrderStatus implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1070,8 +1063,8 @@ abstract class OrderStatus implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1097,7 +1090,6 @@ abstract class OrderStatus implements ActiveRecordInterface if ($this->isColumnModified(OrderStatusTableMap::CODE)) $criteria->add(OrderStatusTableMap::CODE, $this->code); if ($this->isColumnModified(OrderStatusTableMap::CREATED_AT)) $criteria->add(OrderStatusTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(OrderStatusTableMap::UPDATED_AT)) $criteria->add(OrderStatusTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1119,7 +1111,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1129,7 +1121,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1143,7 +1135,6 @@ abstract class OrderStatus implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1153,9 +1144,9 @@ abstract class OrderStatus implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderStatus (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderStatus (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1197,8 +1188,8 @@ abstract class OrderStatus implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderStatus Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderStatus Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1217,7 +1208,7 @@ abstract class OrderStatus implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1259,8 +1250,8 @@ abstract class OrderStatus implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1282,8 +1273,8 @@ abstract class OrderStatus implements ActiveRecordInterface * If this ChildOrderStatus is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrder[] List of ChildOrder objects * @throws PropelException */ @@ -1339,15 +1330,14 @@ abstract class OrderStatus implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderStatus The current object (for fluent API support) + * @param Collection $orders A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderStatus The current object (for fluent API support) */ public function setOrders(Collection $orders, ConnectionInterface $con = null) { $ordersToDelete = $this->getOrders(new Criteria(), $con)->diff($orders); - $this->ordersScheduledForDeletion = $ordersToDelete; foreach ($ordersToDelete as $orderRemoved) { @@ -1368,10 +1358,10 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Returns the number of related Order objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Order objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Order objects. * @throws PropelException */ public function countOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1403,8 +1393,8 @@ abstract class OrderStatus implements ActiveRecordInterface * Method called to associate a ChildOrder object to this object * through the ChildOrder foreign key attribute. * - * @param ChildOrder $l ChildOrder - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param ChildOrder $l ChildOrder + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function addOrder(ChildOrder $l) { @@ -1430,7 +1420,7 @@ abstract class OrderStatus implements ActiveRecordInterface } /** - * @param Order $order The order object to remove. + * @param Order $order The order object to remove. * @return ChildOrderStatus The current object (for fluent API support) */ public function removeOrder($order) @@ -1448,7 +1438,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1460,9 +1449,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1473,7 +1462,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1485,9 +1473,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinCustomer($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1498,7 +1486,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1510,9 +1497,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByInvoiceOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1523,7 +1510,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1535,9 +1521,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinOrderAddressRelatedByDeliveryOrderAddressId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1548,7 +1534,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1560,9 +1545,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByPaymentModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1573,7 +1558,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1585,9 +1569,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinModuleRelatedByDeliveryModuleId($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1598,7 +1582,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getOrders($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1610,9 +1593,9 @@ abstract class OrderStatus implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in OrderStatus. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildOrder[] List of ChildOrder objects */ public function getOrdersJoinLang($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1652,8 +1635,8 @@ abstract class OrderStatus implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1675,8 +1658,8 @@ abstract class OrderStatus implements ActiveRecordInterface * If this ChildOrderStatus is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildOrderStatusI18n[] List of ChildOrderStatusI18n objects * @throws PropelException */ @@ -1732,15 +1715,14 @@ abstract class OrderStatus implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $orderStatusI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildOrderStatus The current object (for fluent API support) + * @param Collection $orderStatusI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildOrderStatus The current object (for fluent API support) */ public function setOrderStatusI18ns(Collection $orderStatusI18ns, ConnectionInterface $con = null) { $orderStatusI18nsToDelete = $this->getOrderStatusI18ns(new Criteria(), $con)->diff($orderStatusI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1764,10 +1746,10 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Returns the number of related OrderStatusI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related OrderStatusI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related OrderStatusI18n objects. * @throws PropelException */ public function countOrderStatusI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1799,8 +1781,8 @@ abstract class OrderStatus implements ActiveRecordInterface * Method called to associate a ChildOrderStatusI18n object to this object * through the ChildOrderStatusI18n foreign key attribute. * - * @param ChildOrderStatusI18n $l ChildOrderStatusI18n - * @return \Thelia\Model\OrderStatus The current object (for fluent API support) + * @param ChildOrderStatusI18n $l ChildOrderStatusI18n + * @return \Thelia\Model\OrderStatus The current object (for fluent API support) */ public function addOrderStatusI18n(ChildOrderStatusI18n $l) { @@ -1830,7 +1812,7 @@ abstract class OrderStatus implements ActiveRecordInterface } /** - * @param OrderStatusI18n $orderStatusI18n The orderStatusI18n object to remove. + * @param OrderStatusI18n $orderStatusI18n The orderStatusI18n object to remove. * @return ChildOrderStatus The current object (for fluent API support) */ public function removeOrderStatusI18n($orderStatusI18n) @@ -1871,7 +1853,7 @@ abstract class OrderStatus implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1911,7 +1893,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildOrderStatus The current object (for fluent API support) + * @return ChildOrderStatus The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1925,9 +1907,9 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildOrderStatus The current object (for fluent API support) + * @return ChildOrderStatus The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1939,7 +1921,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1949,8 +1931,8 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildOrderStatusI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1983,10 +1965,10 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildOrderStatus The current object (for fluent API support) + * @return ChildOrderStatus The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2011,7 +1993,7 @@ abstract class OrderStatus implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildOrderStatusI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2019,7 +2001,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2030,7 +2011,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2043,7 +2023,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2054,7 +2033,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2067,7 +2045,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2078,7 +2055,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2091,7 +2067,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2102,7 +2077,6 @@ abstract class OrderStatus implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2191,7 +2165,6 @@ abstract class OrderStatus implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php index 18c757c39..35f21b319 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -26,7 +26,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderStatusI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return OrderStatusI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->aOrderStatus = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->modifiedColumns[OrderStatusI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->modifiedColumns[OrderStatusI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->modifiedColumns[OrderStatusI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->modifiedColumns[OrderStatusI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $this->modifiedColumns[OrderStatusI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderStatusI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see OrderStatusI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface if ($this->isColumnModified(OrderStatusI18nTableMap::DESCRIPTION)) $criteria->add(OrderStatusI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(OrderStatusI18nTableMap::CHAPO)) $criteria->add(OrderStatusI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(OrderStatusI18nTableMap::POSTSCRIPTUM)) $criteria->add(OrderStatusI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\OrderStatusI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\OrderStatusI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\OrderStatusI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\OrderStatusI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildOrderStatus object. * - * @param ChildOrderStatus $v - * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) + * @param ChildOrderStatus $v + * @return \Thelia\Model\OrderStatusI18n The current object (for fluent API support) * @throws PropelException */ public function setOrderStatus(ChildOrderStatus $v = null) @@ -1247,16 +1231,14 @@ abstract class OrderStatusI18n implements ActiveRecordInterface $v->addOrderStatusI18n($this); } - return $this; } - /** * Get the associated ChildOrderStatus object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildOrderStatus The associated ChildOrderStatus object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildOrderStatus The associated ChildOrderStatus object. * @throws PropelException */ public function getOrderStatus(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php index 1de0e360d..965f46b1a 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php @@ -67,9 +67,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderStatusI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderStatusI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Returns a new ChildOrderStatusI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderStatusI18nQuery */ @@ -140,10 +140,10 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderStatusI18n A model object, or null if the key is not found + * @return ChildOrderStatusI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderStatusI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * * @see filterByOrderStatus() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\OrderStatus object * * @param \Thelia\Model\OrderStatus|ObjectCollection $orderStatus The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderStatus relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class OrderStatusI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderStatusQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderStatusQuery A secondary query class using the current class as primary query */ public function useOrderStatusQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderStatusI18n $orderStatusI18n Object to remove from the list of results + * @param ChildOrderStatusI18n $orderStatusI18n Object to remove from the list of results * * @return ChildOrderStatusI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Deletes all rows from the order_status_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class OrderStatusI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderStatusI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderStatusI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderStatusI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class OrderStatusI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderStatusI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php index 3fa57cb4b..3379ce15a 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusQuery.php +++ b/core/lib/Thelia/Model/Base/OrderStatusQuery.php @@ -64,9 +64,9 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\OrderStatusQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderStatus', $modelAlias = null) { @@ -76,8 +76,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Returns a new ChildOrderStatusQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildOrderStatusQuery */ @@ -106,7 +106,7 @@ abstract class OrderStatusQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildOrderStatus|array|mixed the result, formatted by the current formatter @@ -137,10 +137,10 @@ abstract class OrderStatusQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildOrderStatus A model object, or null if the key is not found + * @return ChildOrderStatus A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -167,8 +167,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildOrderStatus|array|mixed the result, formatted by the current formatter */ @@ -188,8 +188,8 @@ abstract class OrderStatusQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -210,26 +210,24 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildOrderStatusQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(OrderStatusTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildOrderStatusQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(OrderStatusTableMap::ID, $keys, Criteria::IN); } @@ -243,11 +241,11 @@ abstract class OrderStatusQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -283,9 +281,9 @@ abstract class OrderStatusQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -313,13 +311,13 @@ abstract class OrderStatusQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -356,13 +354,13 @@ abstract class OrderStatusQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -392,8 +390,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Order object * - * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Order|ObjectCollection $order the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -415,8 +413,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Order relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -449,11 +447,11 @@ abstract class OrderStatusQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderQuery A secondary query class using the current class as primary query */ public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -465,8 +463,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\OrderStatusI18n object * - * @param \Thelia\Model\OrderStatusI18n|ObjectCollection $orderStatusI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\OrderStatusI18n|ObjectCollection $orderStatusI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -488,8 +486,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the OrderStatusI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -522,11 +520,11 @@ abstract class OrderStatusQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\OrderStatusI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\OrderStatusI18nQuery A secondary query class using the current class as primary query */ public function useOrderStatusI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -538,7 +536,7 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildOrderStatus $orderStatus Object to remove from the list of results + * @param ChildOrderStatus $orderStatus Object to remove from the list of results * * @return ChildOrderStatusQuery The current query, for fluid interface */ @@ -554,8 +552,8 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Deletes all rows from the order_status table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -586,13 +584,13 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildOrderStatus or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildOrderStatus object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildOrderStatus object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -612,7 +610,6 @@ abstract class OrderStatusQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - OrderStatusTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -631,9 +628,9 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -643,9 +640,9 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -655,7 +652,7 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -665,7 +662,7 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -675,7 +672,7 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -685,7 +682,7 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -697,11 +694,11 @@ abstract class OrderStatusQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -716,10 +713,10 @@ abstract class OrderStatusQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildOrderStatusQuery The current query, for fluid interface + * @return ChildOrderStatusQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -736,11 +733,11 @@ abstract class OrderStatusQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildOrderStatusI18nQuery A secondary query class using the current class as primary query + * @return ChildOrderStatusI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index 9f93f3f3b..500542139 100644 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -55,7 +55,6 @@ abstract class Product implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -266,7 +265,6 @@ abstract class Product implements ActiveRecordInterface // versionable behavior - /** * @var bool */ @@ -580,9 +578,9 @@ abstract class Product implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Product The current object, for fluid interface */ @@ -632,66 +630,60 @@ abstract class Product implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [tax_rule_id] column value. * - * @return int + * @return int */ public function getTaxRuleId() { - return $this->tax_rule_id; } /** * Get the [ref] column value. * - * @return string + * @return string */ public function getRef() { - return $this->ref; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } /** * Get the [template_id] column value. * - * @return int + * @return int */ public function getTemplateId() { - return $this->template_id; } @@ -699,8 +691,8 @@ abstract class Product implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -719,8 +711,8 @@ abstract class Product implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -738,11 +730,10 @@ abstract class Product implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -750,8 +741,8 @@ abstract class Product implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -769,19 +760,18 @@ abstract class Product implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setId($v) { @@ -794,15 +784,14 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [tax_rule_id] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setTaxRuleId($v) { @@ -819,15 +808,14 @@ abstract class Product implements ActiveRecordInterface $this->aTaxRule = null; } - return $this; } // setTaxRuleId() /** * Set the value of [ref] column. * - * @param string $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setRef($v) { @@ -840,15 +828,14 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::REF] = true; } - return $this; } // setRef() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setVisible($v) { @@ -861,15 +848,14 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setPosition($v) { @@ -882,15 +868,14 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Set the value of [template_id] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setTemplateId($v) { @@ -907,16 +892,15 @@ abstract class Product implements ActiveRecordInterface $this->aTemplate = null; } - return $this; } // setTemplateId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -928,16 +912,15 @@ abstract class Product implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -949,15 +932,14 @@ abstract class Product implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setVersion($v) { @@ -970,16 +952,15 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -991,15 +972,14 @@ abstract class Product implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -1012,7 +992,6 @@ abstract class Product implements ActiveRecordInterface $this->modifiedColumns[ProductTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -1064,7 +1043,6 @@ abstract class Product implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -1149,10 +1127,10 @@ abstract class Product implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1214,7 +1192,7 @@ abstract class Product implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Product::setDeleted() @@ -1257,8 +1235,8 @@ abstract class Product implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1331,8 +1309,8 @@ abstract class Product implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1650,7 +1628,7 @@ abstract class Product implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1764,7 +1742,7 @@ abstract class Product implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1780,12 +1758,12 @@ abstract class Product implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1799,7 +1777,7 @@ abstract class Product implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1850,12 +1828,12 @@ abstract class Product implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1932,12 +1910,12 @@ abstract class Product implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1951,8 +1929,8 @@ abstract class Product implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -2007,8 +1985,8 @@ abstract class Product implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -2048,7 +2026,6 @@ abstract class Product implements ActiveRecordInterface if ($this->isColumnModified(ProductTableMap::VERSION)) $criteria->add(ProductTableMap::VERSION, $this->version); if ($this->isColumnModified(ProductTableMap::VERSION_CREATED_AT)) $criteria->add(ProductTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(ProductTableMap::VERSION_CREATED_BY)) $criteria->add(ProductTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -2070,7 +2047,7 @@ abstract class Product implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -2080,7 +2057,7 @@ abstract class Product implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -2094,7 +2071,6 @@ abstract class Product implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -2104,9 +2080,9 @@ abstract class Product implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Product (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Product (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -2209,8 +2185,8 @@ abstract class Product implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Product Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Product Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -2226,8 +2202,8 @@ abstract class Product implements ActiveRecordInterface /** * Declares an association between this object and a ChildTaxRule object. * - * @param ChildTaxRule $v - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildTaxRule $v + * @return \Thelia\Model\Product The current object (for fluent API support) * @throws PropelException */ public function setTaxRule(ChildTaxRule $v = null) @@ -2246,7 +2222,6 @@ abstract class Product implements ActiveRecordInterface $v->addProduct($this); } - return $this; } @@ -2254,8 +2229,8 @@ abstract class Product implements ActiveRecordInterface /** * Get the associated ChildTaxRule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTaxRule The associated ChildTaxRule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTaxRule The associated ChildTaxRule object. * @throws PropelException */ public function getTaxRule(ConnectionInterface $con = null) @@ -2277,8 +2252,8 @@ abstract class Product implements ActiveRecordInterface /** * Declares an association between this object and a ChildTemplate object. * - * @param ChildTemplate $v - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildTemplate $v + * @return \Thelia\Model\Product The current object (for fluent API support) * @throws PropelException */ public function setTemplate(ChildTemplate $v = null) @@ -2297,7 +2272,6 @@ abstract class Product implements ActiveRecordInterface $v->addProduct($this); } - return $this; } @@ -2305,8 +2279,8 @@ abstract class Product implements ActiveRecordInterface /** * Get the associated ChildTemplate object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTemplate The associated ChildTemplate object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTemplate The associated ChildTemplate object. * @throws PropelException */ public function getTemplate(ConnectionInterface $con = null) @@ -2331,7 +2305,7 @@ abstract class Product implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -2400,8 +2374,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2423,8 +2397,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductCategory[] List of ChildProductCategory objects * @throws PropelException */ @@ -2480,15 +2454,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productCategories A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productCategories A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductCategories(Collection $productCategories, ConnectionInterface $con = null) { $productCategoriesToDelete = $this->getProductCategories(new Criteria(), $con)->diff($productCategories); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2512,10 +2485,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductCategory objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductCategory objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductCategory objects. * @throws PropelException */ public function countProductCategories(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2547,8 +2520,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductCategory object to this object * through the ChildProductCategory foreign key attribute. * - * @param ChildProductCategory $l ChildProductCategory - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductCategory $l ChildProductCategory + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductCategory(ChildProductCategory $l) { @@ -2575,7 +2548,7 @@ abstract class Product implements ActiveRecordInterface /** * @param ProductCategory $productCategory The productCategory object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeProductCategory($productCategory) { @@ -2592,7 +2565,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2604,9 +2576,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductCategory[] List of ChildProductCategory objects */ public function getProductCategoriesJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2646,8 +2618,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2669,8 +2641,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects * @throws PropelException */ @@ -2726,15 +2698,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureProducts A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $featureProducts A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setFeatureProducts(Collection $featureProducts, ConnectionInterface $con = null) { $featureProductsToDelete = $this->getFeatureProducts(new Criteria(), $con)->diff($featureProducts); - $this->featureProductsScheduledForDeletion = $featureProductsToDelete; foreach ($featureProductsToDelete as $featureProductRemoved) { @@ -2755,10 +2726,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related FeatureProduct objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureProduct objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureProduct objects. * @throws PropelException */ public function countFeatureProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2790,8 +2761,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildFeatureProduct object to this object * through the ChildFeatureProduct foreign key attribute. * - * @param ChildFeatureProduct $l ChildFeatureProduct - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildFeatureProduct $l ChildFeatureProduct + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addFeatureProduct(ChildFeatureProduct $l) { @@ -2818,7 +2789,7 @@ abstract class Product implements ActiveRecordInterface /** * @param FeatureProduct $featureProduct The featureProduct object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeFeatureProduct($featureProduct) { @@ -2835,7 +2806,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2847,9 +2817,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinFeature($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2860,7 +2830,6 @@ abstract class Product implements ActiveRecordInterface return $this->getFeatureProducts($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2872,9 +2841,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects */ public function getFeatureProductsJoinFeatureAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2914,8 +2883,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2937,8 +2906,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductSaleElements[] List of ChildProductSaleElements objects * @throws PropelException */ @@ -2994,15 +2963,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productSaleElementss A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productSaleElementss A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductSaleElementss(Collection $productSaleElementss, ConnectionInterface $con = null) { $productSaleElementssToDelete = $this->getProductSaleElementss(new Criteria(), $con)->diff($productSaleElementss); - $this->productSaleElementssScheduledForDeletion = $productSaleElementssToDelete; foreach ($productSaleElementssToDelete as $productSaleElementsRemoved) { @@ -3023,10 +2991,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductSaleElements objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductSaleElements objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductSaleElements objects. * @throws PropelException */ public function countProductSaleElementss(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3058,8 +3026,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductSaleElements object to this object * through the ChildProductSaleElements foreign key attribute. * - * @param ChildProductSaleElements $l ChildProductSaleElements - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductSaleElements $l ChildProductSaleElements + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductSaleElements(ChildProductSaleElements $l) { @@ -3086,7 +3054,7 @@ abstract class Product implements ActiveRecordInterface /** * @param ProductSaleElements $productSaleElements The productSaleElements object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeProductSaleElements($productSaleElements) { @@ -3132,8 +3100,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3155,8 +3123,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductImage[] List of ChildProductImage objects * @throws PropelException */ @@ -3212,15 +3180,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productImages A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productImages A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductImages(Collection $productImages, ConnectionInterface $con = null) { $productImagesToDelete = $this->getProductImages(new Criteria(), $con)->diff($productImages); - $this->productImagesScheduledForDeletion = $productImagesToDelete; foreach ($productImagesToDelete as $productImageRemoved) { @@ -3241,10 +3208,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductImage objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductImage objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductImage objects. * @throws PropelException */ public function countProductImages(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3276,8 +3243,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductImage object to this object * through the ChildProductImage foreign key attribute. * - * @param ChildProductImage $l ChildProductImage - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductImage $l ChildProductImage + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductImage(ChildProductImage $l) { @@ -3350,8 +3317,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3373,8 +3340,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductDocument[] List of ChildProductDocument objects * @throws PropelException */ @@ -3430,15 +3397,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productDocuments A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productDocuments A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductDocuments(Collection $productDocuments, ConnectionInterface $con = null) { $productDocumentsToDelete = $this->getProductDocuments(new Criteria(), $con)->diff($productDocuments); - $this->productDocumentsScheduledForDeletion = $productDocumentsToDelete; foreach ($productDocumentsToDelete as $productDocumentRemoved) { @@ -3459,10 +3425,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductDocument objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductDocument objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductDocument objects. * @throws PropelException */ public function countProductDocuments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3494,8 +3460,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductDocument object to this object * through the ChildProductDocument foreign key attribute. * - * @param ChildProductDocument $l ChildProductDocument - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductDocument $l ChildProductDocument + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductDocument(ChildProductDocument $l) { @@ -3522,7 +3488,7 @@ abstract class Product implements ActiveRecordInterface /** * @param ProductDocument $productDocument The productDocument object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeProductDocument($productDocument) { @@ -3568,8 +3534,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3591,8 +3557,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAccessory[] List of ChildAccessory objects * @throws PropelException */ @@ -3648,15 +3614,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $accessoriesRelatedByProductId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $accessoriesRelatedByProductId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setAccessoriesRelatedByProductId(Collection $accessoriesRelatedByProductId, ConnectionInterface $con = null) { $accessoriesRelatedByProductIdToDelete = $this->getAccessoriesRelatedByProductId(new Criteria(), $con)->diff($accessoriesRelatedByProductId); - $this->accessoriesRelatedByProductIdScheduledForDeletion = $accessoriesRelatedByProductIdToDelete; foreach ($accessoriesRelatedByProductIdToDelete as $accessoryRelatedByProductIdRemoved) { @@ -3677,10 +3642,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related Accessory objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Accessory objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Accessory objects. * @throws PropelException */ public function countAccessoriesRelatedByProductId(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3712,8 +3677,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildAccessory object to this object * through the ChildAccessory foreign key attribute. * - * @param ChildAccessory $l ChildAccessory - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildAccessory $l ChildAccessory + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addAccessoryRelatedByProductId(ChildAccessory $l) { @@ -3740,7 +3705,7 @@ abstract class Product implements ActiveRecordInterface /** * @param AccessoryRelatedByProductId $accessoryRelatedByProductId The accessoryRelatedByProductId object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeAccessoryRelatedByProductId($accessoryRelatedByProductId) { @@ -3786,8 +3751,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -3809,8 +3774,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAccessory[] List of ChildAccessory objects * @throws PropelException */ @@ -3866,15 +3831,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $accessoriesRelatedByAccessory A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $accessoriesRelatedByAccessory A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setAccessoriesRelatedByAccessory(Collection $accessoriesRelatedByAccessory, ConnectionInterface $con = null) { $accessoriesRelatedByAccessoryToDelete = $this->getAccessoriesRelatedByAccessory(new Criteria(), $con)->diff($accessoriesRelatedByAccessory); - $this->accessoriesRelatedByAccessoryScheduledForDeletion = $accessoriesRelatedByAccessoryToDelete; foreach ($accessoriesRelatedByAccessoryToDelete as $accessoryRelatedByAccessoryRemoved) { @@ -3895,10 +3859,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related Accessory objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Accessory objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Accessory objects. * @throws PropelException */ public function countAccessoriesRelatedByAccessory(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -3930,8 +3894,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildAccessory object to this object * through the ChildAccessory foreign key attribute. * - * @param ChildAccessory $l ChildAccessory - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildAccessory $l ChildAccessory + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addAccessoryRelatedByAccessory(ChildAccessory $l) { @@ -3958,7 +3922,7 @@ abstract class Product implements ActiveRecordInterface /** * @param AccessoryRelatedByAccessory $accessoryRelatedByAccessory The accessoryRelatedByAccessory object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeAccessoryRelatedByAccessory($accessoryRelatedByAccessory) { @@ -4004,8 +3968,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -4027,8 +3991,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCartItem[] List of ChildCartItem objects * @throws PropelException */ @@ -4084,15 +4048,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $cartItems A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $cartItems A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setCartItems(Collection $cartItems, ConnectionInterface $con = null) { $cartItemsToDelete = $this->getCartItems(new Criteria(), $con)->diff($cartItems); - $this->cartItemsScheduledForDeletion = $cartItemsToDelete; foreach ($cartItemsToDelete as $cartItemRemoved) { @@ -4113,10 +4076,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related CartItem objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CartItem objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CartItem objects. * @throws PropelException */ public function countCartItems(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -4148,8 +4111,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildCartItem object to this object * through the ChildCartItem foreign key attribute. * - * @param ChildCartItem $l ChildCartItem - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildCartItem $l ChildCartItem + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addCartItem(ChildCartItem $l) { @@ -4175,7 +4138,7 @@ abstract class Product implements ActiveRecordInterface } /** - * @param CartItem $cartItem The cartItem object to remove. + * @param CartItem $cartItem The cartItem object to remove. * @return ChildProduct The current object (for fluent API support) */ public function removeCartItem($cartItem) @@ -4193,7 +4156,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -4205,9 +4167,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinCart($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -4218,7 +4180,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCartItems($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -4230,9 +4191,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -4272,8 +4233,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -4295,8 +4256,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects * @throws PropelException */ @@ -4352,15 +4313,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productAssociatedContents A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductAssociatedContents(Collection $productAssociatedContents, ConnectionInterface $con = null) { $productAssociatedContentsToDelete = $this->getProductAssociatedContents(new Criteria(), $con)->diff($productAssociatedContents); - $this->productAssociatedContentsScheduledForDeletion = $productAssociatedContentsToDelete; foreach ($productAssociatedContentsToDelete as $productAssociatedContentRemoved) { @@ -4381,10 +4341,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductAssociatedContent objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductAssociatedContent objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductAssociatedContent objects. * @throws PropelException */ public function countProductAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -4416,8 +4376,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductAssociatedContent object to this object * through the ChildProductAssociatedContent foreign key attribute. * - * @param ChildProductAssociatedContent $l ChildProductAssociatedContent - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductAssociatedContent $l ChildProductAssociatedContent + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductAssociatedContent(ChildProductAssociatedContent $l) { @@ -4444,7 +4404,7 @@ abstract class Product implements ActiveRecordInterface /** * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeProductAssociatedContent($productAssociatedContent) { @@ -4461,7 +4421,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -4473,9 +4432,9 @@ abstract class Product implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Product. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects */ public function getProductAssociatedContentsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -4515,8 +4474,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -4538,8 +4497,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductI18n[] List of ChildProductI18n objects * @throws PropelException */ @@ -4595,15 +4554,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductI18ns(Collection $productI18ns, ConnectionInterface $con = null) { $productI18nsToDelete = $this->getProductI18ns(new Criteria(), $con)->diff($productI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -4627,10 +4585,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductI18n objects. * @throws PropelException */ public function countProductI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -4662,8 +4620,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductI18n object to this object * through the ChildProductI18n foreign key attribute. * - * @param ChildProductI18n $l ChildProductI18n - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductI18n $l ChildProductI18n + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductI18n(ChildProductI18n $l) { @@ -4693,7 +4651,7 @@ abstract class Product implements ActiveRecordInterface } /** - * @param ProductI18n $productI18n The productI18n object to remove. + * @param ProductI18n $productI18n The productI18n object to remove. * @return ChildProduct The current object (for fluent API support) */ public function removeProductI18n($productI18n) @@ -4740,8 +4698,8 @@ abstract class Product implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -4763,8 +4721,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductVersion[] List of ChildProductVersion objects * @throws PropelException */ @@ -4820,15 +4778,14 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productVersions A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductVersions(Collection $productVersions, ConnectionInterface $con = null) { $productVersionsToDelete = $this->getProductVersions(new Criteria(), $con)->diff($productVersions); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -4852,10 +4809,10 @@ abstract class Product implements ActiveRecordInterface /** * Returns the number of related ProductVersion objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductVersion objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductVersion objects. * @throws PropelException */ public function countProductVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -4887,8 +4844,8 @@ abstract class Product implements ActiveRecordInterface * Method called to associate a ChildProductVersion object to this object * through the ChildProductVersion foreign key attribute. * - * @param ChildProductVersion $l ChildProductVersion - * @return \Thelia\Model\Product The current object (for fluent API support) + * @param ChildProductVersion $l ChildProductVersion + * @return \Thelia\Model\Product The current object (for fluent API support) */ public function addProductVersion(ChildProductVersion $l) { @@ -4915,7 +4872,7 @@ abstract class Product implements ActiveRecordInterface /** * @param ProductVersion $productVersion The productVersion object to remove. - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeProductVersion($productVersion) { @@ -4972,8 +4929,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildCategory[] List of ChildCategory objects */ @@ -5003,9 +4960,9 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $categories A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $categories A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setCategories(Collection $categories, ConnectionInterface $con = null) { @@ -5029,9 +4986,9 @@ abstract class Product implements ActiveRecordInterface * Gets the number of ChildCategory objects related by a many-to-many relationship * to the current object by way of the product_category cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildCategory objects */ @@ -5060,7 +5017,7 @@ abstract class Product implements ActiveRecordInterface * through the product_category cross reference table. * * @param ChildCategory $category The ChildProductCategory object to relate - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function addCategory(ChildCategory $category) { @@ -5077,7 +5034,7 @@ abstract class Product implements ActiveRecordInterface } /** - * @param Category $category The category object to add. + * @param Category $category The category object to add. */ protected function doAddCategory($category) { @@ -5096,8 +5053,8 @@ abstract class Product implements ActiveRecordInterface * Remove a ChildCategory object to this object * through the product_category cross reference table. * - * @param ChildCategory $category The ChildProductCategory object to relate - * @return ChildProduct The current object (for fluent API support) + * @param ChildCategory $category The ChildProductCategory object to relate + * @return ChildProduct The current object (for fluent API support) */ public function removeCategory(ChildCategory $category) { @@ -5155,8 +5112,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildProduct[] List of ChildProduct objects */ @@ -5186,9 +5143,9 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productsRelatedByAccessory A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productsRelatedByAccessory A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductsRelatedByAccessory(Collection $productsRelatedByAccessory, ConnectionInterface $con = null) { @@ -5212,9 +5169,9 @@ abstract class Product implements ActiveRecordInterface * Gets the number of ChildProduct objects related by a many-to-many relationship * to the current object by way of the accessory cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildProduct objects */ @@ -5260,7 +5217,7 @@ abstract class Product implements ActiveRecordInterface } /** - * @param ProductRelatedByAccessory $productRelatedByAccessory The productRelatedByAccessory object to add. + * @param ProductRelatedByAccessory $productRelatedByAccessory The productRelatedByAccessory object to add. */ protected function doAddProductRelatedByAccessory($productRelatedByAccessory) { @@ -5279,7 +5236,7 @@ abstract class Product implements ActiveRecordInterface * Remove a ChildProduct object to this object * through the accessory cross reference table. * - * @param ChildProduct $product The ChildAccessory object to relate + * @param ChildProduct $product The ChildAccessory object to relate * @return ChildProduct The current object (for fluent API support) */ public function removeProductRelatedByAccessory(ChildProduct $product) @@ -5338,8 +5295,8 @@ abstract class Product implements ActiveRecordInterface * If this ChildProduct is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildProduct[] List of ChildProduct objects */ @@ -5369,9 +5326,9 @@ abstract class Product implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productsRelatedByProductId A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) + * @param Collection $productsRelatedByProductId A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) */ public function setProductsRelatedByProductId(Collection $productsRelatedByProductId, ConnectionInterface $con = null) { @@ -5395,9 +5352,9 @@ abstract class Product implements ActiveRecordInterface * Gets the number of ChildProduct objects related by a many-to-many relationship * to the current object by way of the accessory cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildProduct objects */ @@ -5443,7 +5400,7 @@ abstract class Product implements ActiveRecordInterface } /** - * @param ProductRelatedByProductId $productRelatedByProductId The productRelatedByProductId object to add. + * @param ProductRelatedByProductId $productRelatedByProductId The productRelatedByProductId object to add. */ protected function doAddProductRelatedByProductId($productRelatedByProductId) { @@ -5462,7 +5419,7 @@ abstract class Product implements ActiveRecordInterface * Remove a ChildProduct object to this object * through the accessory cross reference table. * - * @param ChildProduct $product The ChildAccessory object to relate + * @param ChildProduct $product The ChildAccessory object to relate * @return ChildProduct The current object (for fluent API support) */ public function removeProductRelatedByProductId(ChildProduct $product) @@ -5512,7 +5469,7 @@ abstract class Product implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -5626,7 +5583,7 @@ abstract class Product implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -5640,9 +5597,9 @@ abstract class Product implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -5654,7 +5611,7 @@ abstract class Product implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -5664,8 +5621,8 @@ abstract class Product implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildProductI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -5698,10 +5655,10 @@ abstract class Product implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -5726,7 +5683,7 @@ abstract class Product implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildProductI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -5734,7 +5691,6 @@ abstract class Product implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -5745,7 +5701,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -5758,7 +5713,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -5769,7 +5723,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -5782,7 +5735,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -5793,7 +5745,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -5806,7 +5757,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -5817,7 +5767,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -5830,7 +5779,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [meta_title] column value. * @@ -5841,7 +5789,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaTitle(); } - /** * Set the value of [meta_title] column. * @@ -5854,7 +5801,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [meta_description] column value. * @@ -5865,7 +5811,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaDescription(); } - /** * Set the value of [meta_description] column. * @@ -5878,7 +5823,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** * Get the [meta_keywords] column value. * @@ -5889,7 +5833,6 @@ abstract class Product implements ActiveRecordInterface return $this->getCurrentTranslation()->getMetaKeywords(); } - /** * Set the value of [meta_keywords] column. * @@ -5919,7 +5862,7 @@ abstract class Product implements ActiveRecordInterface /** * Checks whether the current state must be recorded as a version * - * @return boolean + * @return boolean */ public function isVersioningNecessary($con = null) { @@ -5941,9 +5884,9 @@ abstract class Product implements ActiveRecordInterface /** * Creates a version of the current object and saves it. * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ChildProductVersion A version object + * @return ChildProductVersion A version object */ public function addVersion($con = null) { @@ -5970,10 +5913,10 @@ abstract class Product implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con The connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use * - * @return ChildProduct The current object (for fluent API support) + * @return ChildProduct The current object (for fluent API support) */ public function toVersion($versionNumber, $con = null) { @@ -5989,9 +5932,9 @@ abstract class Product implements ActiveRecordInterface /** * Sets the properties of the current object to the value they had at a specific version * - * @param ChildProductVersion $version The version object to use - * @param ConnectionInterface $con the connection to use - * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * @param ChildProductVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. * * @return ChildProduct The current object (for fluent API support) */ @@ -6016,9 +5959,9 @@ abstract class Product implements ActiveRecordInterface /** * Gets the latest persisted version number for the current object * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return integer + * @return integer */ public function getLastVersionNumber($con = null) { @@ -6036,9 +5979,9 @@ abstract class Product implements ActiveRecordInterface /** * Checks whether the current object is the latest one * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return Boolean + * @return Boolean */ public function isLastVersion($con = null) { @@ -6048,10 +5991,10 @@ abstract class Product implements ActiveRecordInterface /** * Retrieves a version object for this entity and a version number * - * @param integer $versionNumber The version number to read - * @param ConnectionInterface $con the connection to use + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use * - * @return ChildProductVersion A version object + * @return ChildProductVersion A version object */ public function getOneVersion($versionNumber, $con = null) { @@ -6064,9 +6007,9 @@ abstract class Product implements ActiveRecordInterface /** * Gets all the versions of this object, in incremental order * - * @param ConnectionInterface $con the connection to use + * @param ConnectionInterface $con the connection to use * - * @return ObjectCollection A list of ChildProductVersion objects + * @return ObjectCollection A list of ChildProductVersion objects */ public function getAllVersions($con = null) { @@ -6086,12 +6029,12 @@ abstract class Product implements ActiveRecordInterface * ); * * - * @param integer $versionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -6111,13 +6054,13 @@ abstract class Product implements ActiveRecordInterface * ); * * - * @param integer $fromVersionNumber - * @param integer $toVersionNumber - * @param string $keys Main key used for the result diff (versions|columns) - * @param ConnectionInterface $con the connection to use - * @param array $ignoredColumns The columns to exclude from the diff. + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) { @@ -6137,12 +6080,12 @@ abstract class Product implements ActiveRecordInterface * ); * * - * @param array $fromVersion An array representing the original version. - * @param array $toVersion An array representing the destination version. - * @param string $keys Main key used for the result diff (versions|columns). - * @param array $ignoredColumns The columns to exclude from the diff. + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. * - * @return array A list of differences + * @return array A list of differences */ protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) { @@ -6179,7 +6122,7 @@ abstract class Product implements ActiveRecordInterface /** * retrieve the last $number versions. * - * @param Integer $number the number of record to return. + * @param Integer $number the number of record to return. * @return PropelCollection|array \Thelia\Model\ProductVersion[] List of \Thelia\Model\ProductVersion objects */ public function getLastVersions($number = 10, $criteria = null, $con = null) @@ -6266,7 +6209,6 @@ abstract class Product implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php index 40446fe47..9f239bbe8 100644 --- a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php @@ -31,7 +31,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductAssociatedContentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -321,9 +320,9 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductAssociatedContent The current object, for fluid interface */ @@ -373,44 +372,40 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [content_id] column value. * - * @return int + * @return int */ public function getContentId() { - return $this->content_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -418,8 +413,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -438,8 +433,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -457,8 +452,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setId($v) { @@ -471,15 +466,14 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $this->modifiedColumns[ProductAssociatedContentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setProductId($v) { @@ -496,15 +490,14 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [content_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setContentId($v) { @@ -521,15 +514,14 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $this->aContent = null; } - return $this; } // setContentId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setPosition($v) { @@ -542,16 +534,15 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $this->modifiedColumns[ProductAssociatedContentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -563,16 +554,15 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -584,7 +574,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -691,10 +680,10 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -731,7 +720,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductAssociatedContent::setDeleted() @@ -774,8 +763,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -836,8 +825,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -887,7 +876,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -971,7 +960,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -987,12 +976,12 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1006,7 +995,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1042,12 +1031,12 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1086,12 +1075,12 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1105,8 +1094,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1146,8 +1135,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1177,7 +1166,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface if ($this->isColumnModified(ProductAssociatedContentTableMap::POSITION)) $criteria->add(ProductAssociatedContentTableMap::POSITION, $this->position); if ($this->isColumnModified(ProductAssociatedContentTableMap::CREATED_AT)) $criteria->add(ProductAssociatedContentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductAssociatedContentTableMap::UPDATED_AT)) $criteria->add(ProductAssociatedContentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1199,7 +1187,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1209,7 +1197,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1223,7 +1211,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1233,9 +1220,9 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductAssociatedContent (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductAssociatedContent (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1259,8 +1246,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductAssociatedContent Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductAssociatedContent Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1276,8 +1263,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1296,7 +1283,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $v->addProductAssociatedContent($this); } - return $this; } @@ -1304,8 +1290,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1327,8 +1313,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Declares an association between this object and a ChildContent object. * - * @param ChildContent $v - * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @param ChildContent $v + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) * @throws PropelException */ public function setContent(ChildContent $v = null) @@ -1347,7 +1333,6 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface $v->addProductAssociatedContent($this); } - return $this; } @@ -1355,8 +1340,8 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Get the associated ChildContent object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildContent The associated ChildContent object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. * @throws PropelException */ public function getContent(ConnectionInterface $con = null) @@ -1400,7 +1385,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1426,7 +1411,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductAssociatedContent The current object (for fluent API support) + * @return ChildProductAssociatedContent The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php b/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php index 6ce76b876..cb62bc280 100644 --- a/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php @@ -71,9 +71,9 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductAssociatedContentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductAssociatedContent', $modelAlias = null) { @@ -83,8 +83,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Returns a new ChildProductAssociatedContentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductAssociatedContentQuery */ @@ -113,7 +113,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProductAssociatedContent|array|mixed the result, formatted by the current formatter @@ -144,10 +144,10 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductAssociatedContent A model object, or null if the key is not found + * @return ChildProductAssociatedContent A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -174,8 +174,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductAssociatedContent|array|mixed the result, formatted by the current formatter */ @@ -195,8 +195,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -217,26 +217,24 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $keys, Criteria::IN); } @@ -250,11 +248,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -293,11 +291,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -336,11 +334,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * * @see filterByContent() * - * @param mixed $contentId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -377,11 +375,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -418,13 +416,13 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -461,13 +459,13 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -497,8 +495,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -522,8 +520,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -556,11 +554,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -572,8 +570,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Content object * - * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -597,8 +595,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Content relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -631,11 +629,11 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query */ public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -647,7 +645,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductAssociatedContent $productAssociatedContent Object to remove from the list of results + * @param ChildProductAssociatedContent $productAssociatedContent Object to remove from the list of results * * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ @@ -663,8 +661,8 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Deletes all rows from the product_associated_content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -695,13 +693,13 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductAssociatedContent or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductAssociatedContent object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -721,7 +719,6 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductAssociatedContentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -740,9 +737,9 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -752,9 +749,9 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -764,7 +761,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -774,7 +771,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -784,7 +781,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -794,7 +791,7 @@ abstract class ProductAssociatedContentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductAssociatedContentQuery The current query, for fluid interface + * @return ChildProductAssociatedContentQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php index 6e3b6139c..a739d6d38 100644 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -31,7 +31,6 @@ abstract class ProductCategory implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductCategoryTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -315,9 +314,9 @@ abstract class ProductCategory implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductCategory The current object, for fluid interface */ @@ -367,33 +366,30 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [category_id] column value. * - * @return int + * @return int */ public function getCategoryId() { - return $this->category_id; } /** * Get the [default_category] column value. * - * @return boolean + * @return boolean */ public function getDefaultCategory() { - return $this->default_category; } @@ -401,8 +397,8 @@ abstract class ProductCategory implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -421,8 +417,8 @@ abstract class ProductCategory implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -440,8 +436,8 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) */ public function setProductId($v) { @@ -458,15 +454,14 @@ abstract class ProductCategory implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [category_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) */ public function setCategoryId($v) { @@ -483,7 +478,6 @@ abstract class ProductCategory implements ActiveRecordInterface $this->aCategory = null; } - return $this; } // setCategoryId() @@ -494,8 +488,8 @@ abstract class ProductCategory implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) */ public function setDefaultCategory($v) { @@ -512,16 +506,15 @@ abstract class ProductCategory implements ActiveRecordInterface $this->modifiedColumns[ProductCategoryTableMap::DEFAULT_CATEGORY] = true; } - return $this; } // setDefaultCategory() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -533,16 +526,15 @@ abstract class ProductCategory implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -554,7 +546,6 @@ abstract class ProductCategory implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -658,10 +649,10 @@ abstract class ProductCategory implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -698,7 +689,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductCategory::setDeleted() @@ -741,8 +732,8 @@ abstract class ProductCategory implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -803,8 +794,8 @@ abstract class ProductCategory implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -854,7 +845,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -864,7 +855,6 @@ abstract class ProductCategory implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(ProductCategoryTableMap::PRODUCT_ID)) { $modifiedColumns[':p' . $index++] = '`PRODUCT_ID`'; @@ -921,7 +911,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -937,12 +927,12 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -956,7 +946,7 @@ abstract class ProductCategory implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +979,12 @@ abstract class ProductCategory implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1032,12 +1022,12 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1051,8 +1041,8 @@ abstract class ProductCategory implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1089,8 +1079,8 @@ abstract class ProductCategory implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1118,7 +1108,6 @@ abstract class ProductCategory implements ActiveRecordInterface if ($this->isColumnModified(ProductCategoryTableMap::DEFAULT_CATEGORY)) $criteria->add(ProductCategoryTableMap::DEFAULT_CATEGORY, $this->default_category); if ($this->isColumnModified(ProductCategoryTableMap::CREATED_AT)) $criteria->add(ProductCategoryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductCategoryTableMap::UPDATED_AT)) $criteria->add(ProductCategoryTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1156,7 +1145,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1171,7 +1160,6 @@ abstract class ProductCategory implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getProductId()) && (null === $this->getCategoryId()); } @@ -1181,9 +1169,9 @@ abstract class ProductCategory implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductCategory (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductCategory (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1206,8 +1194,8 @@ abstract class ProductCategory implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductCategory Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductCategory Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1223,8 +1211,8 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1243,7 +1231,6 @@ abstract class ProductCategory implements ActiveRecordInterface $v->addProductCategory($this); } - return $this; } @@ -1251,8 +1238,8 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1274,8 +1261,8 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Declares an association between this object and a ChildCategory object. * - * @param ChildCategory $v - * @return \Thelia\Model\ProductCategory The current object (for fluent API support) + * @param ChildCategory $v + * @return \Thelia\Model\ProductCategory The current object (for fluent API support) * @throws PropelException */ public function setCategory(ChildCategory $v = null) @@ -1294,7 +1281,6 @@ abstract class ProductCategory implements ActiveRecordInterface $v->addProductCategory($this); } - return $this; } @@ -1302,8 +1288,8 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Get the associated ChildCategory object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCategory The associated ChildCategory object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. * @throws PropelException */ public function getCategory(ConnectionInterface $con = null) @@ -1346,7 +1332,7 @@ abstract class ProductCategory implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1372,7 +1358,7 @@ abstract class ProductCategory implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductCategory The current object (for fluent API support) + * @return ChildProductCategory The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php index 1d1e28830..e9670019e 100644 --- a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php +++ b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php @@ -67,9 +67,9 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductCategoryQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductCategory', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Returns a new ChildProductCategoryQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductCategoryQuery */ @@ -140,10 +140,10 @@ abstract class ProductCategoryQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductCategory A model object, or null if the key is not found + * @return ChildProductCategory A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductCategory|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProductCategoryQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProductCategoryQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -303,11 +303,11 @@ abstract class ProductCategoryQuery extends ModelCriteria * * @see filterByCategory() * - * @param mixed $categoryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $categoryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -343,12 +343,12 @@ abstract class ProductCategoryQuery extends ModelCriteria * $query->filterByDefaultCategory('yes'); // WHERE default_category = true * * - * @param boolean|string $defaultCategory The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $defaultCategory The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -371,13 +371,13 @@ abstract class ProductCategoryQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -414,13 +414,13 @@ abstract class ProductCategoryQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -450,8 +450,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -475,8 +475,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -509,11 +509,11 @@ abstract class ProductCategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -525,8 +525,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Category object * - * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -550,8 +550,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Category relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -584,11 +584,11 @@ abstract class ProductCategoryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query */ public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -600,7 +600,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductCategory $productCategory Object to remove from the list of results + * @param ChildProductCategory $productCategory Object to remove from the list of results * * @return ChildProductCategoryQuery The current query, for fluid interface */ @@ -618,8 +618,8 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Deletes all rows from the product_category table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -650,13 +650,13 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductCategory or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductCategory object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductCategory object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -676,7 +676,6 @@ abstract class ProductCategoryQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductCategoryTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -695,9 +694,9 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -707,9 +706,9 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -719,7 +718,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -729,7 +728,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -739,7 +738,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -749,7 +748,7 @@ abstract class ProductCategoryQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductCategoryQuery The current query, for fluid interface + * @return ChildProductCategoryQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php index e8d35e2cb..ca7633078 100644 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -32,7 +32,6 @@ abstract class ProductDocument implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductDocumentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ProductDocument implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductDocument The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class ProductDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class ProductDocument implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class ProductDocument implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setProductId($v) { @@ -518,15 +512,14 @@ abstract class ProductDocument implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class ProductDocument implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class ProductDocument implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class ProductDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class ProductDocument implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class ProductDocument implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductDocument::setDeleted() @@ -790,8 +779,8 @@ abstract class ProductDocument implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class ProductDocument implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class ProductDocument implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class ProductDocument implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class ProductDocument implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class ProductDocument implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class ProductDocument implements ActiveRecordInterface if ($this->isColumnModified(ProductDocumentTableMap::POSITION)) $criteria->add(ProductDocumentTableMap::POSITION, $this->position); if ($this->isColumnModified(ProductDocumentTableMap::CREATED_AT)) $criteria->add(ProductDocumentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductDocumentTableMap::UPDATED_AT)) $criteria->add(ProductDocumentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class ProductDocument implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class ProductDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductDocument (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductDocument (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class ProductDocument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductDocument Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductDocument Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1336,16 +1323,14 @@ abstract class ProductDocument implements ActiveRecordInterface $v->addProductDocument($this); } - return $this; } - /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class ProductDocument implements ActiveRecordInterface return $this->aProduct; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class ProductDocument implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class ProductDocument implements ActiveRecordInterface * If this ChildProductDocument is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductDocumentI18n[] List of ChildProductDocumentI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class ProductDocument implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productDocumentI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProductDocument The current object (for fluent API support) + * @param Collection $productDocumentI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProductDocument The current object (for fluent API support) */ public function setProductDocumentI18ns(Collection $productDocumentI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Returns the number of related ProductDocumentI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductDocumentI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductDocumentI18n objects. * @throws PropelException */ public function countProductDocumentI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class ProductDocument implements ActiveRecordInterface * Method called to associate a ChildProductDocumentI18n object to this object * through the ChildProductDocumentI18n foreign key attribute. * - * @param ChildProductDocumentI18n $l ChildProductDocumentI18n - * @return \Thelia\Model\ProductDocument The current object (for fluent API support) + * @param ChildProductDocumentI18n $l ChildProductDocumentI18n + * @return \Thelia\Model\ProductDocument The current object (for fluent API support) */ public function addProductDocumentI18n(ChildProductDocumentI18n $l) { @@ -1587,7 +1571,7 @@ abstract class ProductDocument implements ActiveRecordInterface } /** - * @param ProductDocumentI18n $productDocumentI18n The productDocumentI18n object to remove. + * @param ProductDocumentI18n $productDocumentI18n The productDocumentI18n object to remove. * @return ChildProductDocument The current object (for fluent API support) */ public function removeProductDocumentI18n($productDocumentI18n) @@ -1630,7 +1614,7 @@ abstract class ProductDocument implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductDocument The current object (for fluent API support) + * @return ChildProductDocument The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildProductDocument The current object (for fluent API support) + * @return ChildProductDocument The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildProductDocumentI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildProductDocument The current object (for fluent API support) + * @return ChildProductDocument The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class ProductDocument implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildProductDocumentI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php index cf9d7e57e..96aabab73 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -26,7 +26,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductDocumentI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductDocumentI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->aProductDocument = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $this->modifiedColumns[ProductDocumentI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductDocumentI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductDocumentI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface if ($this->isColumnModified(ProductDocumentI18nTableMap::DESCRIPTION)) $criteria->add(ProductDocumentI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ProductDocumentI18nTableMap::CHAPO)) $criteria->add(ProductDocumentI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ProductDocumentI18nTableMap::POSTSCRIPTUM)) $criteria->add(ProductDocumentI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductDocumentI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductDocumentI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductDocumentI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductDocumentI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildProductDocument object. * - * @param ChildProductDocument $v - * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) + * @param ChildProductDocument $v + * @return \Thelia\Model\ProductDocumentI18n The current object (for fluent API support) * @throws PropelException */ public function setProductDocument(ChildProductDocument $v = null) @@ -1247,16 +1231,14 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface $v->addProductDocumentI18n($this); } - return $this; } - /** * Get the associated ChildProductDocument object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProductDocument The associated ChildProductDocument object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProductDocument The associated ChildProductDocument object. * @throws PropelException */ public function getProductDocument(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php index 79d4854b4..d2f8a4176 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php @@ -67,9 +67,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductDocumentI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductDocumentI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Returns a new ChildProductDocumentI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductDocumentI18nQuery */ @@ -140,10 +140,10 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductDocumentI18n A model object, or null if the key is not found + * @return ChildProductDocumentI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductDocumentI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * * @see filterByProductDocument() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ProductDocument object * * @param \Thelia\Model\ProductDocument|ObjectCollection $productDocument The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductDocumentQuery A secondary query class using the current class as primary query */ public function useProductDocumentQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductDocumentI18n $productDocumentI18n Object to remove from the list of results + * @param ChildProductDocumentI18n $productDocumentI18n Object to remove from the list of results * * @return ChildProductDocumentI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Deletes all rows from the product_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ProductDocumentI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductDocumentI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php index f5d9d446c..1647bae4c 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php @@ -72,9 +72,9 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductDocumentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductDocument', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Returns a new ChildProductDocumentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductDocumentQuery */ @@ -114,7 +114,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProductDocument|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ProductDocumentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductDocument A model object, or null if the key is not found + * @return ChildProductDocument A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductDocument|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ProductDocumentQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProductDocumentTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductDocumentQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProductDocumentTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class ProductDocumentQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class ProductDocumentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class ProductDocumentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductDocumentI18n object * - * @param \Thelia\Model\ProductDocumentI18n|ObjectCollection $productDocumentI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductDocumentI18n|ObjectCollection $productDocumentI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductDocumentI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductDocumentI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductDocumentI18nQuery A secondary query class using the current class as primary query */ public function useProductDocumentI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductDocument $productDocument Object to remove from the list of results + * @param ChildProductDocument $productDocument Object to remove from the list of results * * @return ChildProductDocumentQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Deletes all rows from the product_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class ProductDocumentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductDocumentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class ProductDocumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class ProductDocumentQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductDocumentQuery The current query, for fluid interface + * @return ChildProductDocumentQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductDocumentI18nQuery A secondary query class using the current class as primary query + * @return ChildProductDocumentI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php index ef90f2de5..728ae7764 100644 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -26,7 +26,6 @@ abstract class ProductI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ProductI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductI18n The current object, for fluid interface */ @@ -395,107 +394,98 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Get the [meta_title] column value. * - * @return string + * @return string */ public function getMetaTitle() { - return $this->meta_title; } /** * Get the [meta_description] column value. * - * @return string + * @return string */ public function getMetaDescription() { - return $this->meta_description; } /** * Get the [meta_keywords] column value. * - * @return string + * @return string */ public function getMetaKeywords() { - return $this->meta_keywords; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setId($v) { @@ -512,15 +502,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -533,15 +522,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -554,15 +542,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -575,15 +562,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -596,15 +582,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -617,15 +602,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() /** * Set the value of [meta_title] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setMetaTitle($v) { @@ -638,15 +622,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::META_TITLE] = true; } - return $this; } // setMetaTitle() /** * Set the value of [meta_description] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setMetaDescription($v) { @@ -659,15 +642,14 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::META_DESCRIPTION] = true; } - return $this; } // setMetaDescription() /** * Set the value of [meta_keywords] column. * - * @param string $v new value - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) */ public function setMetaKeywords($v) { @@ -680,7 +662,6 @@ abstract class ProductI18n implements ActiveRecordInterface $this->modifiedColumns[ProductI18nTableMap::META_KEYWORDS] = true; } - return $this; } // setMetaKeywords() @@ -724,7 +705,6 @@ abstract class ProductI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -791,10 +771,10 @@ abstract class ProductI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -830,7 +810,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductI18n::setDeleted() @@ -873,8 +853,8 @@ abstract class ProductI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -924,8 +904,8 @@ abstract class ProductI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -968,7 +948,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1059,7 +1039,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1075,12 +1055,12 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1094,7 +1074,7 @@ abstract class ProductI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1139,12 +1119,12 @@ abstract class ProductI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1183,12 +1163,12 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1202,8 +1182,8 @@ abstract class ProductI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1252,8 +1232,8 @@ abstract class ProductI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1289,7 +1269,6 @@ abstract class ProductI18n implements ActiveRecordInterface if ($this->isColumnModified(ProductI18nTableMap::META_TITLE)) $criteria->add(ProductI18nTableMap::META_TITLE, $this->meta_title); if ($this->isColumnModified(ProductI18nTableMap::META_DESCRIPTION)) $criteria->add(ProductI18nTableMap::META_DESCRIPTION, $this->meta_description); if ($this->isColumnModified(ProductI18nTableMap::META_KEYWORDS)) $criteria->add(ProductI18nTableMap::META_KEYWORDS, $this->meta_keywords); - return $criteria; } @@ -1327,7 +1306,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1342,7 +1321,6 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1352,9 +1330,9 @@ abstract class ProductI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1381,8 +1359,8 @@ abstract class ProductI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1398,8 +1376,8 @@ abstract class ProductI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductI18n The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductI18n The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1418,16 +1396,14 @@ abstract class ProductI18n implements ActiveRecordInterface $v->addProductI18n($this); } - return $this; } - /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1475,7 +1451,7 @@ abstract class ProductI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ProductI18nQuery.php b/core/lib/Thelia/Model/Base/ProductI18nQuery.php index ab99a0ef2..4d9b53540 100644 --- a/core/lib/Thelia/Model/Base/ProductI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ProductI18nQuery.php @@ -79,9 +79,9 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductI18n', $modelAlias = null) { @@ -91,8 +91,8 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Returns a new ChildProductI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductI18nQuery */ @@ -152,10 +152,10 @@ abstract class ProductI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductI18n A model object, or null if the key is not found + * @return ChildProductI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -183,8 +183,8 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductI18n|array|mixed the result, formatted by the current formatter */ @@ -204,8 +204,8 @@ abstract class ProductI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -226,7 +226,7 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -241,7 +241,7 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class ProductI18nQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -312,9 +312,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -341,9 +341,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -370,9 +370,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -399,9 +399,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -428,9 +428,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -457,9 +457,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByMetaTitle('%fooValue%'); // WHERE meta_title LIKE '%fooValue%' * * - * @param string $metaTitle The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaTitle The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -486,9 +486,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByMetaDescription('%fooValue%'); // WHERE meta_description LIKE '%fooValue%' * * - * @param string $metaDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -515,9 +515,9 @@ abstract class ProductI18nQuery extends ModelCriteria * $query->filterByMetaKeywords('%fooValue%'); // WHERE meta_keywords LIKE '%fooValue%' * * - * @param string $metaKeywords The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $metaKeywords The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -538,8 +538,8 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -563,8 +563,8 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -597,11 +597,11 @@ abstract class ProductI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -613,7 +613,7 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductI18n $productI18n Object to remove from the list of results + * @param ChildProductI18n $productI18n Object to remove from the list of results * * @return ChildProductI18nQuery The current query, for fluid interface */ @@ -631,8 +631,8 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Deletes all rows from the product_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -663,13 +663,13 @@ abstract class ProductI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -689,7 +689,6 @@ abstract class ProductI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php index bb0973b2d..b5eb690b5 100644 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -32,7 +32,6 @@ abstract class ProductImage implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductImageTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -343,9 +342,9 @@ abstract class ProductImage implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductImage The current object, for fluid interface */ @@ -395,44 +394,40 @@ abstract class ProductImage implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [file] column value. * - * @return string + * @return string */ public function getFile() { - return $this->file; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -440,8 +435,8 @@ abstract class ProductImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -460,8 +455,8 @@ abstract class ProductImage implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -479,8 +474,8 @@ abstract class ProductImage implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setId($v) { @@ -493,15 +488,14 @@ abstract class ProductImage implements ActiveRecordInterface $this->modifiedColumns[ProductImageTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setProductId($v) { @@ -518,15 +512,14 @@ abstract class ProductImage implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [file] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setFile($v) { @@ -539,15 +532,14 @@ abstract class ProductImage implements ActiveRecordInterface $this->modifiedColumns[ProductImageTableMap::FILE] = true; } - return $this; } // setFile() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setPosition($v) { @@ -560,16 +552,15 @@ abstract class ProductImage implements ActiveRecordInterface $this->modifiedColumns[ProductImageTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -581,16 +572,15 @@ abstract class ProductImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -602,7 +592,6 @@ abstract class ProductImage implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -706,10 +695,10 @@ abstract class ProductImage implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -747,7 +736,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductImage::setDeleted() @@ -790,8 +779,8 @@ abstract class ProductImage implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -852,8 +841,8 @@ abstract class ProductImage implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -913,7 +902,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -997,7 +986,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1013,12 +1002,12 @@ abstract class ProductImage implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1032,7 +1021,7 @@ abstract class ProductImage implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1068,12 +1057,12 @@ abstract class ProductImage implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1112,12 +1101,12 @@ abstract class ProductImage implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1131,8 +1120,8 @@ abstract class ProductImage implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1172,8 +1161,8 @@ abstract class ProductImage implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1203,7 +1192,6 @@ abstract class ProductImage implements ActiveRecordInterface if ($this->isColumnModified(ProductImageTableMap::POSITION)) $criteria->add(ProductImageTableMap::POSITION, $this->position); if ($this->isColumnModified(ProductImageTableMap::CREATED_AT)) $criteria->add(ProductImageTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductImageTableMap::UPDATED_AT)) $criteria->add(ProductImageTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1225,7 +1213,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1235,7 +1223,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1249,7 +1237,6 @@ abstract class ProductImage implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1259,9 +1246,9 @@ abstract class ProductImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductImage (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductImage (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1299,8 +1286,8 @@ abstract class ProductImage implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductImage Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductImage Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1316,8 +1303,8 @@ abstract class ProductImage implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductImage The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1336,16 +1323,14 @@ abstract class ProductImage implements ActiveRecordInterface $v->addProductImage($this); } - return $this; } - /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1364,13 +1349,12 @@ abstract class ProductImage implements ActiveRecordInterface return $this->aProduct; } - /** * Initializes a collection based on the name of a relation. * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1409,8 +1393,8 @@ abstract class ProductImage implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1432,8 +1416,8 @@ abstract class ProductImage implements ActiveRecordInterface * If this ChildProductImage is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductImageI18n[] List of ChildProductImageI18n objects * @throws PropelException */ @@ -1489,9 +1473,9 @@ abstract class ProductImage implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productImageI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProductImage The current object (for fluent API support) + * @param Collection $productImageI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProductImage The current object (for fluent API support) */ public function setProductImageI18ns(Collection $productImageI18ns, ConnectionInterface $con = null) { @@ -1521,10 +1505,10 @@ abstract class ProductImage implements ActiveRecordInterface /** * Returns the number of related ProductImageI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductImageI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductImageI18n objects. * @throws PropelException */ public function countProductImageI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1556,8 +1540,8 @@ abstract class ProductImage implements ActiveRecordInterface * Method called to associate a ChildProductImageI18n object to this object * through the ChildProductImageI18n foreign key attribute. * - * @param ChildProductImageI18n $l ChildProductImageI18n - * @return \Thelia\Model\ProductImage The current object (for fluent API support) + * @param ChildProductImageI18n $l ChildProductImageI18n + * @return \Thelia\Model\ProductImage The current object (for fluent API support) */ public function addProductImageI18n(ChildProductImageI18n $l) { @@ -1587,7 +1571,7 @@ abstract class ProductImage implements ActiveRecordInterface } /** - * @param ProductImageI18n $productImageI18n The productImageI18n object to remove. + * @param ProductImageI18n $productImageI18n The productImageI18n object to remove. * @return ChildProductImage The current object (for fluent API support) */ public function removeProductImageI18n($productImageI18n) @@ -1630,7 +1614,7 @@ abstract class ProductImage implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1665,7 +1649,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductImage The current object (for fluent API support) + * @return ChildProductImage The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1679,9 +1663,9 @@ abstract class ProductImage implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildProductImage The current object (for fluent API support) + * @return ChildProductImage The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1693,7 +1677,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1703,8 +1687,8 @@ abstract class ProductImage implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildProductImageI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1737,10 +1721,10 @@ abstract class ProductImage implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildProductImage The current object (for fluent API support) + * @return ChildProductImage The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1765,7 +1749,7 @@ abstract class ProductImage implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildProductImageI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php index ede0e5516..4dceba1d6 100644 --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -26,7 +26,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductImageI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ProductImageI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductImageI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->aProductImage = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->modifiedColumns[ProductImageI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->modifiedColumns[ProductImageI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->modifiedColumns[ProductImageI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->modifiedColumns[ProductImageI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface $this->modifiedColumns[ProductImageI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductImageI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ProductImageI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductImageI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ProductImageI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface if ($this->isColumnModified(ProductImageI18nTableMap::DESCRIPTION)) $criteria->add(ProductImageI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ProductImageI18nTableMap::CHAPO)) $criteria->add(ProductImageI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ProductImageI18nTableMap::POSTSCRIPTUM)) $criteria->add(ProductImageI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ProductImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductImageI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductImageI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductImageI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductImageI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildProductImage object. * - * @param ChildProductImage $v - * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) + * @param ChildProductImage $v + * @return \Thelia\Model\ProductImageI18n The current object (for fluent API support) * @throws PropelException */ public function setProductImage(ChildProductImage $v = null) @@ -1247,16 +1231,14 @@ abstract class ProductImageI18n implements ActiveRecordInterface $v->addProductImageI18n($this); } - return $this; } - /** * Get the associated ChildProductImage object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProductImage The associated ChildProductImage object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProductImage The associated ChildProductImage object. * @throws PropelException */ public function getProductImage(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php b/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php index cb588e56c..de5ddd262 100644 --- a/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php @@ -67,9 +67,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductImageI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductImageI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Returns a new ChildProductImageI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductImageI18nQuery */ @@ -140,10 +140,10 @@ abstract class ProductImageI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductImageI18n A model object, or null if the key is not found + * @return ChildProductImageI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductImageI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProductImageI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProductImageI18nQuery extends ModelCriteria * * @see filterByProductImage() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ProductImageI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -440,7 +440,7 @@ abstract class ProductImageI18nQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ProductImage object * * @param \Thelia\Model\ProductImage|ObjectCollection $productImage The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ProductImageI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductImageQuery A secondary query class using the current class as primary query */ public function useProductImageQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductImageI18n $productImageI18n Object to remove from the list of results + * @param ChildProductImageI18n $productImageI18n Object to remove from the list of results * * @return ChildProductImageI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Deletes all rows from the product_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ProductImageI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ProductImageI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductImageI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php index cb73e994b..3e28b19e7 100644 --- a/core/lib/Thelia/Model/Base/ProductImageQuery.php +++ b/core/lib/Thelia/Model/Base/ProductImageQuery.php @@ -72,9 +72,9 @@ abstract class ProductImageQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductImageQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductImage', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Returns a new ChildProductImageQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductImageQuery */ @@ -114,7 +114,7 @@ abstract class ProductImageQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProductImage|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ProductImageQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductImage A model object, or null if the key is not found + * @return ChildProductImage A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductImage|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ProductImageQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ProductImageQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductImageQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProductImageTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductImageQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProductImageTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ProductImageQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -294,11 +292,11 @@ abstract class ProductImageQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -334,9 +332,9 @@ abstract class ProductImageQuery extends ModelCriteria * $query->filterByFile('%fooValue%'); // WHERE file LIKE '%fooValue%' * * - * @param string $file The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $file The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -364,11 +362,11 @@ abstract class ProductImageQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -405,13 +403,13 @@ abstract class ProductImageQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -448,13 +446,13 @@ abstract class ProductImageQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -484,8 +482,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -509,8 +507,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -543,11 +541,11 @@ abstract class ProductImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -559,8 +557,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductImageI18n object * - * @param \Thelia\Model\ProductImageI18n|ObjectCollection $productImageI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductImageI18n|ObjectCollection $productImageI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -582,8 +580,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductImageI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -616,11 +614,11 @@ abstract class ProductImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductImageI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductImageI18nQuery A secondary query class using the current class as primary query */ public function useProductImageI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -632,7 +630,7 @@ abstract class ProductImageQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductImage $productImage Object to remove from the list of results + * @param ChildProductImage $productImage Object to remove from the list of results * * @return ChildProductImageQuery The current query, for fluid interface */ @@ -648,8 +646,8 @@ abstract class ProductImageQuery extends ModelCriteria /** * Deletes all rows from the product_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -680,13 +678,13 @@ abstract class ProductImageQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -706,7 +704,6 @@ abstract class ProductImageQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductImageTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -725,9 +722,9 @@ abstract class ProductImageQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -737,9 +734,9 @@ abstract class ProductImageQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -749,7 +746,7 @@ abstract class ProductImageQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -759,7 +756,7 @@ abstract class ProductImageQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -769,7 +766,7 @@ abstract class ProductImageQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -779,7 +776,7 @@ abstract class ProductImageQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -791,11 +788,11 @@ abstract class ProductImageQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -810,10 +807,10 @@ abstract class ProductImageQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductImageQuery The current query, for fluid interface + * @return ChildProductImageQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -830,11 +827,11 @@ abstract class ProductImageQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductImageI18nQuery A secondary query class using the current class as primary query + * @return ChildProductImageI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php index a883a524c..0990febcc 100644 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -31,7 +31,6 @@ abstract class ProductPrice implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductPriceTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -345,9 +344,9 @@ abstract class ProductPrice implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductPrice The current object, for fluid interface */ @@ -397,55 +396,50 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Get the [product_sale_elements_id] column value. * - * @return int + * @return int */ public function getProductSaleElementsId() { - return $this->product_sale_elements_id; } /** * Get the [currency_id] column value. * - * @return int + * @return int */ public function getCurrencyId() { - return $this->currency_id; } /** * Get the [price] column value. * - * @return double + * @return double */ public function getPrice() { - return $this->price; } /** * Get the [promo_price] column value. * - * @return double + * @return double */ public function getPromoPrice() { - return $this->promo_price; } /** * Get the [from_default_currency] column value. * - * @return boolean + * @return boolean */ public function getFromDefaultCurrency() { - return $this->from_default_currency; } @@ -453,8 +447,8 @@ abstract class ProductPrice implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -473,8 +467,8 @@ abstract class ProductPrice implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -492,8 +486,8 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Set the value of [product_sale_elements_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setProductSaleElementsId($v) { @@ -510,15 +504,14 @@ abstract class ProductPrice implements ActiveRecordInterface $this->aProductSaleElements = null; } - return $this; } // setProductSaleElementsId() /** * Set the value of [currency_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setCurrencyId($v) { @@ -535,15 +528,14 @@ abstract class ProductPrice implements ActiveRecordInterface $this->aCurrency = null; } - return $this; } // setCurrencyId() /** * Set the value of [price] column. * - * @param double $v new value - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setPrice($v) { @@ -556,15 +548,14 @@ abstract class ProductPrice implements ActiveRecordInterface $this->modifiedColumns[ProductPriceTableMap::PRICE] = true; } - return $this; } // setPrice() /** * Set the value of [promo_price] column. * - * @param double $v new value - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setPromoPrice($v) { @@ -577,7 +568,6 @@ abstract class ProductPrice implements ActiveRecordInterface $this->modifiedColumns[ProductPriceTableMap::PROMO_PRICE] = true; } - return $this; } // setPromoPrice() @@ -588,8 +578,8 @@ abstract class ProductPrice implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setFromDefaultCurrency($v) { @@ -606,16 +596,15 @@ abstract class ProductPrice implements ActiveRecordInterface $this->modifiedColumns[ProductPriceTableMap::FROM_DEFAULT_CURRENCY] = true; } - return $this; } // setFromDefaultCurrency() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -627,16 +616,15 @@ abstract class ProductPrice implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -648,7 +636,6 @@ abstract class ProductPrice implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -700,7 +687,6 @@ abstract class ProductPrice implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductPriceTableMap::translateFieldName('ProductSaleElementsId', TableMap::TYPE_PHPNAME, $indexType)]; $this->product_sale_elements_id = (null !== $col) ? (int) $col : null; @@ -770,10 +756,10 @@ abstract class ProductPrice implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -810,7 +796,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductPrice::setDeleted() @@ -853,8 +839,8 @@ abstract class ProductPrice implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -915,8 +901,8 @@ abstract class ProductPrice implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -966,7 +952,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1045,7 +1031,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1061,12 +1047,12 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1080,7 +1066,7 @@ abstract class ProductPrice implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1119,12 +1105,12 @@ abstract class ProductPrice implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1164,12 +1150,12 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1183,8 +1169,8 @@ abstract class ProductPrice implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1227,8 +1213,8 @@ abstract class ProductPrice implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1260,7 +1246,6 @@ abstract class ProductPrice implements ActiveRecordInterface if ($this->isColumnModified(ProductPriceTableMap::FROM_DEFAULT_CURRENCY)) $criteria->add(ProductPriceTableMap::FROM_DEFAULT_CURRENCY, $this->from_default_currency); if ($this->isColumnModified(ProductPriceTableMap::CREATED_AT)) $criteria->add(ProductPriceTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) $criteria->add(ProductPriceTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1298,7 +1283,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1313,7 +1298,6 @@ abstract class ProductPrice implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getProductSaleElementsId()) && (null === $this->getCurrencyId()); } @@ -1323,9 +1307,9 @@ abstract class ProductPrice implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductPrice (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductPrice (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1350,8 +1334,8 @@ abstract class ProductPrice implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductPrice Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductPrice Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1367,8 +1351,8 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Declares an association between this object and a ChildProductSaleElements object. * - * @param ChildProductSaleElements $v - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param ChildProductSaleElements $v + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) * @throws PropelException */ public function setProductSaleElements(ChildProductSaleElements $v = null) @@ -1387,16 +1371,14 @@ abstract class ProductPrice implements ActiveRecordInterface $v->addProductPrice($this); } - return $this; } - /** * Get the associated ChildProductSaleElements object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProductSaleElements The associated ChildProductSaleElements object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProductSaleElements The associated ChildProductSaleElements object. * @throws PropelException */ public function getProductSaleElements(ConnectionInterface $con = null) @@ -1418,8 +1400,8 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Declares an association between this object and a ChildCurrency object. * - * @param ChildCurrency $v - * @return \Thelia\Model\ProductPrice The current object (for fluent API support) + * @param ChildCurrency $v + * @return \Thelia\Model\ProductPrice The current object (for fluent API support) * @throws PropelException */ public function setCurrency(ChildCurrency $v = null) @@ -1438,16 +1420,14 @@ abstract class ProductPrice implements ActiveRecordInterface $v->addProductPrice($this); } - return $this; } - /** * Get the associated ChildCurrency object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCurrency The associated ChildCurrency object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCurrency The associated ChildCurrency object. * @throws PropelException */ public function getCurrency(ConnectionInterface $con = null) @@ -1493,7 +1473,7 @@ abstract class ProductPrice implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1519,7 +1499,7 @@ abstract class ProductPrice implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductPrice The current object (for fluent API support) + * @return ChildProductPrice The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1604,7 +1584,6 @@ abstract class ProductPrice implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php index 269fc833c..469f45185 100644 --- a/core/lib/Thelia/Model/Base/ProductPriceQuery.php +++ b/core/lib/Thelia/Model/Base/ProductPriceQuery.php @@ -75,9 +75,9 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductPriceQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductPrice', $modelAlias = null) { @@ -87,8 +87,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Returns a new ChildProductPriceQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductPriceQuery */ @@ -148,10 +148,10 @@ abstract class ProductPriceQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductPrice A model object, or null if the key is not found + * @return ChildProductPrice A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -179,8 +179,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductPrice|array|mixed the result, formatted by the current formatter */ @@ -200,8 +200,8 @@ abstract class ProductPriceQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -222,7 +222,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -237,7 +237,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -268,11 +268,11 @@ abstract class ProductPriceQuery extends ModelCriteria * * @see filterByProductSaleElements() * - * @param mixed $productSaleElementsId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productSaleElementsId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -311,11 +311,11 @@ abstract class ProductPriceQuery extends ModelCriteria * * @see filterByCurrency() * - * @param mixed $currencyId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $currencyId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -352,11 +352,11 @@ abstract class ProductPriceQuery extends ModelCriteria * $query->filterByPrice(array('min' => 12)); // WHERE price > 12 * * - * @param mixed $price The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $price The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -393,11 +393,11 @@ abstract class ProductPriceQuery extends ModelCriteria * $query->filterByPromoPrice(array('min' => 12)); // WHERE promo_price > 12 * * - * @param mixed $promoPrice The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $promoPrice The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -433,12 +433,12 @@ abstract class ProductPriceQuery extends ModelCriteria * $query->filterByFromDefaultCurrency('yes'); // WHERE from_default_currency = true * * - * @param boolean|string $fromDefaultCurrency The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $fromDefaultCurrency The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -461,13 +461,13 @@ abstract class ProductPriceQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -504,13 +504,13 @@ abstract class ProductPriceQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -541,7 +541,7 @@ abstract class ProductPriceQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\ProductSaleElements object * * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -565,8 +565,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductSaleElements relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -599,11 +599,11 @@ abstract class ProductPriceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query */ public function useProductSaleElementsQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -615,8 +615,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Currency object * - * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -640,8 +640,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Currency relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -674,11 +674,11 @@ abstract class ProductPriceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query */ public function useCurrencyQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -690,7 +690,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductPrice $productPrice Object to remove from the list of results + * @param ChildProductPrice $productPrice Object to remove from the list of results * * @return ChildProductPriceQuery The current query, for fluid interface */ @@ -708,8 +708,8 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Deletes all rows from the product_price table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -740,13 +740,13 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductPrice or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductPrice object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductPrice object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -766,7 +766,6 @@ abstract class ProductPriceQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductPriceTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -785,9 +784,9 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -797,9 +796,9 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -809,7 +808,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -819,7 +818,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -829,7 +828,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -839,7 +838,7 @@ abstract class ProductPriceQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductPriceQuery The current query, for fluid interface + * @return ChildProductPriceQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 352b5cc68..3750e316a 100644 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -143,9 +143,9 @@ abstract class ProductQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Product', $modelAlias = null) { @@ -155,8 +155,8 @@ abstract class ProductQuery extends ModelCriteria /** * Returns a new ChildProductQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductQuery */ @@ -185,7 +185,7 @@ abstract class ProductQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProduct|array|mixed the result, formatted by the current formatter @@ -216,10 +216,10 @@ abstract class ProductQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProduct A model object, or null if the key is not found + * @return ChildProduct A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -246,8 +246,8 @@ abstract class ProductQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProduct|array|mixed the result, formatted by the current formatter */ @@ -267,8 +267,8 @@ abstract class ProductQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -289,26 +289,24 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProductTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProductTableMap::ID, $keys, Criteria::IN); } @@ -322,11 +320,11 @@ abstract class ProductQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -365,11 +363,11 @@ abstract class ProductQuery extends ModelCriteria * * @see filterByTaxRule() * - * @param mixed $taxRuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $taxRuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -405,9 +403,9 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%' * * - * @param string $ref The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $ref The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -435,11 +433,11 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -476,11 +474,11 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -519,11 +517,11 @@ abstract class ProductQuery extends ModelCriteria * * @see filterByTemplate() * - * @param mixed $templateId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $templateId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -560,13 +558,13 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -603,13 +601,13 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -646,11 +644,11 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -687,13 +685,13 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -729,9 +727,9 @@ abstract class ProductQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -752,8 +750,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRule object * - * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -777,8 +775,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -811,11 +809,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query */ public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -827,8 +825,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Template object * - * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -852,8 +850,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Template relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -886,11 +884,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query */ public function useTemplateQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -902,8 +900,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductCategory object * - * @param \Thelia\Model\ProductCategory|ObjectCollection $productCategory the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductCategory|ObjectCollection $productCategory the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -925,8 +923,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductCategory relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -959,11 +957,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductCategoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductCategoryQuery A secondary query class using the current class as primary query */ public function useProductCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -975,8 +973,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureProduct object * - * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -998,8 +996,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureProduct relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1032,11 +1030,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query */ public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1048,8 +1046,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductSaleElements object * - * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1071,8 +1069,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductSaleElements relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1105,11 +1103,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query */ public function useProductSaleElementsQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1121,8 +1119,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductImage object * - * @param \Thelia\Model\ProductImage|ObjectCollection $productImage the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductImage|ObjectCollection $productImage the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1144,8 +1142,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductImage relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1178,11 +1176,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductImageQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductImageQuery A secondary query class using the current class as primary query */ public function useProductImageQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1194,8 +1192,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductDocument object * - * @param \Thelia\Model\ProductDocument|ObjectCollection $productDocument the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductDocument|ObjectCollection $productDocument the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1217,8 +1215,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductDocument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1251,11 +1249,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductDocumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductDocumentQuery A secondary query class using the current class as primary query */ public function useProductDocumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1268,7 +1266,7 @@ abstract class ProductQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\Accessory object * * @param \Thelia\Model\Accessory|ObjectCollection $accessory the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1290,8 +1288,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AccessoryRelatedByProductId relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1324,11 +1322,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AccessoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AccessoryQuery A secondary query class using the current class as primary query */ public function useAccessoryRelatedByProductIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1341,7 +1339,7 @@ abstract class ProductQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\Accessory object * * @param \Thelia\Model\Accessory|ObjectCollection $accessory the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1363,8 +1361,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AccessoryRelatedByAccessory relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1397,11 +1395,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AccessoryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AccessoryQuery A secondary query class using the current class as primary query */ public function useAccessoryRelatedByAccessoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1413,8 +1411,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CartItem object * - * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1436,8 +1434,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CartItem relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1470,11 +1468,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query */ public function useCartItemQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1486,8 +1484,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductAssociatedContent object * - * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1509,8 +1507,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductAssociatedContent relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1543,11 +1541,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query */ public function useProductAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1559,8 +1557,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductI18n object * - * @param \Thelia\Model\ProductI18n|ObjectCollection $productI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductI18n|ObjectCollection $productI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1582,8 +1580,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1616,11 +1614,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductI18nQuery A secondary query class using the current class as primary query */ public function useProductI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -1632,8 +1630,8 @@ abstract class ProductQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductVersion object * - * @param \Thelia\Model\ProductVersion|ObjectCollection $productVersion the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductVersion|ObjectCollection $productVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1655,8 +1653,8 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductVersion relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductQuery The current query, for fluid interface */ @@ -1689,11 +1687,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductVersionQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductVersionQuery A secondary query class using the current class as primary query */ public function useProductVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -1706,8 +1704,8 @@ abstract class ProductQuery extends ModelCriteria * Filter the query by a related Category object * using the product_category table as cross reference * - * @param Category $category the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Category $category the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1723,8 +1721,8 @@ abstract class ProductQuery extends ModelCriteria * Filter the query by a related Product object * using the accessory table as cross reference * - * @param Product $product the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Product $product the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1740,8 +1738,8 @@ abstract class ProductQuery extends ModelCriteria * Filter the query by a related Product object * using the accessory table as cross reference * - * @param Product $product the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Product $product the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductQuery The current query, for fluid interface */ @@ -1756,7 +1754,7 @@ abstract class ProductQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProduct $product Object to remove from the list of results + * @param ChildProduct $product Object to remove from the list of results * * @return ChildProductQuery The current query, for fluid interface */ @@ -1772,8 +1770,8 @@ abstract class ProductQuery extends ModelCriteria /** * Deletes all rows from the product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1804,13 +1802,13 @@ abstract class ProductQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProduct or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProduct object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProduct object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1830,7 +1828,6 @@ abstract class ProductQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1849,9 +1846,9 @@ abstract class ProductQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1861,9 +1858,9 @@ abstract class ProductQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1873,7 +1870,7 @@ abstract class ProductQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1883,7 +1880,7 @@ abstract class ProductQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1893,7 +1890,7 @@ abstract class ProductQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1903,7 +1900,7 @@ abstract class ProductQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -1915,11 +1912,11 @@ abstract class ProductQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1934,10 +1931,10 @@ abstract class ProductQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductQuery The current query, for fluid interface + * @return ChildProductQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -1954,11 +1951,11 @@ abstract class ProductQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProductI18nQuery A secondary query class using the current class as primary query + * @return ChildProductI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -1974,7 +1971,7 @@ abstract class ProductQuery extends ModelCriteria * * @return boolean */ - static public function isVersioningEnabled() + public static function isVersioningEnabled() { return self::$isVersioningEnabled; } @@ -1982,7 +1979,7 @@ abstract class ProductQuery extends ModelCriteria /** * Enables versioning */ - static public function enableVersioning() + public static function enableVersioning() { self::$isVersioningEnabled = true; } @@ -1990,7 +1987,7 @@ abstract class ProductQuery extends ModelCriteria /** * Disables versioning */ - static public function disableVersioning() + public static function disableVersioning() { self::$isVersioningEnabled = false; } diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php index cb899c8c5..2d24ed3a0 100644 --- a/core/lib/Thelia/Model/Base/ProductSaleElements.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php @@ -36,7 +36,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductSaleElementsTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -407,9 +406,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductSaleElements The current object, for fluid interface */ @@ -459,99 +458,90 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [product_id] column value. * - * @return int + * @return int */ public function getProductId() { - return $this->product_id; } /** * Get the [ref] column value. * - * @return string + * @return string */ public function getRef() { - return $this->ref; } /** * Get the [quantity] column value. * - * @return double + * @return double */ public function getQuantity() { - return $this->quantity; } /** * Get the [promo] column value. * - * @return int + * @return int */ public function getPromo() { - return $this->promo; } /** * Get the [newness] column value. * - * @return int + * @return int */ public function getNewness() { - return $this->newness; } /** * Get the [weight] column value. * - * @return double + * @return double */ public function getWeight() { - return $this->weight; } /** * Get the [is_default] column value. * - * @return boolean + * @return boolean */ public function getIsDefault() { - return $this->is_default; } /** * Get the [ean_code] column value. * - * @return string + * @return string */ public function getEanCode() { - return $this->ean_code; } @@ -559,8 +549,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -579,8 +569,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -598,8 +588,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setId($v) { @@ -612,15 +602,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [product_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setProductId($v) { @@ -637,15 +626,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setProductId() /** * Set the value of [ref] column. * - * @param string $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setRef($v) { @@ -658,15 +646,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::REF] = true; } - return $this; } // setRef() /** * Set the value of [quantity] column. * - * @param double $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setQuantity($v) { @@ -679,15 +666,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::QUANTITY] = true; } - return $this; } // setQuantity() /** * Set the value of [promo] column. * - * @param int $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setPromo($v) { @@ -700,15 +686,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::PROMO] = true; } - return $this; } // setPromo() /** * Set the value of [newness] column. * - * @param int $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setNewness($v) { @@ -721,15 +706,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::NEWNESS] = true; } - return $this; } // setNewness() /** * Set the value of [weight] column. * - * @param double $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param double $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setWeight($v) { @@ -742,7 +726,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::WEIGHT] = true; } - return $this; } // setWeight() @@ -753,8 +736,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setIsDefault($v) { @@ -771,15 +754,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::IS_DEFAULT] = true; } - return $this; } // setIsDefault() /** * Set the value of [ean_code] column. * - * @param string $v new value - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setEanCode($v) { @@ -792,16 +774,15 @@ abstract class ProductSaleElements implements ActiveRecordInterface $this->modifiedColumns[ProductSaleElementsTableMap::EAN_CODE] = true; } - return $this; } // setEanCode() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -813,16 +794,15 @@ abstract class ProductSaleElements implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -834,7 +814,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -890,7 +869,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductSaleElementsTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -969,10 +947,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -1014,7 +992,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductSaleElements::setDeleted() @@ -1057,8 +1035,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1119,8 +1097,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1214,7 +1192,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1328,7 +1306,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1344,12 +1322,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1363,7 +1341,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1414,12 +1392,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1469,12 +1447,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1488,8 +1466,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1544,8 +1522,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1585,7 +1563,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface if ($this->isColumnModified(ProductSaleElementsTableMap::EAN_CODE)) $criteria->add(ProductSaleElementsTableMap::EAN_CODE, $this->ean_code); if ($this->isColumnModified(ProductSaleElementsTableMap::CREATED_AT)) $criteria->add(ProductSaleElementsTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProductSaleElementsTableMap::UPDATED_AT)) $criteria->add(ProductSaleElementsTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1607,7 +1584,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1617,7 +1594,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1631,7 +1608,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1641,9 +1617,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductSaleElements (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductSaleElements (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1698,8 +1674,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductSaleElements Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductSaleElements Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1715,8 +1691,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1735,7 +1711,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface $v->addProductSaleElements($this); } - return $this; } @@ -1743,8 +1718,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1769,7 +1744,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1814,8 +1789,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1837,8 +1812,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If this ChildProductSaleElements is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects * @throws PropelException */ @@ -1894,15 +1869,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeCombinations A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProductSaleElements The current object (for fluent API support) + * @param Collection $attributeCombinations A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProductSaleElements The current object (for fluent API support) */ public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null) { $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1926,10 +1900,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Returns the number of related AttributeCombination objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeCombination objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeCombination objects. * @throws PropelException */ public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1961,8 +1935,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Method called to associate a ChildAttributeCombination object to this object * through the ChildAttributeCombination foreign key attribute. * - * @param ChildAttributeCombination $l ChildAttributeCombination - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param ChildAttributeCombination $l ChildAttributeCombination + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function addAttributeCombination(ChildAttributeCombination $l) { @@ -1988,7 +1962,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface } /** - * @param AttributeCombination $attributeCombination The attributeCombination object to remove. + * @param AttributeCombination $attributeCombination The attributeCombination object to remove. * @return ChildProductSaleElements The current object (for fluent API support) */ public function removeAttributeCombination($attributeCombination) @@ -2006,7 +1980,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2018,9 +1991,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in ProductSaleElements. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinAttribute($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2031,7 +2004,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface return $this->getAttributeCombinations($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2043,9 +2015,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in ProductSaleElements. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects */ public function getAttributeCombinationsJoinAttributeAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2085,8 +2057,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2108,8 +2080,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If this ChildProductSaleElements is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildCartItem[] List of ChildCartItem objects * @throws PropelException */ @@ -2165,15 +2137,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $cartItems A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProductSaleElements The current object (for fluent API support) + * @param Collection $cartItems A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProductSaleElements The current object (for fluent API support) */ public function setCartItems(Collection $cartItems, ConnectionInterface $con = null) { $cartItemsToDelete = $this->getCartItems(new Criteria(), $con)->diff($cartItems); - $this->cartItemsScheduledForDeletion = $cartItemsToDelete; foreach ($cartItemsToDelete as $cartItemRemoved) { @@ -2194,10 +2165,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Returns the number of related CartItem objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CartItem objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CartItem objects. * @throws PropelException */ public function countCartItems(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2229,8 +2200,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Method called to associate a ChildCartItem object to this object * through the ChildCartItem foreign key attribute. * - * @param ChildCartItem $l ChildCartItem - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param ChildCartItem $l ChildCartItem + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function addCartItem(ChildCartItem $l) { @@ -2256,7 +2227,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface } /** - * @param CartItem $cartItem The cartItem object to remove. + * @param CartItem $cartItem The cartItem object to remove. * @return ChildProductSaleElements The current object (for fluent API support) */ public function removeCartItem($cartItem) @@ -2274,7 +2245,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2286,9 +2256,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in ProductSaleElements. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinCart($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2299,7 +2269,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface return $this->getCartItems($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2311,9 +2280,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in ProductSaleElements. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildCartItem[] List of ChildCartItem objects */ public function getCartItemsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2353,8 +2322,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2376,8 +2345,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * If this ChildProductSaleElements is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProductPrice[] List of ChildProductPrice objects * @throws PropelException */ @@ -2433,15 +2402,14 @@ abstract class ProductSaleElements implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $productPrices A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProductSaleElements The current object (for fluent API support) + * @param Collection $productPrices A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProductSaleElements The current object (for fluent API support) */ public function setProductPrices(Collection $productPrices, ConnectionInterface $con = null) { $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2465,10 +2433,10 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Returns the number of related ProductPrice objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProductPrice objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductPrice objects. * @throws PropelException */ public function countProductPrices(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2500,8 +2468,8 @@ abstract class ProductSaleElements implements ActiveRecordInterface * Method called to associate a ChildProductPrice object to this object * through the ChildProductPrice foreign key attribute. * - * @param ChildProductPrice $l ChildProductPrice - * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) + * @param ChildProductPrice $l ChildProductPrice + * @return \Thelia\Model\ProductSaleElements The current object (for fluent API support) */ public function addProductPrice(ChildProductPrice $l) { @@ -2527,7 +2495,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface } /** - * @param ProductPrice $productPrice The productPrice object to remove. + * @param ProductPrice $productPrice The productPrice object to remove. * @return ChildProductSaleElements The current object (for fluent API support) */ public function removeProductPrice($productPrice) @@ -2545,7 +2513,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2557,9 +2524,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in ProductSaleElements. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProductPrice[] List of ChildProductPrice objects */ public function getProductPricesJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2601,7 +2568,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2644,7 +2611,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProductSaleElements The current object (for fluent API support) + * @return ChildProductSaleElements The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2729,7 +2696,6 @@ abstract class ProductSaleElements implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php b/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php index 3a46a016d..aa0ec2b12 100644 --- a/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php @@ -99,9 +99,9 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductSaleElementsQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductSaleElements', $modelAlias = null) { @@ -111,8 +111,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Returns a new ChildProductSaleElementsQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductSaleElementsQuery */ @@ -141,7 +141,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProductSaleElements|array|mixed the result, formatted by the current formatter @@ -172,10 +172,10 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductSaleElements A model object, or null if the key is not found + * @return ChildProductSaleElements A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -202,8 +202,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductSaleElements|array|mixed the result, formatted by the current formatter */ @@ -223,8 +223,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -245,26 +245,24 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProductSaleElementsTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProductSaleElementsTableMap::ID, $keys, Criteria::IN); } @@ -278,11 +276,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -321,11 +319,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $productId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -361,9 +359,9 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%' * * - * @param string $ref The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $ref The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -391,11 +389,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12 * * - * @param mixed $quantity The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $quantity The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -432,11 +430,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12 * * - * @param mixed $promo The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $promo The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -473,11 +471,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12 * * - * @param mixed $newness The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $newness The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -514,11 +512,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12 * * - * @param mixed $weight The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $weight The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -554,12 +552,12 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByIsDefault('yes'); // WHERE is_default = true * * - * @param boolean|string $isDefault The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isDefault The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -581,9 +579,9 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByEanCode('%fooValue%'); // WHERE ean_code LIKE '%fooValue%' * * - * @param string $eanCode The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $eanCode The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -611,13 +609,13 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -654,13 +652,13 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -690,8 +688,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -715,8 +713,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -749,11 +747,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -765,8 +763,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeCombination object * - * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -788,8 +786,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeCombination relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -822,11 +820,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query */ public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -838,8 +836,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\CartItem object * - * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -861,8 +859,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CartItem relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -895,11 +893,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query */ public function useCartItemQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -911,8 +909,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProductPrice object * - * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -934,8 +932,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProductPrice relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -968,11 +966,11 @@ abstract class ProductSaleElementsQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query */ public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -984,7 +982,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductSaleElements $productSaleElements Object to remove from the list of results + * @param ChildProductSaleElements $productSaleElements Object to remove from the list of results * * @return ChildProductSaleElementsQuery The current query, for fluid interface */ @@ -1000,8 +998,8 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Deletes all rows from the product_sale_elements table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -1032,13 +1030,13 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductSaleElements or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductSaleElements object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductSaleElements object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -1058,7 +1056,6 @@ abstract class ProductSaleElementsQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductSaleElementsTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -1077,9 +1074,9 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -1089,9 +1086,9 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -1101,7 +1098,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -1111,7 +1108,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -1121,7 +1118,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -1131,7 +1128,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProductSaleElementsQuery The current query, for fluid interface + * @return ChildProductSaleElementsQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php index cf5ea8af9..f8158d846 100644 --- a/core/lib/Thelia/Model/Base/ProductVersion.php +++ b/core/lib/Thelia/Model/Base/ProductVersion.php @@ -28,7 +28,6 @@ abstract class ProductVersion implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProductVersionTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -361,9 +360,9 @@ abstract class ProductVersion implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProductVersion The current object, for fluid interface */ @@ -413,66 +412,60 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [tax_rule_id] column value. * - * @return int + * @return int */ public function getTaxRuleId() { - return $this->tax_rule_id; } /** * Get the [ref] column value. * - * @return string + * @return string */ public function getRef() { - return $this->ref; } /** * Get the [visible] column value. * - * @return int + * @return int */ public function getVisible() { - return $this->visible; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } /** * Get the [template_id] column value. * - * @return int + * @return int */ public function getTemplateId() { - return $this->template_id; } @@ -480,8 +473,8 @@ abstract class ProductVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -500,8 +493,8 @@ abstract class ProductVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -519,11 +512,10 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Get the [version] column value. * - * @return int + * @return int */ public function getVersion() { - return $this->version; } @@ -531,8 +523,8 @@ abstract class ProductVersion implements ActiveRecordInterface * Get the [optionally formatted] temporal [version_created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -550,19 +542,18 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Get the [version_created_by] column value. * - * @return string + * @return string */ public function getVersionCreatedBy() { - return $this->version_created_by; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setId($v) { @@ -579,15 +570,14 @@ abstract class ProductVersion implements ActiveRecordInterface $this->aProduct = null; } - return $this; } // setId() /** * Set the value of [tax_rule_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setTaxRuleId($v) { @@ -600,15 +590,14 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::TAX_RULE_ID] = true; } - return $this; } // setTaxRuleId() /** * Set the value of [ref] column. * - * @param string $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setRef($v) { @@ -621,15 +610,14 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::REF] = true; } - return $this; } // setRef() /** * Set the value of [visible] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setVisible($v) { @@ -642,15 +630,14 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::VISIBLE] = true; } - return $this; } // setVisible() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setPosition($v) { @@ -663,15 +650,14 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Set the value of [template_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setTemplateId($v) { @@ -684,16 +670,15 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::TEMPLATE_ID] = true; } - return $this; } // setTemplateId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -705,16 +690,15 @@ abstract class ProductVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -726,15 +710,14 @@ abstract class ProductVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() /** * Set the value of [version] column. * - * @param int $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setVersion($v) { @@ -747,16 +730,15 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::VERSION] = true; } - return $this; } // setVersion() /** * Sets the value of [version_created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setVersionCreatedAt($v) { @@ -768,15 +750,14 @@ abstract class ProductVersion implements ActiveRecordInterface } } // if either are not null - return $this; } // setVersionCreatedAt() /** * Set the value of [version_created_by] column. * - * @param string $v new value - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) */ public function setVersionCreatedBy($v) { @@ -789,7 +770,6 @@ abstract class ProductVersion implements ActiveRecordInterface $this->modifiedColumns[ProductVersionTableMap::VERSION_CREATED_BY] = true; } - return $this; } // setVersionCreatedBy() @@ -841,7 +821,6 @@ abstract class ProductVersion implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -923,10 +902,10 @@ abstract class ProductVersion implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -962,7 +941,7 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProductVersion::setDeleted() @@ -1005,8 +984,8 @@ abstract class ProductVersion implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -1056,8 +1035,8 @@ abstract class ProductVersion implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1100,7 +1079,7 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1203,7 +1182,7 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1219,12 +1198,12 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1238,7 +1217,7 @@ abstract class ProductVersion implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1289,12 +1268,12 @@ abstract class ProductVersion implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1335,12 +1314,12 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1354,8 +1333,8 @@ abstract class ProductVersion implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1410,8 +1389,8 @@ abstract class ProductVersion implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1451,7 +1430,6 @@ abstract class ProductVersion implements ActiveRecordInterface if ($this->isColumnModified(ProductVersionTableMap::VERSION)) $criteria->add(ProductVersionTableMap::VERSION, $this->version); if ($this->isColumnModified(ProductVersionTableMap::VERSION_CREATED_AT)) $criteria->add(ProductVersionTableMap::VERSION_CREATED_AT, $this->version_created_at); if ($this->isColumnModified(ProductVersionTableMap::VERSION_CREATED_BY)) $criteria->add(ProductVersionTableMap::VERSION_CREATED_BY, $this->version_created_by); - return $criteria; } @@ -1489,7 +1467,7 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1504,7 +1482,6 @@ abstract class ProductVersion implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getVersion()); } @@ -1514,9 +1491,9 @@ abstract class ProductVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProductVersion (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProductVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1545,8 +1522,8 @@ abstract class ProductVersion implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProductVersion Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductVersion Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1562,8 +1539,8 @@ abstract class ProductVersion implements ActiveRecordInterface /** * Declares an association between this object and a ChildProduct object. * - * @param ChildProduct $v - * @return \Thelia\Model\ProductVersion The current object (for fluent API support) + * @param ChildProduct $v + * @return \Thelia\Model\ProductVersion The current object (for fluent API support) * @throws PropelException */ public function setProduct(ChildProduct $v = null) @@ -1582,16 +1559,14 @@ abstract class ProductVersion implements ActiveRecordInterface $v->addProductVersion($this); } - return $this; } - /** * Get the associated ChildProduct object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProduct The associated ChildProduct object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. * @throws PropelException */ public function getProduct(ConnectionInterface $con = null) @@ -1641,7 +1616,7 @@ abstract class ProductVersion implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ProductVersionQuery.php b/core/lib/Thelia/Model/Base/ProductVersionQuery.php index cf017b048..a7ee6d73e 100644 --- a/core/lib/Thelia/Model/Base/ProductVersionQuery.php +++ b/core/lib/Thelia/Model/Base/ProductVersionQuery.php @@ -87,9 +87,9 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProductVersionQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductVersion', $modelAlias = null) { @@ -99,8 +99,8 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Returns a new ChildProductVersionQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProductVersionQuery */ @@ -160,10 +160,10 @@ abstract class ProductVersionQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProductVersion A model object, or null if the key is not found + * @return ChildProductVersion A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -191,8 +191,8 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProductVersion|array|mixed the result, formatted by the current formatter */ @@ -212,8 +212,8 @@ abstract class ProductVersionQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -234,7 +234,7 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -249,7 +249,7 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -280,11 +280,11 @@ abstract class ProductVersionQuery extends ModelCriteria * * @see filterByProduct() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -321,11 +321,11 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByTaxRuleId(array('min' => 12)); // WHERE tax_rule_id > 12 * * - * @param mixed $taxRuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $taxRuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -361,9 +361,9 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%' * * - * @param string $ref The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $ref The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -391,11 +391,11 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByVisible(array('min' => 12)); // WHERE visible > 12 * * - * @param mixed $visible The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $visible The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -432,11 +432,11 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -473,11 +473,11 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByTemplateId(array('min' => 12)); // WHERE template_id > 12 * * - * @param mixed $templateId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $templateId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -514,13 +514,13 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -557,13 +557,13 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -600,11 +600,11 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 * * - * @param mixed $version The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -641,13 +641,13 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByVersionCreatedAt(array('max' => 'yesterday')); // WHERE version_created_at > '2011-03-13' * * - * @param mixed $versionCreatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $versionCreatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -683,9 +683,9 @@ abstract class ProductVersionQuery extends ModelCriteria * $query->filterByVersionCreatedBy('%fooValue%'); // WHERE version_created_by LIKE '%fooValue%' * * - * @param string $versionCreatedBy The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $versionCreatedBy The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -706,8 +706,8 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -731,8 +731,8 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -765,11 +765,11 @@ abstract class ProductVersionQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -781,7 +781,7 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProductVersion $productVersion Object to remove from the list of results + * @param ChildProductVersion $productVersion Object to remove from the list of results * * @return ChildProductVersionQuery The current query, for fluid interface */ @@ -799,8 +799,8 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Deletes all rows from the product_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -831,13 +831,13 @@ abstract class ProductVersionQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProductVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProductVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProductVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -857,7 +857,6 @@ abstract class ProductVersionQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProductVersionTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/Profile.php b/core/lib/Thelia/Model/Base/Profile.php index 55b8ac6eb..8e2f5ecaf 100644 --- a/core/lib/Thelia/Model/Base/Profile.php +++ b/core/lib/Thelia/Model/Base/Profile.php @@ -38,7 +38,6 @@ abstract class Profile implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProfileTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -379,9 +378,9 @@ abstract class Profile implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Profile The current object, for fluid interface */ @@ -431,22 +430,20 @@ abstract class Profile implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } @@ -454,8 +451,8 @@ abstract class Profile implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -474,8 +471,8 @@ abstract class Profile implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -493,8 +490,8 @@ abstract class Profile implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function setId($v) { @@ -507,15 +504,14 @@ abstract class Profile implements ActiveRecordInterface $this->modifiedColumns[ProfileTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function setCode($v) { @@ -528,16 +524,15 @@ abstract class Profile implements ActiveRecordInterface $this->modifiedColumns[ProfileTableMap::CODE] = true; } - return $this; } // setCode() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -549,16 +544,15 @@ abstract class Profile implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -570,7 +564,6 @@ abstract class Profile implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -665,10 +658,10 @@ abstract class Profile implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -712,7 +705,7 @@ abstract class Profile implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Profile::setDeleted() @@ -755,8 +748,8 @@ abstract class Profile implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -817,8 +810,8 @@ abstract class Profile implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -945,7 +938,7 @@ abstract class Profile implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1017,7 +1010,7 @@ abstract class Profile implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1033,12 +1026,12 @@ abstract class Profile implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1052,7 +1045,7 @@ abstract class Profile implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1082,12 +1075,12 @@ abstract class Profile implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1130,12 +1123,12 @@ abstract class Profile implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1149,8 +1142,8 @@ abstract class Profile implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1184,8 +1177,8 @@ abstract class Profile implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1211,7 +1204,6 @@ abstract class Profile implements ActiveRecordInterface if ($this->isColumnModified(ProfileTableMap::CODE)) $criteria->add(ProfileTableMap::CODE, $this->code); if ($this->isColumnModified(ProfileTableMap::CREATED_AT)) $criteria->add(ProfileTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProfileTableMap::UPDATED_AT)) $criteria->add(ProfileTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1233,7 +1225,7 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1243,7 +1235,7 @@ abstract class Profile implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1257,7 +1249,6 @@ abstract class Profile implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1267,9 +1258,9 @@ abstract class Profile implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Profile (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Profile (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1323,8 +1314,8 @@ abstract class Profile implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Profile Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Profile Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1343,7 +1334,7 @@ abstract class Profile implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1391,8 +1382,8 @@ abstract class Profile implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1414,8 +1405,8 @@ abstract class Profile implements ActiveRecordInterface * If this ChildProfile is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAdmin[] List of ChildAdmin objects * @throws PropelException */ @@ -1471,15 +1462,14 @@ abstract class Profile implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $admins A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProfile The current object (for fluent API support) + * @param Collection $admins A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProfile The current object (for fluent API support) */ public function setAdmins(Collection $admins, ConnectionInterface $con = null) { $adminsToDelete = $this->getAdmins(new Criteria(), $con)->diff($admins); - $this->adminsScheduledForDeletion = $adminsToDelete; foreach ($adminsToDelete as $adminRemoved) { @@ -1500,10 +1490,10 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the number of related Admin objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Admin objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Admin objects. * @throws PropelException */ public function countAdmins(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1535,8 +1525,8 @@ abstract class Profile implements ActiveRecordInterface * Method called to associate a ChildAdmin object to this object * through the ChildAdmin foreign key attribute. * - * @param ChildAdmin $l ChildAdmin - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param ChildAdmin $l ChildAdmin + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function addAdmin(ChildAdmin $l) { @@ -1562,7 +1552,7 @@ abstract class Profile implements ActiveRecordInterface } /** - * @param Admin $admin The admin object to remove. + * @param Admin $admin The admin object to remove. * @return ChildProfile The current object (for fluent API support) */ public function removeAdmin($admin) @@ -1609,8 +1599,8 @@ abstract class Profile implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1632,8 +1622,8 @@ abstract class Profile implements ActiveRecordInterface * If this ChildProfile is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProfileResource[] List of ChildProfileResource objects * @throws PropelException */ @@ -1689,15 +1679,14 @@ abstract class Profile implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profileResources A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProfile The current object (for fluent API support) + * @param Collection $profileResources A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProfile The current object (for fluent API support) */ public function setProfileResources(Collection $profileResources, ConnectionInterface $con = null) { $profileResourcesToDelete = $this->getProfileResources(new Criteria(), $con)->diff($profileResources); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1721,10 +1710,10 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the number of related ProfileResource objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProfileResource objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProfileResource objects. * @throws PropelException */ public function countProfileResources(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1756,8 +1745,8 @@ abstract class Profile implements ActiveRecordInterface * Method called to associate a ChildProfileResource object to this object * through the ChildProfileResource foreign key attribute. * - * @param ChildProfileResource $l ChildProfileResource - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param ChildProfileResource $l ChildProfileResource + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function addProfileResource(ChildProfileResource $l) { @@ -1784,7 +1773,7 @@ abstract class Profile implements ActiveRecordInterface /** * @param ProfileResource $profileResource The profileResource object to remove. - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function removeProfileResource($profileResource) { @@ -1801,7 +1790,6 @@ abstract class Profile implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1813,9 +1801,9 @@ abstract class Profile implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Profile. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProfileResource[] List of ChildProfileResource objects */ public function getProfileResourcesJoinResource($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1855,8 +1843,8 @@ abstract class Profile implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1878,8 +1866,8 @@ abstract class Profile implements ActiveRecordInterface * If this ChildProfile is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProfileModule[] List of ChildProfileModule objects * @throws PropelException */ @@ -1935,15 +1923,14 @@ abstract class Profile implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profileModules A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProfile The current object (for fluent API support) + * @param Collection $profileModules A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProfile The current object (for fluent API support) */ public function setProfileModules(Collection $profileModules, ConnectionInterface $con = null) { $profileModulesToDelete = $this->getProfileModules(new Criteria(), $con)->diff($profileModules); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1967,10 +1954,10 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the number of related ProfileModule objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProfileModule objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProfileModule objects. * @throws PropelException */ public function countProfileModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2002,8 +1989,8 @@ abstract class Profile implements ActiveRecordInterface * Method called to associate a ChildProfileModule object to this object * through the ChildProfileModule foreign key attribute. * - * @param ChildProfileModule $l ChildProfileModule - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param ChildProfileModule $l ChildProfileModule + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function addProfileModule(ChildProfileModule $l) { @@ -2030,7 +2017,7 @@ abstract class Profile implements ActiveRecordInterface /** * @param ProfileModule $profileModule The profileModule object to remove. - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function removeProfileModule($profileModule) { @@ -2047,7 +2034,6 @@ abstract class Profile implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2059,9 +2045,9 @@ abstract class Profile implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Profile. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProfileModule[] List of ChildProfileModule objects */ public function getProfileModulesJoinModule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2101,8 +2087,8 @@ abstract class Profile implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2124,8 +2110,8 @@ abstract class Profile implements ActiveRecordInterface * If this ChildProfile is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProfileI18n[] List of ChildProfileI18n objects * @throws PropelException */ @@ -2181,15 +2167,14 @@ abstract class Profile implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profileI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProfile The current object (for fluent API support) + * @param Collection $profileI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProfile The current object (for fluent API support) */ public function setProfileI18ns(Collection $profileI18ns, ConnectionInterface $con = null) { $profileI18nsToDelete = $this->getProfileI18ns(new Criteria(), $con)->diff($profileI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2213,10 +2198,10 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the number of related ProfileI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProfileI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProfileI18n objects. * @throws PropelException */ public function countProfileI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2248,8 +2233,8 @@ abstract class Profile implements ActiveRecordInterface * Method called to associate a ChildProfileI18n object to this object * through the ChildProfileI18n foreign key attribute. * - * @param ChildProfileI18n $l ChildProfileI18n - * @return \Thelia\Model\Profile The current object (for fluent API support) + * @param ChildProfileI18n $l ChildProfileI18n + * @return \Thelia\Model\Profile The current object (for fluent API support) */ public function addProfileI18n(ChildProfileI18n $l) { @@ -2279,7 +2264,7 @@ abstract class Profile implements ActiveRecordInterface } /** - * @param ProfileI18n $profileI18n The profileI18n object to remove. + * @param ProfileI18n $profileI18n The profileI18n object to remove. * @return ChildProfile The current object (for fluent API support) */ public function removeProfileI18n($profileI18n) @@ -2337,8 +2322,8 @@ abstract class Profile implements ActiveRecordInterface * If this ChildProfile is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildResource[] List of ChildResource objects */ @@ -2368,9 +2353,9 @@ abstract class Profile implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $resources A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProfile The current object (for fluent API support) + * @param Collection $resources A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProfile The current object (for fluent API support) */ public function setResources(Collection $resources, ConnectionInterface $con = null) { @@ -2394,9 +2379,9 @@ abstract class Profile implements ActiveRecordInterface * Gets the number of ChildResource objects related by a many-to-many relationship * to the current object by way of the profile_resource cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildResource objects */ @@ -2425,7 +2410,7 @@ abstract class Profile implements ActiveRecordInterface * through the profile_resource cross reference table. * * @param ChildResource $resource The ChildProfileResource object to relate - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function addResource(ChildResource $resource) { @@ -2442,7 +2427,7 @@ abstract class Profile implements ActiveRecordInterface } /** - * @param Resource $resource The resource object to add. + * @param Resource $resource The resource object to add. */ protected function doAddResource($resource) { @@ -2461,8 +2446,8 @@ abstract class Profile implements ActiveRecordInterface * Remove a ChildResource object to this object * through the profile_resource cross reference table. * - * @param ChildResource $resource The ChildProfileResource object to relate - * @return ChildProfile The current object (for fluent API support) + * @param ChildResource $resource The ChildProfileResource object to relate + * @return ChildProfile The current object (for fluent API support) */ public function removeResource(ChildResource $resource) { @@ -2503,7 +2488,7 @@ abstract class Profile implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2561,7 +2546,7 @@ abstract class Profile implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2575,9 +2560,9 @@ abstract class Profile implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2589,7 +2574,7 @@ abstract class Profile implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2599,8 +2584,8 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildProfileI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2633,10 +2618,10 @@ abstract class Profile implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildProfile The current object (for fluent API support) + * @return ChildProfile The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2661,7 +2646,7 @@ abstract class Profile implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildProfileI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2669,7 +2654,6 @@ abstract class Profile implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2680,7 +2664,6 @@ abstract class Profile implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2693,7 +2676,6 @@ abstract class Profile implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2704,7 +2686,6 @@ abstract class Profile implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2717,7 +2698,6 @@ abstract class Profile implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2728,7 +2708,6 @@ abstract class Profile implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2741,7 +2720,6 @@ abstract class Profile implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2752,7 +2730,6 @@ abstract class Profile implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2841,7 +2818,6 @@ abstract class Profile implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProfileI18n.php b/core/lib/Thelia/Model/Base/ProfileI18n.php index f68618a1d..48c19f2a3 100644 --- a/core/lib/Thelia/Model/Base/ProfileI18n.php +++ b/core/lib/Thelia/Model/Base/ProfileI18n.php @@ -26,7 +26,6 @@ abstract class ProfileI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProfileI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ProfileI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProfileI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->aProfile = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->modifiedColumns[ProfileI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->modifiedColumns[ProfileI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->modifiedColumns[ProfileI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->modifiedColumns[ProfileI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ProfileI18n implements ActiveRecordInterface $this->modifiedColumns[ProfileI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ProfileI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ProfileI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProfileI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ProfileI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ProfileI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ProfileI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ProfileI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ProfileI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ProfileI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ProfileI18n implements ActiveRecordInterface if ($this->isColumnModified(ProfileI18nTableMap::DESCRIPTION)) $criteria->add(ProfileI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ProfileI18nTableMap::CHAPO)) $criteria->add(ProfileI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ProfileI18nTableMap::POSTSCRIPTUM)) $criteria->add(ProfileI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ProfileI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ProfileI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProfileI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProfileI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ProfileI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProfileI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProfileI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ProfileI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildProfile object. * - * @param ChildProfile $v - * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) + * @param ChildProfile $v + * @return \Thelia\Model\ProfileI18n The current object (for fluent API support) * @throws PropelException */ public function setProfile(ChildProfile $v = null) @@ -1247,16 +1231,14 @@ abstract class ProfileI18n implements ActiveRecordInterface $v->addProfileI18n($this); } - return $this; } - /** * Get the associated ChildProfile object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProfile The associated ChildProfile object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProfile The associated ChildProfile object. * @throws PropelException */ public function getProfile(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ProfileI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ProfileI18nQuery.php b/core/lib/Thelia/Model/Base/ProfileI18nQuery.php index 79a5510df..1eba19874 100644 --- a/core/lib/Thelia/Model/Base/ProfileI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ProfileI18nQuery.php @@ -67,9 +67,9 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProfileI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProfileI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Returns a new ChildProfileI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProfileI18nQuery */ @@ -140,10 +140,10 @@ abstract class ProfileI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProfileI18n A model object, or null if the key is not found + * @return ChildProfileI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProfileI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProfileI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProfileI18nQuery extends ModelCriteria * * @see filterByProfile() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ProfileI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ProfileI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ProfileI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ProfileI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ProfileI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Profile object * - * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Profile relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ProfileI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query */ public function useProfileQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProfileI18n $profileI18n Object to remove from the list of results + * @param ChildProfileI18n $profileI18n Object to remove from the list of results * * @return ChildProfileI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Deletes all rows from the profile_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ProfileI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProfileI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProfileI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProfileI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ProfileI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProfileI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ProfileModule.php b/core/lib/Thelia/Model/Base/ProfileModule.php index ef7394f11..e513b30d0 100644 --- a/core/lib/Thelia/Model/Base/ProfileModule.php +++ b/core/lib/Thelia/Model/Base/ProfileModule.php @@ -31,7 +31,6 @@ abstract class ProfileModule implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProfileModuleTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -329,9 +328,9 @@ abstract class ProfileModule implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProfileModule The current object, for fluid interface */ @@ -381,33 +380,30 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Get the [profile_id] column value. * - * @return int + * @return int */ public function getProfileId() { - return $this->profile_id; } /** * Get the [module_id] column value. * - * @return int + * @return int */ public function getModuleId() { - return $this->module_id; } /** * Get the [access] column value. * - * @return int + * @return int */ public function getAccess() { - return $this->access; } @@ -415,8 +411,8 @@ abstract class ProfileModule implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -435,8 +431,8 @@ abstract class ProfileModule implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -454,8 +450,8 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Set the value of [profile_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) */ public function setProfileId($v) { @@ -472,15 +468,14 @@ abstract class ProfileModule implements ActiveRecordInterface $this->aProfile = null; } - return $this; } // setProfileId() /** * Set the value of [module_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) */ public function setModuleId($v) { @@ -497,15 +492,14 @@ abstract class ProfileModule implements ActiveRecordInterface $this->aModule = null; } - return $this; } // setModuleId() /** * Set the value of [access] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) */ public function setAccess($v) { @@ -518,16 +512,15 @@ abstract class ProfileModule implements ActiveRecordInterface $this->modifiedColumns[ProfileModuleTableMap::ACCESS] = true; } - return $this; } // setAccess() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -539,16 +532,15 @@ abstract class ProfileModule implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -560,7 +552,6 @@ abstract class ProfileModule implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -604,7 +595,6 @@ abstract class ProfileModule implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileModuleTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)]; $this->profile_id = (null !== $col) ? (int) $col : null; @@ -668,10 +658,10 @@ abstract class ProfileModule implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -708,7 +698,7 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProfileModule::setDeleted() @@ -751,8 +741,8 @@ abstract class ProfileModule implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -813,8 +803,8 @@ abstract class ProfileModule implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -864,7 +854,7 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -931,7 +921,7 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -947,12 +937,12 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -966,7 +956,7 @@ abstract class ProfileModule implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -999,12 +989,12 @@ abstract class ProfileModule implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1042,12 +1032,12 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1061,8 +1051,8 @@ abstract class ProfileModule implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1099,8 +1089,8 @@ abstract class ProfileModule implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1128,7 +1118,6 @@ abstract class ProfileModule implements ActiveRecordInterface if ($this->isColumnModified(ProfileModuleTableMap::ACCESS)) $criteria->add(ProfileModuleTableMap::ACCESS, $this->access); if ($this->isColumnModified(ProfileModuleTableMap::CREATED_AT)) $criteria->add(ProfileModuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProfileModuleTableMap::UPDATED_AT)) $criteria->add(ProfileModuleTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1166,7 +1155,7 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1181,7 +1170,6 @@ abstract class ProfileModule implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getProfileId()) && (null === $this->getModuleId()); } @@ -1191,9 +1179,9 @@ abstract class ProfileModule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProfileModule (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProfileModule (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1216,8 +1204,8 @@ abstract class ProfileModule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProfileModule Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProfileModule Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1233,8 +1221,8 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Declares an association between this object and a ChildProfile object. * - * @param ChildProfile $v - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param ChildProfile $v + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) * @throws PropelException */ public function setProfile(ChildProfile $v = null) @@ -1253,16 +1241,14 @@ abstract class ProfileModule implements ActiveRecordInterface $v->addProfileModule($this); } - return $this; } - /** * Get the associated ChildProfile object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProfile The associated ChildProfile object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProfile The associated ChildProfile object. * @throws PropelException */ public function getProfile(ConnectionInterface $con = null) @@ -1284,8 +1270,8 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Declares an association between this object and a ChildModule object. * - * @param ChildModule $v - * @return \Thelia\Model\ProfileModule The current object (for fluent API support) + * @param ChildModule $v + * @return \Thelia\Model\ProfileModule The current object (for fluent API support) * @throws PropelException */ public function setModule(ChildModule $v = null) @@ -1304,16 +1290,14 @@ abstract class ProfileModule implements ActiveRecordInterface $v->addProfileModule($this); } - return $this; } - /** * Get the associated ChildModule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildModule The associated ChildModule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildModule The associated ChildModule object. * @throws PropelException */ public function getModule(ConnectionInterface $con = null) @@ -1357,7 +1341,7 @@ abstract class ProfileModule implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1383,7 +1367,7 @@ abstract class ProfileModule implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProfileModule The current object (for fluent API support) + * @return ChildProfileModule The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1468,7 +1452,6 @@ abstract class ProfileModule implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProfileModuleQuery.php b/core/lib/Thelia/Model/Base/ProfileModuleQuery.php index 4f49ccb2f..716f28802 100644 --- a/core/lib/Thelia/Model/Base/ProfileModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ProfileModuleQuery.php @@ -67,9 +67,9 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProfileModuleQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProfileModule', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Returns a new ChildProfileModuleQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProfileModuleQuery */ @@ -140,10 +140,10 @@ abstract class ProfileModuleQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProfileModule A model object, or null if the key is not found + * @return ChildProfileModule A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProfileModule|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProfileModuleQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProfileModuleQuery extends ModelCriteria * * @see filterByProfile() * - * @param mixed $profileId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $profileId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -303,11 +303,11 @@ abstract class ProfileModuleQuery extends ModelCriteria * * @see filterByModule() * - * @param mixed $moduleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $moduleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -344,11 +344,11 @@ abstract class ProfileModuleQuery extends ModelCriteria * $query->filterByAccess(array('min' => 12)); // WHERE access > 12 * * - * @param mixed $access The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $access The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -385,13 +385,13 @@ abstract class ProfileModuleQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -428,13 +428,13 @@ abstract class ProfileModuleQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Profile object * - * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -489,8 +489,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Profile relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -523,11 +523,11 @@ abstract class ProfileModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query */ public function useProfileQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -539,8 +539,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Module object * - * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -564,8 +564,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Module relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -598,11 +598,11 @@ abstract class ProfileModuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query */ public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -614,7 +614,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProfileModule $profileModule Object to remove from the list of results + * @param ChildProfileModule $profileModule Object to remove from the list of results * * @return ChildProfileModuleQuery The current query, for fluid interface */ @@ -632,8 +632,8 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Deletes all rows from the profile_module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -664,13 +664,13 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProfileModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProfileModule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProfileModule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -690,7 +690,6 @@ abstract class ProfileModuleQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProfileModuleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -709,9 +708,9 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -721,9 +720,9 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -733,7 +732,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -743,7 +742,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -753,7 +752,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -763,7 +762,7 @@ abstract class ProfileModuleQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProfileModuleQuery The current query, for fluid interface + * @return ChildProfileModuleQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/ProfileQuery.php b/core/lib/Thelia/Model/Base/ProfileQuery.php index ad778a354..4b1d939ff 100644 --- a/core/lib/Thelia/Model/Base/ProfileQuery.php +++ b/core/lib/Thelia/Model/Base/ProfileQuery.php @@ -72,9 +72,9 @@ abstract class ProfileQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProfileQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Profile', $modelAlias = null) { @@ -84,8 +84,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Returns a new ChildProfileQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProfileQuery */ @@ -114,7 +114,7 @@ abstract class ProfileQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildProfile|array|mixed the result, formatted by the current formatter @@ -145,10 +145,10 @@ abstract class ProfileQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProfile A model object, or null if the key is not found + * @return ChildProfile A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -175,8 +175,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProfile|array|mixed the result, formatted by the current formatter */ @@ -196,8 +196,8 @@ abstract class ProfileQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -218,26 +218,24 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProfileQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ProfileTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProfileQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ProfileTableMap::ID, $keys, Criteria::IN); } @@ -251,11 +249,11 @@ abstract class ProfileQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -291,9 +289,9 @@ abstract class ProfileQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -321,13 +319,13 @@ abstract class ProfileQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -364,13 +362,13 @@ abstract class ProfileQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -400,8 +398,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Admin object * - * @param \Thelia\Model\Admin|ObjectCollection $admin the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Admin|ObjectCollection $admin the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -423,8 +421,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Admin relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileQuery The current query, for fluid interface */ @@ -457,11 +455,11 @@ abstract class ProfileQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AdminQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AdminQuery A secondary query class using the current class as primary query */ public function useAdminQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -473,8 +471,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProfileResource object * - * @param \Thelia\Model\ProfileResource|ObjectCollection $profileResource the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProfileResource|ObjectCollection $profileResource the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -496,8 +494,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProfileResource relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileQuery The current query, for fluid interface */ @@ -530,11 +528,11 @@ abstract class ProfileQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileResourceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileResourceQuery A secondary query class using the current class as primary query */ public function useProfileResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -546,8 +544,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProfileModule object * - * @param \Thelia\Model\ProfileModule|ObjectCollection $profileModule the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProfileModule|ObjectCollection $profileModule the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -569,8 +567,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProfileModule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileQuery The current query, for fluid interface */ @@ -603,11 +601,11 @@ abstract class ProfileQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query */ public function useProfileModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -619,8 +617,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProfileI18n object * - * @param \Thelia\Model\ProfileI18n|ObjectCollection $profileI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProfileI18n|ObjectCollection $profileI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -642,8 +640,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProfileI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileQuery The current query, for fluid interface */ @@ -676,11 +674,11 @@ abstract class ProfileQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileI18nQuery A secondary query class using the current class as primary query */ public function useProfileI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -693,8 +691,8 @@ abstract class ProfileQuery extends ModelCriteria * Filter the query by a related Resource object * using the profile_resource table as cross reference * - * @param Resource $resource the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Resource $resource the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileQuery The current query, for fluid interface */ @@ -709,7 +707,7 @@ abstract class ProfileQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProfile $profile Object to remove from the list of results + * @param ChildProfile $profile Object to remove from the list of results * * @return ChildProfileQuery The current query, for fluid interface */ @@ -725,8 +723,8 @@ abstract class ProfileQuery extends ModelCriteria /** * Deletes all rows from the profile table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -757,13 +755,13 @@ abstract class ProfileQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProfile or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProfile object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProfile object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -783,7 +781,6 @@ abstract class ProfileQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProfileTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -802,9 +799,9 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -814,9 +811,9 @@ abstract class ProfileQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -826,7 +823,7 @@ abstract class ProfileQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -836,7 +833,7 @@ abstract class ProfileQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -846,7 +843,7 @@ abstract class ProfileQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -856,7 +853,7 @@ abstract class ProfileQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -868,11 +865,11 @@ abstract class ProfileQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -887,10 +884,10 @@ abstract class ProfileQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProfileQuery The current query, for fluid interface + * @return ChildProfileQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -907,11 +904,11 @@ abstract class ProfileQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildProfileI18nQuery A secondary query class using the current class as primary query + * @return ChildProfileI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/ProfileResource.php b/core/lib/Thelia/Model/Base/ProfileResource.php index eac774015..9a57fc085 100644 --- a/core/lib/Thelia/Model/Base/ProfileResource.php +++ b/core/lib/Thelia/Model/Base/ProfileResource.php @@ -31,7 +31,6 @@ abstract class ProfileResource implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ProfileResourceTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -329,9 +328,9 @@ abstract class ProfileResource implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ProfileResource The current object, for fluid interface */ @@ -381,33 +380,30 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Get the [profile_id] column value. * - * @return int + * @return int */ public function getProfileId() { - return $this->profile_id; } /** * Get the [resource_id] column value. * - * @return int + * @return int */ public function getResourceId() { - return $this->resource_id; } /** * Get the [access] column value. * - * @return int + * @return int */ public function getAccess() { - return $this->access; } @@ -415,8 +411,8 @@ abstract class ProfileResource implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -435,8 +431,8 @@ abstract class ProfileResource implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -454,8 +450,8 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Set the value of [profile_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) */ public function setProfileId($v) { @@ -472,15 +468,14 @@ abstract class ProfileResource implements ActiveRecordInterface $this->aProfile = null; } - return $this; } // setProfileId() /** * Set the value of [resource_id] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) */ public function setResourceId($v) { @@ -497,15 +492,14 @@ abstract class ProfileResource implements ActiveRecordInterface $this->aResource = null; } - return $this; } // setResourceId() /** * Set the value of [access] column. * - * @param int $v new value - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) */ public function setAccess($v) { @@ -518,16 +512,15 @@ abstract class ProfileResource implements ActiveRecordInterface $this->modifiedColumns[ProfileResourceTableMap::ACCESS] = true; } - return $this; } // setAccess() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -539,16 +532,15 @@ abstract class ProfileResource implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -560,7 +552,6 @@ abstract class ProfileResource implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -604,7 +595,6 @@ abstract class ProfileResource implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileResourceTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)]; $this->profile_id = (null !== $col) ? (int) $col : null; @@ -668,10 +658,10 @@ abstract class ProfileResource implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -708,7 +698,7 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ProfileResource::setDeleted() @@ -751,8 +741,8 @@ abstract class ProfileResource implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -813,8 +803,8 @@ abstract class ProfileResource implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -864,7 +854,7 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -931,7 +921,7 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -947,12 +937,12 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -966,7 +956,7 @@ abstract class ProfileResource implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -999,12 +989,12 @@ abstract class ProfileResource implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1042,12 +1032,12 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1061,8 +1051,8 @@ abstract class ProfileResource implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1099,8 +1089,8 @@ abstract class ProfileResource implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1128,7 +1118,6 @@ abstract class ProfileResource implements ActiveRecordInterface if ($this->isColumnModified(ProfileResourceTableMap::ACCESS)) $criteria->add(ProfileResourceTableMap::ACCESS, $this->access); if ($this->isColumnModified(ProfileResourceTableMap::CREATED_AT)) $criteria->add(ProfileResourceTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ProfileResourceTableMap::UPDATED_AT)) $criteria->add(ProfileResourceTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1166,7 +1155,7 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1181,7 +1170,6 @@ abstract class ProfileResource implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getProfileId()) && (null === $this->getResourceId()); } @@ -1191,9 +1179,9 @@ abstract class ProfileResource implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ProfileResource (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ProfileResource (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1216,8 +1204,8 @@ abstract class ProfileResource implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ProfileResource Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProfileResource Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1233,8 +1221,8 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Declares an association between this object and a ChildProfile object. * - * @param ChildProfile $v - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param ChildProfile $v + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) * @throws PropelException */ public function setProfile(ChildProfile $v = null) @@ -1253,16 +1241,14 @@ abstract class ProfileResource implements ActiveRecordInterface $v->addProfileResource($this); } - return $this; } - /** * Get the associated ChildProfile object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildProfile The associated ChildProfile object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProfile The associated ChildProfile object. * @throws PropelException */ public function getProfile(ConnectionInterface $con = null) @@ -1284,8 +1270,8 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Declares an association between this object and a ChildResource object. * - * @param ChildResource $v - * @return \Thelia\Model\ProfileResource The current object (for fluent API support) + * @param ChildResource $v + * @return \Thelia\Model\ProfileResource The current object (for fluent API support) * @throws PropelException */ public function setResource(ChildResource $v = null) @@ -1304,16 +1290,14 @@ abstract class ProfileResource implements ActiveRecordInterface $v->addProfileResource($this); } - return $this; } - /** * Get the associated ChildResource object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildResource The associated ChildResource object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildResource The associated ChildResource object. * @throws PropelException */ public function getResource(ConnectionInterface $con = null) @@ -1357,7 +1341,7 @@ abstract class ProfileResource implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1383,7 +1367,7 @@ abstract class ProfileResource implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildProfileResource The current object (for fluent API support) + * @return ChildProfileResource The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1468,7 +1452,6 @@ abstract class ProfileResource implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ProfileResourceQuery.php b/core/lib/Thelia/Model/Base/ProfileResourceQuery.php index e836ec5e0..41cb08da2 100644 --- a/core/lib/Thelia/Model/Base/ProfileResourceQuery.php +++ b/core/lib/Thelia/Model/Base/ProfileResourceQuery.php @@ -67,9 +67,9 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ProfileResourceQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProfileResource', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Returns a new ChildProfileResourceQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildProfileResourceQuery */ @@ -140,10 +140,10 @@ abstract class ProfileResourceQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildProfileResource A model object, or null if the key is not found + * @return ChildProfileResource A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildProfileResource|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ProfileResourceQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ProfileResourceQuery extends ModelCriteria * * @see filterByProfile() * - * @param mixed $profileId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $profileId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -303,11 +303,11 @@ abstract class ProfileResourceQuery extends ModelCriteria * * @see filterByResource() * - * @param mixed $resourceId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $resourceId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -344,11 +344,11 @@ abstract class ProfileResourceQuery extends ModelCriteria * $query->filterByAccess(array('min' => 12)); // WHERE access > 12 * * - * @param mixed $access The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $access The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -385,13 +385,13 @@ abstract class ProfileResourceQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -428,13 +428,13 @@ abstract class ProfileResourceQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Profile object * - * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -489,8 +489,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Profile relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -523,11 +523,11 @@ abstract class ProfileResourceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query */ public function useProfileQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -539,8 +539,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Resource object * - * @param \Thelia\Model\Resource|ObjectCollection $resource The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Resource|ObjectCollection $resource The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -564,8 +564,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Resource relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -598,11 +598,11 @@ abstract class ProfileResourceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ResourceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ResourceQuery A secondary query class using the current class as primary query */ public function useResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -614,7 +614,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildProfileResource $profileResource Object to remove from the list of results + * @param ChildProfileResource $profileResource Object to remove from the list of results * * @return ChildProfileResourceQuery The current query, for fluid interface */ @@ -632,8 +632,8 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Deletes all rows from the profile_resource table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -664,13 +664,13 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildProfileResource or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildProfileResource object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildProfileResource object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -690,7 +690,6 @@ abstract class ProfileResourceQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ProfileResourceTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -709,9 +708,9 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -721,9 +720,9 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -733,7 +732,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -743,7 +742,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -753,7 +752,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -763,7 +762,7 @@ abstract class ProfileResourceQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildProfileResourceQuery The current query, for fluid interface + * @return ChildProfileResourceQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php index 2744edb78..15b477d7e 100644 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -34,7 +34,6 @@ abstract class Resource implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ResourceTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -351,9 +350,9 @@ abstract class Resource implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Resource The current object, for fluid interface */ @@ -403,22 +402,20 @@ abstract class Resource implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [code] column value. * - * @return string + * @return string */ public function getCode() { - return $this->code; } @@ -426,8 +423,8 @@ abstract class Resource implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -446,8 +443,8 @@ abstract class Resource implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -465,8 +462,8 @@ abstract class Resource implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function setId($v) { @@ -479,15 +476,14 @@ abstract class Resource implements ActiveRecordInterface $this->modifiedColumns[ResourceTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [code] column. * - * @param string $v new value - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function setCode($v) { @@ -500,16 +496,15 @@ abstract class Resource implements ActiveRecordInterface $this->modifiedColumns[ResourceTableMap::CODE] = true; } - return $this; } // setCode() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -521,16 +516,15 @@ abstract class Resource implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -542,7 +536,6 @@ abstract class Resource implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -637,10 +630,10 @@ abstract class Resource implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -680,7 +673,7 @@ abstract class Resource implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Resource::setDeleted() @@ -723,8 +716,8 @@ abstract class Resource implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -785,8 +778,8 @@ abstract class Resource implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -878,7 +871,7 @@ abstract class Resource implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -950,7 +943,7 @@ abstract class Resource implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -966,12 +959,12 @@ abstract class Resource implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -985,7 +978,7 @@ abstract class Resource implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1015,12 +1008,12 @@ abstract class Resource implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1057,12 +1050,12 @@ abstract class Resource implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1076,8 +1069,8 @@ abstract class Resource implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1111,8 +1104,8 @@ abstract class Resource implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1138,7 +1131,6 @@ abstract class Resource implements ActiveRecordInterface if ($this->isColumnModified(ResourceTableMap::CODE)) $criteria->add(ResourceTableMap::CODE, $this->code); if ($this->isColumnModified(ResourceTableMap::CREATED_AT)) $criteria->add(ResourceTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ResourceTableMap::UPDATED_AT)) $criteria->add(ResourceTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1160,7 +1152,7 @@ abstract class Resource implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1170,7 +1162,7 @@ abstract class Resource implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1184,7 +1176,6 @@ abstract class Resource implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1194,9 +1185,9 @@ abstract class Resource implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Resource (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Resource (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1238,8 +1229,8 @@ abstract class Resource implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Resource Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Resource Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1258,7 +1249,7 @@ abstract class Resource implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1300,8 +1291,8 @@ abstract class Resource implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1323,8 +1314,8 @@ abstract class Resource implements ActiveRecordInterface * If this ChildResource is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProfileResource[] List of ChildProfileResource objects * @throws PropelException */ @@ -1380,15 +1371,14 @@ abstract class Resource implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profileResources A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildResource The current object (for fluent API support) + * @param Collection $profileResources A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildResource The current object (for fluent API support) */ public function setProfileResources(Collection $profileResources, ConnectionInterface $con = null) { $profileResourcesToDelete = $this->getProfileResources(new Criteria(), $con)->diff($profileResources); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1412,10 +1402,10 @@ abstract class Resource implements ActiveRecordInterface /** * Returns the number of related ProfileResource objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ProfileResource objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProfileResource objects. * @throws PropelException */ public function countProfileResources(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1447,8 +1437,8 @@ abstract class Resource implements ActiveRecordInterface * Method called to associate a ChildProfileResource object to this object * through the ChildProfileResource foreign key attribute. * - * @param ChildProfileResource $l ChildProfileResource - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param ChildProfileResource $l ChildProfileResource + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function addProfileResource(ChildProfileResource $l) { @@ -1475,7 +1465,7 @@ abstract class Resource implements ActiveRecordInterface /** * @param ProfileResource $profileResource The profileResource object to remove. - * @return ChildResource The current object (for fluent API support) + * @return ChildResource The current object (for fluent API support) */ public function removeProfileResource($profileResource) { @@ -1492,7 +1482,6 @@ abstract class Resource implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1504,9 +1493,9 @@ abstract class Resource implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Resource. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProfileResource[] List of ChildProfileResource objects */ public function getProfileResourcesJoinProfile($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1546,8 +1535,8 @@ abstract class Resource implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1569,8 +1558,8 @@ abstract class Resource implements ActiveRecordInterface * If this ChildResource is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildResourceI18n[] List of ChildResourceI18n objects * @throws PropelException */ @@ -1626,15 +1615,14 @@ abstract class Resource implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $resourceI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildResource The current object (for fluent API support) + * @param Collection $resourceI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildResource The current object (for fluent API support) */ public function setResourceI18ns(Collection $resourceI18ns, ConnectionInterface $con = null) { $resourceI18nsToDelete = $this->getResourceI18ns(new Criteria(), $con)->diff($resourceI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1658,10 +1646,10 @@ abstract class Resource implements ActiveRecordInterface /** * Returns the number of related ResourceI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ResourceI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ResourceI18n objects. * @throws PropelException */ public function countResourceI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1693,8 +1681,8 @@ abstract class Resource implements ActiveRecordInterface * Method called to associate a ChildResourceI18n object to this object * through the ChildResourceI18n foreign key attribute. * - * @param ChildResourceI18n $l ChildResourceI18n - * @return \Thelia\Model\Resource The current object (for fluent API support) + * @param ChildResourceI18n $l ChildResourceI18n + * @return \Thelia\Model\Resource The current object (for fluent API support) */ public function addResourceI18n(ChildResourceI18n $l) { @@ -1724,7 +1712,7 @@ abstract class Resource implements ActiveRecordInterface } /** - * @param ResourceI18n $resourceI18n The resourceI18n object to remove. + * @param ResourceI18n $resourceI18n The resourceI18n object to remove. * @return ChildResource The current object (for fluent API support) */ public function removeResourceI18n($resourceI18n) @@ -1782,8 +1770,8 @@ abstract class Resource implements ActiveRecordInterface * If this ChildResource is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildProfile[] List of ChildProfile objects */ @@ -1813,9 +1801,9 @@ abstract class Resource implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $profiles A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildResource The current object (for fluent API support) + * @param Collection $profiles A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildResource The current object (for fluent API support) */ public function setProfiles(Collection $profiles, ConnectionInterface $con = null) { @@ -1839,9 +1827,9 @@ abstract class Resource implements ActiveRecordInterface * Gets the number of ChildProfile objects related by a many-to-many relationship * to the current object by way of the profile_resource cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildProfile objects */ @@ -1869,7 +1857,7 @@ abstract class Resource implements ActiveRecordInterface * Associate a ChildProfile object to this object * through the profile_resource cross reference table. * - * @param ChildProfile $profile The ChildProfileResource object to relate + * @param ChildProfile $profile The ChildProfileResource object to relate * @return ChildResource The current object (for fluent API support) */ public function addProfile(ChildProfile $profile) @@ -1887,7 +1875,7 @@ abstract class Resource implements ActiveRecordInterface } /** - * @param Profile $profile The profile object to add. + * @param Profile $profile The profile object to add. */ protected function doAddProfile($profile) { @@ -1906,7 +1894,7 @@ abstract class Resource implements ActiveRecordInterface * Remove a ChildProfile object to this object * through the profile_resource cross reference table. * - * @param ChildProfile $profile The ChildProfileResource object to relate + * @param ChildProfile $profile The ChildProfileResource object to relate * @return ChildResource The current object (for fluent API support) */ public function removeProfile(ChildProfile $profile) @@ -1948,7 +1936,7 @@ abstract class Resource implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1994,7 +1982,7 @@ abstract class Resource implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildResource The current object (for fluent API support) + * @return ChildResource The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2008,9 +1996,9 @@ abstract class Resource implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildResource The current object (for fluent API support) + * @return ChildResource The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2022,7 +2010,7 @@ abstract class Resource implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2032,8 +2020,8 @@ abstract class Resource implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildResourceI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2066,10 +2054,10 @@ abstract class Resource implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildResource The current object (for fluent API support) + * @return ChildResource The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2094,7 +2082,7 @@ abstract class Resource implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildResourceI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2102,7 +2090,6 @@ abstract class Resource implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2113,7 +2100,6 @@ abstract class Resource implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2126,7 +2112,6 @@ abstract class Resource implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2137,7 +2122,6 @@ abstract class Resource implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2150,7 +2134,6 @@ abstract class Resource implements ActiveRecordInterface return $this; } - /** * Get the [chapo] column value. * @@ -2161,7 +2144,6 @@ abstract class Resource implements ActiveRecordInterface return $this->getCurrentTranslation()->getChapo(); } - /** * Set the value of [chapo] column. * @@ -2174,7 +2156,6 @@ abstract class Resource implements ActiveRecordInterface return $this; } - /** * Get the [postscriptum] column value. * @@ -2185,7 +2166,6 @@ abstract class Resource implements ActiveRecordInterface return $this->getCurrentTranslation()->getPostscriptum(); } - /** * Set the value of [postscriptum] column. * @@ -2274,7 +2254,6 @@ abstract class Resource implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php index 7a52829a8..9a099b5e3 100644 --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -26,7 +26,6 @@ abstract class ResourceI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\ResourceI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -325,9 +324,9 @@ abstract class ResourceI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return ResourceI18n The current object, for fluid interface */ @@ -377,74 +376,68 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Get the [chapo] column value. * - * @return string + * @return string */ public function getChapo() { - return $this->chapo; } /** * Get the [postscriptum] column value. * - * @return string + * @return string */ public function getPostscriptum() { - return $this->postscriptum; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setId($v) { @@ -461,15 +454,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->aResource = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -482,15 +474,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->modifiedColumns[ResourceI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -503,15 +494,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->modifiedColumns[ResourceI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -524,15 +514,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->modifiedColumns[ResourceI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() /** * Set the value of [chapo] column. * - * @param string $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setChapo($v) { @@ -545,15 +534,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->modifiedColumns[ResourceI18nTableMap::CHAPO] = true; } - return $this; } // setChapo() /** * Set the value of [postscriptum] column. * - * @param string $v new value - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) */ public function setPostscriptum($v) { @@ -566,7 +554,6 @@ abstract class ResourceI18n implements ActiveRecordInterface $this->modifiedColumns[ResourceI18nTableMap::POSTSCRIPTUM] = true; } - return $this; } // setPostscriptum() @@ -610,7 +597,6 @@ abstract class ResourceI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ResourceI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -668,10 +654,10 @@ abstract class ResourceI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +693,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see ResourceI18n::setDeleted() @@ -750,8 +736,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -801,8 +787,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -845,7 +831,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -918,7 +904,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -934,12 +920,12 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -953,7 +939,7 @@ abstract class ResourceI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -989,12 +975,12 @@ abstract class ResourceI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1030,12 +1016,12 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1049,8 +1035,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1090,8 +1076,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1121,7 +1107,6 @@ abstract class ResourceI18n implements ActiveRecordInterface if ($this->isColumnModified(ResourceI18nTableMap::DESCRIPTION)) $criteria->add(ResourceI18nTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(ResourceI18nTableMap::CHAPO)) $criteria->add(ResourceI18nTableMap::CHAPO, $this->chapo); if ($this->isColumnModified(ResourceI18nTableMap::POSTSCRIPTUM)) $criteria->add(ResourceI18nTableMap::POSTSCRIPTUM, $this->postscriptum); - return $criteria; } @@ -1159,7 +1144,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1174,7 +1159,6 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1184,9 +1168,9 @@ abstract class ResourceI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\ResourceI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\ResourceI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1210,8 +1194,8 @@ abstract class ResourceI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\ResourceI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ResourceI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1227,8 +1211,8 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildResource object. * - * @param ChildResource $v - * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) + * @param ChildResource $v + * @return \Thelia\Model\ResourceI18n The current object (for fluent API support) * @throws PropelException */ public function setResource(ChildResource $v = null) @@ -1247,16 +1231,14 @@ abstract class ResourceI18n implements ActiveRecordInterface $v->addResourceI18n($this); } - return $this; } - /** * Get the associated ChildResource object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildResource The associated ChildResource object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildResource The associated ChildResource object. * @throws PropelException */ public function getResource(ConnectionInterface $con = null) @@ -1301,7 +1283,7 @@ abstract class ResourceI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/ResourceI18nQuery.php b/core/lib/Thelia/Model/Base/ResourceI18nQuery.php index 839d212dc..210f2e092 100644 --- a/core/lib/Thelia/Model/Base/ResourceI18nQuery.php +++ b/core/lib/Thelia/Model/Base/ResourceI18nQuery.php @@ -67,9 +67,9 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ResourceI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ResourceI18n', $modelAlias = null) { @@ -79,8 +79,8 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Returns a new ChildResourceI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildResourceI18nQuery */ @@ -140,10 +140,10 @@ abstract class ResourceI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildResourceI18n A model object, or null if the key is not found + * @return ChildResourceI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildResourceI18n|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class ResourceI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,7 +214,7 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -229,7 +229,7 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class ResourceI18nQuery extends ModelCriteria * * @see filterByResource() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class ResourceI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class ResourceI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -358,9 +358,9 @@ abstract class ResourceI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -387,9 +387,9 @@ abstract class ResourceI18nQuery extends ModelCriteria * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%' * * - * @param string $chapo The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $chapo The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -416,9 +416,9 @@ abstract class ResourceI18nQuery extends ModelCriteria * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%' * * - * @param string $postscriptum The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $postscriptum The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -439,8 +439,8 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Resource object * - * @param \Thelia\Model\Resource|ObjectCollection $resource The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Resource|ObjectCollection $resource The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -464,8 +464,8 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Resource relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -498,11 +498,11 @@ abstract class ResourceI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ResourceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ResourceQuery A secondary query class using the current class as primary query */ public function useResourceQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -514,7 +514,7 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildResourceI18n $resourceI18n Object to remove from the list of results + * @param ChildResourceI18n $resourceI18n Object to remove from the list of results * * @return ChildResourceI18nQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Deletes all rows from the resource_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class ResourceI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildResourceI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildResourceI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildResourceI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class ResourceI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ResourceI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php index 613ab700a..8bea0889e 100644 --- a/core/lib/Thelia/Model/Base/ResourceQuery.php +++ b/core/lib/Thelia/Model/Base/ResourceQuery.php @@ -64,9 +64,9 @@ abstract class ResourceQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\ResourceQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Resource', $modelAlias = null) { @@ -76,8 +76,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Returns a new ChildResourceQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildResourceQuery */ @@ -106,7 +106,7 @@ abstract class ResourceQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildResource|array|mixed the result, formatted by the current formatter @@ -137,10 +137,10 @@ abstract class ResourceQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildResource A model object, or null if the key is not found + * @return ChildResource A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -167,8 +167,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildResource|array|mixed the result, formatted by the current formatter */ @@ -188,8 +188,8 @@ abstract class ResourceQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -210,26 +210,24 @@ abstract class ResourceQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildResourceQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(ResourceTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildResourceQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(ResourceTableMap::ID, $keys, Criteria::IN); } @@ -243,11 +241,11 @@ abstract class ResourceQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -283,9 +281,9 @@ abstract class ResourceQuery extends ModelCriteria * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' * * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -313,13 +311,13 @@ abstract class ResourceQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -356,13 +354,13 @@ abstract class ResourceQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -392,8 +390,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ProfileResource object * - * @param \Thelia\Model\ProfileResource|ObjectCollection $profileResource the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ProfileResource|ObjectCollection $profileResource the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -415,8 +413,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ProfileResource relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildResourceQuery The current query, for fluid interface */ @@ -449,11 +447,11 @@ abstract class ResourceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProfileResourceQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProfileResourceQuery A secondary query class using the current class as primary query */ public function useProfileResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -465,8 +463,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\ResourceI18n object * - * @param \Thelia\Model\ResourceI18n|ObjectCollection $resourceI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\ResourceI18n|ObjectCollection $resourceI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -488,8 +486,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the ResourceI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildResourceQuery The current query, for fluid interface */ @@ -522,11 +520,11 @@ abstract class ResourceQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ResourceI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ResourceI18nQuery A secondary query class using the current class as primary query */ public function useResourceI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -539,8 +537,8 @@ abstract class ResourceQuery extends ModelCriteria * Filter the query by a related Profile object * using the profile_resource table as cross reference * - * @param Profile $profile the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Profile $profile the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildResourceQuery The current query, for fluid interface */ @@ -555,7 +553,7 @@ abstract class ResourceQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildResource $resource Object to remove from the list of results + * @param ChildResource $resource Object to remove from the list of results * * @return ChildResourceQuery The current query, for fluid interface */ @@ -571,8 +569,8 @@ abstract class ResourceQuery extends ModelCriteria /** * Deletes all rows from the resource table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -603,13 +601,13 @@ abstract class ResourceQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildResource or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildResource object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildResource object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -629,7 +627,6 @@ abstract class ResourceQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - ResourceTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -648,9 +645,9 @@ abstract class ResourceQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -660,9 +657,9 @@ abstract class ResourceQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -672,7 +669,7 @@ abstract class ResourceQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -682,7 +679,7 @@ abstract class ResourceQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -692,7 +689,7 @@ abstract class ResourceQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -702,7 +699,7 @@ abstract class ResourceQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -714,11 +711,11 @@ abstract class ResourceQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -733,10 +730,10 @@ abstract class ResourceQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildResourceQuery The current query, for fluid interface + * @return ChildResourceQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -753,11 +750,11 @@ abstract class ResourceQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildResourceI18nQuery A secondary query class using the current class as primary query + * @return ChildResourceI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/RewritingArgument.php b/core/lib/Thelia/Model/Base/RewritingArgument.php index 82f326d40..cef658c6f 100644 --- a/core/lib/Thelia/Model/Base/RewritingArgument.php +++ b/core/lib/Thelia/Model/Base/RewritingArgument.php @@ -29,7 +29,6 @@ abstract class RewritingArgument implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\RewritingArgumentTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -308,9 +307,9 @@ abstract class RewritingArgument implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return RewritingArgument The current object, for fluid interface */ @@ -360,33 +359,30 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Get the [rewriting_url_id] column value. * - * @return int + * @return int */ public function getRewritingUrlId() { - return $this->rewriting_url_id; } /** * Get the [parameter] column value. * - * @return string + * @return string */ public function getParameter() { - return $this->parameter; } /** * Get the [value] column value. * - * @return string + * @return string */ public function getValue() { - return $this->value; } @@ -394,8 +390,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -414,8 +410,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -433,8 +429,8 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Set the value of [rewriting_url_id] column. * - * @param int $v new value - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) */ public function setRewritingUrlId($v) { @@ -451,15 +447,14 @@ abstract class RewritingArgument implements ActiveRecordInterface $this->aRewritingUrl = null; } - return $this; } // setRewritingUrlId() /** * Set the value of [parameter] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) */ public function setParameter($v) { @@ -472,15 +467,14 @@ abstract class RewritingArgument implements ActiveRecordInterface $this->modifiedColumns[RewritingArgumentTableMap::PARAMETER] = true; } - return $this; } // setParameter() /** * Set the value of [value] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) */ public function setValue($v) { @@ -493,16 +487,15 @@ abstract class RewritingArgument implements ActiveRecordInterface $this->modifiedColumns[RewritingArgumentTableMap::VALUE] = true; } - return $this; } // setValue() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -514,16 +507,15 @@ abstract class RewritingArgument implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -535,7 +527,6 @@ abstract class RewritingArgument implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -636,10 +627,10 @@ abstract class RewritingArgument implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -675,7 +666,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see RewritingArgument::setDeleted() @@ -718,8 +709,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -780,8 +771,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -824,7 +815,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -834,7 +825,6 @@ abstract class RewritingArgument implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(RewritingArgumentTableMap::REWRITING_URL_ID)) { $modifiedColumns[':p' . $index++] = '`REWRITING_URL_ID`'; @@ -891,7 +881,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -907,12 +897,12 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -926,7 +916,7 @@ abstract class RewritingArgument implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -959,12 +949,12 @@ abstract class RewritingArgument implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -999,12 +989,12 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1018,8 +1008,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1056,8 +1046,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1085,7 +1075,6 @@ abstract class RewritingArgument implements ActiveRecordInterface if ($this->isColumnModified(RewritingArgumentTableMap::VALUE)) $criteria->add(RewritingArgumentTableMap::VALUE, $this->value); if ($this->isColumnModified(RewritingArgumentTableMap::CREATED_AT)) $criteria->add(RewritingArgumentTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(RewritingArgumentTableMap::UPDATED_AT)) $criteria->add(RewritingArgumentTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1125,7 +1114,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1141,7 +1130,6 @@ abstract class RewritingArgument implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getRewritingUrlId()) && (null === $this->getParameter()) && (null === $this->getValue()); } @@ -1151,9 +1139,9 @@ abstract class RewritingArgument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\RewritingArgument (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\RewritingArgument (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1176,8 +1164,8 @@ abstract class RewritingArgument implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\RewritingArgument Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\RewritingArgument Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1193,8 +1181,8 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Declares an association between this object and a ChildRewritingUrl object. * - * @param ChildRewritingUrl $v - * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) + * @param ChildRewritingUrl $v + * @return \Thelia\Model\RewritingArgument The current object (for fluent API support) * @throws PropelException */ public function setRewritingUrl(ChildRewritingUrl $v = null) @@ -1213,7 +1201,6 @@ abstract class RewritingArgument implements ActiveRecordInterface $v->addRewritingArgument($this); } - return $this; } @@ -1221,8 +1208,8 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Get the associated ChildRewritingUrl object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildRewritingUrl The associated ChildRewritingUrl object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildRewritingUrl The associated ChildRewritingUrl object. * @throws PropelException */ public function getRewritingUrl(ConnectionInterface $con = null) @@ -1265,7 +1252,7 @@ abstract class RewritingArgument implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1290,7 +1277,7 @@ abstract class RewritingArgument implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildRewritingArgument The current object (for fluent API support) + * @return ChildRewritingArgument The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php b/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php index bb4dd9a6d..0654af49c 100644 --- a/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php +++ b/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php @@ -63,9 +63,9 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\RewritingArgumentQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\RewritingArgument', $modelAlias = null) { @@ -75,8 +75,8 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Returns a new ChildRewritingArgumentQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildRewritingArgumentQuery */ @@ -136,10 +136,10 @@ abstract class RewritingArgumentQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildRewritingArgument A model object, or null if the key is not found + * @return ChildRewritingArgument A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -168,8 +168,8 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildRewritingArgument|array|mixed the result, formatted by the current formatter */ @@ -189,8 +189,8 @@ abstract class RewritingArgumentQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -211,7 +211,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -227,7 +227,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -260,11 +260,11 @@ abstract class RewritingArgumentQuery extends ModelCriteria * * @see filterByRewritingUrl() * - * @param mixed $rewritingUrlId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $rewritingUrlId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -300,9 +300,9 @@ abstract class RewritingArgumentQuery extends ModelCriteria * $query->filterByParameter('%fooValue%'); // WHERE parameter LIKE '%fooValue%' * * - * @param string $parameter The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $parameter The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -329,9 +329,9 @@ abstract class RewritingArgumentQuery extends ModelCriteria * $query->filterByValue('%fooValue%'); // WHERE value LIKE '%fooValue%' * * - * @param string $value The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $value The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -359,13 +359,13 @@ abstract class RewritingArgumentQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -402,13 +402,13 @@ abstract class RewritingArgumentQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -439,7 +439,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\RewritingUrl object * * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -463,8 +463,8 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the RewritingUrl relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -497,11 +497,11 @@ abstract class RewritingArgumentQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query */ public function useRewritingUrlQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -513,7 +513,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildRewritingArgument $rewritingArgument Object to remove from the list of results + * @param ChildRewritingArgument $rewritingArgument Object to remove from the list of results * * @return ChildRewritingArgumentQuery The current query, for fluid interface */ @@ -532,8 +532,8 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Deletes all rows from the rewriting_argument table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -564,13 +564,13 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildRewritingArgument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildRewritingArgument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildRewritingArgument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -590,7 +590,6 @@ abstract class RewritingArgumentQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - RewritingArgumentTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -609,9 +608,9 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -621,9 +620,9 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -633,7 +632,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -643,7 +642,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -653,7 +652,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -663,7 +662,7 @@ abstract class RewritingArgumentQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildRewritingArgumentQuery The current query, for fluid interface + * @return ChildRewritingArgumentQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index 6791c25fe..9f81b33d9 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -30,7 +30,6 @@ abstract class RewritingUrl implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\RewritingUrlTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -351,9 +350,9 @@ abstract class RewritingUrl implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return RewritingUrl The current object, for fluid interface */ @@ -403,66 +402,60 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [url] column value. * - * @return string + * @return string */ public function getUrl() { - return $this->url; } /** * Get the [view] column value. * - * @return string + * @return string */ public function getView() { - return $this->view; } /** * Get the [view_id] column value. * - * @return string + * @return string */ public function getViewId() { - return $this->view_id; } /** * Get the [view_locale] column value. * - * @return string + * @return string */ public function getViewLocale() { - return $this->view_locale; } /** * Get the [redirected] column value. * - * @return int + * @return int */ public function getRedirected() { - return $this->redirected; } @@ -470,8 +463,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -490,8 +483,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -509,8 +502,8 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setId($v) { @@ -523,15 +516,14 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->modifiedColumns[RewritingUrlTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [url] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setUrl($v) { @@ -544,15 +536,14 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->modifiedColumns[RewritingUrlTableMap::URL] = true; } - return $this; } // setUrl() /** * Set the value of [view] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setView($v) { @@ -565,15 +556,14 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->modifiedColumns[RewritingUrlTableMap::VIEW] = true; } - return $this; } // setView() /** * Set the value of [view_id] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setViewId($v) { @@ -586,15 +576,14 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->modifiedColumns[RewritingUrlTableMap::VIEW_ID] = true; } - return $this; } // setViewId() /** * Set the value of [view_locale] column. * - * @param string $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setViewLocale($v) { @@ -607,15 +596,14 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->modifiedColumns[RewritingUrlTableMap::VIEW_LOCALE] = true; } - return $this; } // setViewLocale() /** * Set the value of [redirected] column. * - * @param int $v new value - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setRedirected($v) { @@ -632,16 +620,15 @@ abstract class RewritingUrl implements ActiveRecordInterface $this->aRewritingUrlRelatedByRedirected = null; } - return $this; } // setRedirected() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -653,16 +640,15 @@ abstract class RewritingUrl implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -674,7 +660,6 @@ abstract class RewritingUrl implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -784,10 +769,10 @@ abstract class RewritingUrl implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -827,7 +812,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see RewritingUrl::setDeleted() @@ -870,8 +855,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -932,8 +917,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -1011,7 +996,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1107,7 +1092,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1123,12 +1108,12 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1142,7 +1127,7 @@ abstract class RewritingUrl implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1184,12 +1169,12 @@ abstract class RewritingUrl implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1233,12 +1218,12 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1252,8 +1237,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1299,8 +1284,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1334,7 +1319,6 @@ abstract class RewritingUrl implements ActiveRecordInterface if ($this->isColumnModified(RewritingUrlTableMap::REDIRECTED)) $criteria->add(RewritingUrlTableMap::REDIRECTED, $this->redirected); if ($this->isColumnModified(RewritingUrlTableMap::CREATED_AT)) $criteria->add(RewritingUrlTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(RewritingUrlTableMap::UPDATED_AT)) $criteria->add(RewritingUrlTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1356,7 +1340,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1366,7 +1350,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1380,7 +1364,6 @@ abstract class RewritingUrl implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1390,9 +1373,9 @@ abstract class RewritingUrl implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\RewritingUrl (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\RewritingUrl (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1438,8 +1421,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\RewritingUrl Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\RewritingUrl Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1455,8 +1438,8 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Declares an association between this object and a ChildRewritingUrl object. * - * @param ChildRewritingUrl $v - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param ChildRewritingUrl $v + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) * @throws PropelException */ public function setRewritingUrlRelatedByRedirected(ChildRewritingUrl $v = null) @@ -1475,7 +1458,6 @@ abstract class RewritingUrl implements ActiveRecordInterface $v->addRewritingUrlRelatedById($this); } - return $this; } @@ -1483,8 +1465,8 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Get the associated ChildRewritingUrl object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildRewritingUrl The associated ChildRewritingUrl object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildRewritingUrl The associated ChildRewritingUrl object. * @throws PropelException */ public function getRewritingUrlRelatedByRedirected(ConnectionInterface $con = null) @@ -1509,7 +1491,7 @@ abstract class RewritingUrl implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1551,8 +1533,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1574,8 +1556,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * If this ChildRewritingUrl is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildRewritingUrl[] List of ChildRewritingUrl objects * @throws PropelException */ @@ -1631,15 +1613,14 @@ abstract class RewritingUrl implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $rewritingUrlsRelatedById A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildRewritingUrl The current object (for fluent API support) + * @param Collection $rewritingUrlsRelatedById A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildRewritingUrl The current object (for fluent API support) */ public function setRewritingUrlsRelatedById(Collection $rewritingUrlsRelatedById, ConnectionInterface $con = null) { $rewritingUrlsRelatedByIdToDelete = $this->getRewritingUrlsRelatedById(new Criteria(), $con)->diff($rewritingUrlsRelatedById); - $this->rewritingUrlsRelatedByIdScheduledForDeletion = $rewritingUrlsRelatedByIdToDelete; foreach ($rewritingUrlsRelatedByIdToDelete as $rewritingUrlRelatedByIdRemoved) { @@ -1660,10 +1641,10 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Returns the number of related RewritingUrl objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related RewritingUrl objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related RewritingUrl objects. * @throws PropelException */ public function countRewritingUrlsRelatedById(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1695,8 +1676,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * Method called to associate a ChildRewritingUrl object to this object * through the ChildRewritingUrl foreign key attribute. * - * @param ChildRewritingUrl $l ChildRewritingUrl - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param ChildRewritingUrl $l ChildRewritingUrl + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function addRewritingUrlRelatedById(ChildRewritingUrl $l) { @@ -1723,7 +1704,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * @param RewritingUrlRelatedById $rewritingUrlRelatedById The rewritingUrlRelatedById object to remove. - * @return ChildRewritingUrl The current object (for fluent API support) + * @return ChildRewritingUrl The current object (for fluent API support) */ public function removeRewritingUrlRelatedById($rewritingUrlRelatedById) { @@ -1769,8 +1750,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1792,8 +1773,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * If this ChildRewritingUrl is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildRewritingArgument[] List of ChildRewritingArgument objects * @throws PropelException */ @@ -1849,15 +1830,14 @@ abstract class RewritingUrl implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $rewritingArguments A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildRewritingUrl The current object (for fluent API support) + * @param Collection $rewritingArguments A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildRewritingUrl The current object (for fluent API support) */ public function setRewritingArguments(Collection $rewritingArguments, ConnectionInterface $con = null) { $rewritingArgumentsToDelete = $this->getRewritingArguments(new Criteria(), $con)->diff($rewritingArguments); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1881,10 +1861,10 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Returns the number of related RewritingArgument objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related RewritingArgument objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related RewritingArgument objects. * @throws PropelException */ public function countRewritingArguments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1916,8 +1896,8 @@ abstract class RewritingUrl implements ActiveRecordInterface * Method called to associate a ChildRewritingArgument object to this object * through the ChildRewritingArgument foreign key attribute. * - * @param ChildRewritingArgument $l ChildRewritingArgument - * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) + * @param ChildRewritingArgument $l ChildRewritingArgument + * @return \Thelia\Model\RewritingUrl The current object (for fluent API support) */ public function addRewritingArgument(ChildRewritingArgument $l) { @@ -1988,7 +1968,7 @@ abstract class RewritingUrl implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2025,7 +2005,7 @@ abstract class RewritingUrl implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildRewritingUrl The current object (for fluent API support) + * @return ChildRewritingUrl The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2110,7 +2090,6 @@ abstract class RewritingUrl implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/RewritingUrlQuery.php b/core/lib/Thelia/Model/Base/RewritingUrlQuery.php index 9c6a0450b..8f33539cc 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrlQuery.php +++ b/core/lib/Thelia/Model/Base/RewritingUrlQuery.php @@ -83,9 +83,9 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\RewritingUrlQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\RewritingUrl', $modelAlias = null) { @@ -95,8 +95,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Returns a new ChildRewritingUrlQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildRewritingUrlQuery */ @@ -125,7 +125,7 @@ abstract class RewritingUrlQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildRewritingUrl|array|mixed the result, formatted by the current formatter @@ -156,10 +156,10 @@ abstract class RewritingUrlQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildRewritingUrl A model object, or null if the key is not found + * @return ChildRewritingUrl A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -186,8 +186,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildRewritingUrl|array|mixed the result, formatted by the current formatter */ @@ -207,8 +207,8 @@ abstract class RewritingUrlQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -229,26 +229,24 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(RewritingUrlTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(RewritingUrlTableMap::ID, $keys, Criteria::IN); } @@ -262,11 +260,11 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -302,9 +300,9 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByUrl('%fooValue%'); // WHERE url LIKE '%fooValue%' * * - * @param string $url The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $url The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -331,9 +329,9 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByView('%fooValue%'); // WHERE view LIKE '%fooValue%' * * - * @param string $view The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $view The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -360,9 +358,9 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByViewId('%fooValue%'); // WHERE view_id LIKE '%fooValue%' * * - * @param string $viewId The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $viewId The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -389,9 +387,9 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByViewLocale('%fooValue%'); // WHERE view_locale LIKE '%fooValue%' * * - * @param string $viewLocale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $viewLocale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -421,11 +419,11 @@ abstract class RewritingUrlQuery extends ModelCriteria * * @see filterByRewritingUrlRelatedByRedirected() * - * @param mixed $redirected The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $redirected The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -462,13 +460,13 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -505,13 +503,13 @@ abstract class RewritingUrlQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -542,7 +540,7 @@ abstract class RewritingUrlQuery extends ModelCriteria * Filter the query by a related \Thelia\Model\RewritingUrl object * * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -566,8 +564,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the RewritingUrlRelatedByRedirected relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -600,11 +598,11 @@ abstract class RewritingUrlQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query */ public function useRewritingUrlRelatedByRedirectedQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -616,8 +614,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\RewritingUrl object * - * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -639,8 +637,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the RewritingUrlRelatedById relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -673,11 +671,11 @@ abstract class RewritingUrlQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query */ public function useRewritingUrlRelatedByIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -689,8 +687,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\RewritingArgument object * - * @param \Thelia\Model\RewritingArgument|ObjectCollection $rewritingArgument the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\RewritingArgument|ObjectCollection $rewritingArgument the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -712,8 +710,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the RewritingArgument relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -746,11 +744,11 @@ abstract class RewritingUrlQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\RewritingArgumentQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\RewritingArgumentQuery A secondary query class using the current class as primary query */ public function useRewritingArgumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -762,7 +760,7 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildRewritingUrl $rewritingUrl Object to remove from the list of results + * @param ChildRewritingUrl $rewritingUrl Object to remove from the list of results * * @return ChildRewritingUrlQuery The current query, for fluid interface */ @@ -778,8 +776,8 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Deletes all rows from the rewriting_url table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -810,13 +808,13 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildRewritingUrl or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildRewritingUrl object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildRewritingUrl object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -836,7 +834,6 @@ abstract class RewritingUrlQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - RewritingUrlTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -855,9 +852,9 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -867,9 +864,9 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -879,7 +876,7 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -889,7 +886,7 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -899,7 +896,7 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -909,7 +906,7 @@ abstract class RewritingUrlQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildRewritingUrlQuery The current query, for fluid interface + * @return ChildRewritingUrlQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index d2d3ea76d..e6603abda 100644 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -32,7 +32,6 @@ abstract class Tax implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TaxTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -344,9 +343,9 @@ abstract class Tax implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Tax The current object, for fluid interface */ @@ -396,33 +395,30 @@ abstract class Tax implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [type] column value. * - * @return string + * @return string */ public function getType() { - return $this->type; } /** * Get the [serialized_requirements] column value. * - * @return string + * @return string */ public function getSerializedRequirements() { - return $this->serialized_requirements; } @@ -430,8 +426,8 @@ abstract class Tax implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -450,8 +446,8 @@ abstract class Tax implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -469,8 +465,8 @@ abstract class Tax implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function setId($v) { @@ -483,15 +479,14 @@ abstract class Tax implements ActiveRecordInterface $this->modifiedColumns[TaxTableMap::ID] = true; } - return $this; } // setId() /** * Set the value of [type] column. * - * @param string $v new value - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function setType($v) { @@ -504,15 +499,14 @@ abstract class Tax implements ActiveRecordInterface $this->modifiedColumns[TaxTableMap::TYPE] = true; } - return $this; } // setType() /** * Set the value of [serialized_requirements] column. * - * @param string $v new value - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function setSerializedRequirements($v) { @@ -525,16 +519,15 @@ abstract class Tax implements ActiveRecordInterface $this->modifiedColumns[TaxTableMap::SERIALIZED_REQUIREMENTS] = true; } - return $this; } // setSerializedRequirements() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -546,16 +539,15 @@ abstract class Tax implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -567,7 +559,6 @@ abstract class Tax implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -665,10 +656,10 @@ abstract class Tax implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -707,7 +698,7 @@ abstract class Tax implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Tax::setDeleted() @@ -750,8 +741,8 @@ abstract class Tax implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -812,8 +803,8 @@ abstract class Tax implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -878,7 +869,7 @@ abstract class Tax implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -956,7 +947,7 @@ abstract class Tax implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -972,12 +963,12 @@ abstract class Tax implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -991,7 +982,7 @@ abstract class Tax implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1024,12 +1015,12 @@ abstract class Tax implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1067,12 +1058,12 @@ abstract class Tax implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1086,8 +1077,8 @@ abstract class Tax implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1124,8 +1115,8 @@ abstract class Tax implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1153,7 +1144,6 @@ abstract class Tax implements ActiveRecordInterface if ($this->isColumnModified(TaxTableMap::SERIALIZED_REQUIREMENTS)) $criteria->add(TaxTableMap::SERIALIZED_REQUIREMENTS, $this->serialized_requirements); if ($this->isColumnModified(TaxTableMap::CREATED_AT)) $criteria->add(TaxTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TaxTableMap::UPDATED_AT)) $criteria->add(TaxTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1175,7 +1165,7 @@ abstract class Tax implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1185,7 +1175,7 @@ abstract class Tax implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1199,7 +1189,6 @@ abstract class Tax implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1209,9 +1198,9 @@ abstract class Tax implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Tax (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Tax (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1254,8 +1243,8 @@ abstract class Tax implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Tax Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Tax Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1274,7 +1263,7 @@ abstract class Tax implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1316,8 +1305,8 @@ abstract class Tax implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1339,8 +1328,8 @@ abstract class Tax implements ActiveRecordInterface * If this ChildTax is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects * @throws PropelException */ @@ -1396,15 +1385,14 @@ abstract class Tax implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $taxRuleCountries A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTax The current object (for fluent API support) + * @param Collection $taxRuleCountries A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTax The current object (for fluent API support) */ public function setTaxRuleCountries(Collection $taxRuleCountries, ConnectionInterface $con = null) { $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1428,10 +1416,10 @@ abstract class Tax implements ActiveRecordInterface /** * Returns the number of related TaxRuleCountry objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TaxRuleCountry objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TaxRuleCountry objects. * @throws PropelException */ public function countTaxRuleCountries(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1463,8 +1451,8 @@ abstract class Tax implements ActiveRecordInterface * Method called to associate a ChildTaxRuleCountry object to this object * through the ChildTaxRuleCountry foreign key attribute. * - * @param ChildTaxRuleCountry $l ChildTaxRuleCountry - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param ChildTaxRuleCountry $l ChildTaxRuleCountry + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function addTaxRuleCountry(ChildTaxRuleCountry $l) { @@ -1491,7 +1479,7 @@ abstract class Tax implements ActiveRecordInterface /** * @param TaxRuleCountry $taxRuleCountry The taxRuleCountry object to remove. - * @return ChildTax The current object (for fluent API support) + * @return ChildTax The current object (for fluent API support) */ public function removeTaxRuleCountry($taxRuleCountry) { @@ -1508,7 +1496,6 @@ abstract class Tax implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1520,9 +1507,9 @@ abstract class Tax implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Tax. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinTaxRule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1533,7 +1520,6 @@ abstract class Tax implements ActiveRecordInterface return $this->getTaxRuleCountries($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1545,9 +1531,9 @@ abstract class Tax implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Tax. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinCountry($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1587,8 +1573,8 @@ abstract class Tax implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1610,8 +1596,8 @@ abstract class Tax implements ActiveRecordInterface * If this ChildTax is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTaxI18n[] List of ChildTaxI18n objects * @throws PropelException */ @@ -1667,15 +1653,14 @@ abstract class Tax implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $taxI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTax The current object (for fluent API support) + * @param Collection $taxI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTax The current object (for fluent API support) */ public function setTaxI18ns(Collection $taxI18ns, ConnectionInterface $con = null) { $taxI18nsToDelete = $this->getTaxI18ns(new Criteria(), $con)->diff($taxI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1699,10 +1684,10 @@ abstract class Tax implements ActiveRecordInterface /** * Returns the number of related TaxI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TaxI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TaxI18n objects. * @throws PropelException */ public function countTaxI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1734,8 +1719,8 @@ abstract class Tax implements ActiveRecordInterface * Method called to associate a ChildTaxI18n object to this object * through the ChildTaxI18n foreign key attribute. * - * @param ChildTaxI18n $l ChildTaxI18n - * @return \Thelia\Model\Tax The current object (for fluent API support) + * @param ChildTaxI18n $l ChildTaxI18n + * @return \Thelia\Model\Tax The current object (for fluent API support) */ public function addTaxI18n(ChildTaxI18n $l) { @@ -1765,7 +1750,7 @@ abstract class Tax implements ActiveRecordInterface } /** - * @param TaxI18n $taxI18n The taxI18n object to remove. + * @param TaxI18n $taxI18n The taxI18n object to remove. * @return ChildTax The current object (for fluent API support) */ public function removeTaxI18n($taxI18n) @@ -1807,7 +1792,7 @@ abstract class Tax implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1847,7 +1832,7 @@ abstract class Tax implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildTax The current object (for fluent API support) + * @return ChildTax The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -1861,9 +1846,9 @@ abstract class Tax implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildTax The current object (for fluent API support) + * @return ChildTax The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -1875,7 +1860,7 @@ abstract class Tax implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -1885,8 +1870,8 @@ abstract class Tax implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildTaxI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -1919,10 +1904,10 @@ abstract class Tax implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildTax The current object (for fluent API support) + * @return ChildTax The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -1947,7 +1932,7 @@ abstract class Tax implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildTaxI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -1955,7 +1940,6 @@ abstract class Tax implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -1966,7 +1950,6 @@ abstract class Tax implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -1979,7 +1962,6 @@ abstract class Tax implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -1990,7 +1972,6 @@ abstract class Tax implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2079,7 +2060,6 @@ abstract class Tax implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php index 611394f06..c48090d85 100644 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -26,7 +26,6 @@ abstract class TaxI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TaxI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -313,9 +312,9 @@ abstract class TaxI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return TaxI18n The current object, for fluid interface */ @@ -365,52 +364,48 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxI18n The current object (for fluent API support) */ public function setId($v) { @@ -427,15 +422,14 @@ abstract class TaxI18n implements ActiveRecordInterface $this->aTax = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\TaxI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -448,15 +442,14 @@ abstract class TaxI18n implements ActiveRecordInterface $this->modifiedColumns[TaxI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\TaxI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -469,15 +462,14 @@ abstract class TaxI18n implements ActiveRecordInterface $this->modifiedColumns[TaxI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\TaxI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -490,7 +482,6 @@ abstract class TaxI18n implements ActiveRecordInterface $this->modifiedColumns[TaxI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() @@ -534,7 +525,6 @@ abstract class TaxI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -586,10 +576,10 @@ abstract class TaxI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -625,7 +615,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see TaxI18n::setDeleted() @@ -668,8 +658,8 @@ abstract class TaxI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -719,8 +709,8 @@ abstract class TaxI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -763,7 +753,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -824,7 +814,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -840,12 +830,12 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -859,7 +849,7 @@ abstract class TaxI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -889,12 +879,12 @@ abstract class TaxI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -928,12 +918,12 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -947,8 +937,8 @@ abstract class TaxI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -982,8 +972,8 @@ abstract class TaxI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1009,7 +999,6 @@ abstract class TaxI18n implements ActiveRecordInterface if ($this->isColumnModified(TaxI18nTableMap::LOCALE)) $criteria->add(TaxI18nTableMap::LOCALE, $this->locale); if ($this->isColumnModified(TaxI18nTableMap::TITLE)) $criteria->add(TaxI18nTableMap::TITLE, $this->title); if ($this->isColumnModified(TaxI18nTableMap::DESCRIPTION)) $criteria->add(TaxI18nTableMap::DESCRIPTION, $this->description); - return $criteria; } @@ -1047,7 +1036,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1062,7 +1051,6 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1072,9 +1060,9 @@ abstract class TaxI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\TaxI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\TaxI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1096,8 +1084,8 @@ abstract class TaxI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\TaxI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\TaxI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1113,8 +1101,8 @@ abstract class TaxI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildTax object. * - * @param ChildTax $v - * @return \Thelia\Model\TaxI18n The current object (for fluent API support) + * @param ChildTax $v + * @return \Thelia\Model\TaxI18n The current object (for fluent API support) * @throws PropelException */ public function setTax(ChildTax $v = null) @@ -1133,16 +1121,14 @@ abstract class TaxI18n implements ActiveRecordInterface $v->addTaxI18n($this); } - return $this; } - /** * Get the associated ChildTax object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTax The associated ChildTax object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTax The associated ChildTax object. * @throws PropelException */ public function getTax(ConnectionInterface $con = null) @@ -1185,7 +1171,7 @@ abstract class TaxI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/TaxI18nQuery.php b/core/lib/Thelia/Model/Base/TaxI18nQuery.php index 7514a394a..80c34d0a1 100644 --- a/core/lib/Thelia/Model/Base/TaxI18nQuery.php +++ b/core/lib/Thelia/Model/Base/TaxI18nQuery.php @@ -59,9 +59,9 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TaxI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\TaxI18n', $modelAlias = null) { @@ -71,8 +71,8 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Returns a new ChildTaxI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTaxI18nQuery */ @@ -132,10 +132,10 @@ abstract class TaxI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTaxI18n A model object, or null if the key is not found + * @return ChildTaxI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -163,8 +163,8 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTaxI18n|array|mixed the result, formatted by the current formatter */ @@ -184,8 +184,8 @@ abstract class TaxI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -206,7 +206,7 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -221,7 +221,7 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -252,11 +252,11 @@ abstract class TaxI18nQuery extends ModelCriteria * * @see filterByTax() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -292,9 +292,9 @@ abstract class TaxI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -321,9 +321,9 @@ abstract class TaxI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -350,9 +350,9 @@ abstract class TaxI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -373,8 +373,8 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Tax object * - * @param \Thelia\Model\Tax|ObjectCollection $tax The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Tax|ObjectCollection $tax The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -398,8 +398,8 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Tax relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -432,11 +432,11 @@ abstract class TaxI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query */ public function useTaxQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -448,7 +448,7 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTaxI18n $taxI18n Object to remove from the list of results + * @param ChildTaxI18n $taxI18n Object to remove from the list of results * * @return ChildTaxI18nQuery The current query, for fluid interface */ @@ -466,8 +466,8 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Deletes all rows from the tax_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -498,13 +498,13 @@ abstract class TaxI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTaxI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTaxI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTaxI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -524,7 +524,6 @@ abstract class TaxI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TaxI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php index 67fc3a3ec..b30f5f4e5 100644 --- a/core/lib/Thelia/Model/Base/TaxQuery.php +++ b/core/lib/Thelia/Model/Base/TaxQuery.php @@ -68,9 +68,9 @@ abstract class TaxQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TaxQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Tax', $modelAlias = null) { @@ -80,8 +80,8 @@ abstract class TaxQuery extends ModelCriteria /** * Returns a new ChildTaxQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTaxQuery */ @@ -110,7 +110,7 @@ abstract class TaxQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildTax|array|mixed the result, formatted by the current formatter @@ -141,10 +141,10 @@ abstract class TaxQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTax A model object, or null if the key is not found + * @return ChildTax A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class TaxQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTax|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class TaxQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,26 +214,24 @@ abstract class TaxQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTaxQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(TaxTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTaxQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(TaxTableMap::ID, $keys, Criteria::IN); } @@ -247,11 +245,11 @@ abstract class TaxQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -287,9 +285,9 @@ abstract class TaxQuery extends ModelCriteria * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $type The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $type The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -316,9 +314,9 @@ abstract class TaxQuery extends ModelCriteria * $query->filterBySerializedRequirements('%fooValue%'); // WHERE serialized_requirements LIKE '%fooValue%' * * - * @param string $serializedRequirements The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $serializedRequirements The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -346,13 +344,13 @@ abstract class TaxQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -389,13 +387,13 @@ abstract class TaxQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -425,8 +423,8 @@ abstract class TaxQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRuleCountry object * - * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -448,8 +446,8 @@ abstract class TaxQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRuleCountry relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxQuery The current query, for fluid interface */ @@ -482,11 +480,11 @@ abstract class TaxQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -498,8 +496,8 @@ abstract class TaxQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxI18n object * - * @param \Thelia\Model\TaxI18n|ObjectCollection $taxI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxI18n|ObjectCollection $taxI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxQuery The current query, for fluid interface */ @@ -521,8 +519,8 @@ abstract class TaxQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxQuery The current query, for fluid interface */ @@ -555,11 +553,11 @@ abstract class TaxQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxI18nQuery A secondary query class using the current class as primary query */ public function useTaxI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -571,7 +569,7 @@ abstract class TaxQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTax $tax Object to remove from the list of results + * @param ChildTax $tax Object to remove from the list of results * * @return ChildTaxQuery The current query, for fluid interface */ @@ -587,8 +585,8 @@ abstract class TaxQuery extends ModelCriteria /** * Deletes all rows from the tax table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -619,13 +617,13 @@ abstract class TaxQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTax or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTax object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTax object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -645,7 +643,6 @@ abstract class TaxQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TaxTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -664,9 +661,9 @@ abstract class TaxQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -676,9 +673,9 @@ abstract class TaxQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -688,7 +685,7 @@ abstract class TaxQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -698,7 +695,7 @@ abstract class TaxQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -708,7 +705,7 @@ abstract class TaxQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -718,7 +715,7 @@ abstract class TaxQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -730,11 +727,11 @@ abstract class TaxQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -749,10 +746,10 @@ abstract class TaxQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxQuery The current query, for fluid interface + * @return ChildTaxQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -769,11 +766,11 @@ abstract class TaxQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxI18nQuery A secondary query class using the current class as primary query + * @return ChildTaxI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index 971a8192f..1dbe9180b 100644 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -34,7 +34,6 @@ abstract class TaxRule implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TaxRuleTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -366,9 +365,9 @@ abstract class TaxRule implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return TaxRule The current object, for fluid interface */ @@ -418,22 +417,20 @@ abstract class TaxRule implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [is_default] column value. * - * @return boolean + * @return boolean */ public function getIsDefault() { - return $this->is_default; } @@ -441,8 +438,8 @@ abstract class TaxRule implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -461,8 +458,8 @@ abstract class TaxRule implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -480,8 +477,8 @@ abstract class TaxRule implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function setId($v) { @@ -494,7 +491,6 @@ abstract class TaxRule implements ActiveRecordInterface $this->modifiedColumns[TaxRuleTableMap::ID] = true; } - return $this; } // setId() @@ -505,8 +501,8 @@ abstract class TaxRule implements ActiveRecordInterface * * 0, '0', 'false', 'off', and 'no' are converted to boolean false * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param boolean|integer|string $v The new value - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function setIsDefault($v) { @@ -523,16 +519,15 @@ abstract class TaxRule implements ActiveRecordInterface $this->modifiedColumns[TaxRuleTableMap::IS_DEFAULT] = true; } - return $this; } // setIsDefault() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -544,16 +539,15 @@ abstract class TaxRule implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -565,7 +559,6 @@ abstract class TaxRule implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -609,7 +602,6 @@ abstract class TaxRule implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -664,10 +656,10 @@ abstract class TaxRule implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -708,7 +700,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see TaxRule::setDeleted() @@ -751,8 +743,8 @@ abstract class TaxRule implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -813,8 +805,8 @@ abstract class TaxRule implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -897,7 +889,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -969,7 +961,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -985,12 +977,12 @@ abstract class TaxRule implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1004,7 +996,7 @@ abstract class TaxRule implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1034,12 +1026,12 @@ abstract class TaxRule implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1079,12 +1071,12 @@ abstract class TaxRule implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1098,8 +1090,8 @@ abstract class TaxRule implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1133,8 +1125,8 @@ abstract class TaxRule implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1160,7 +1152,6 @@ abstract class TaxRule implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleTableMap::IS_DEFAULT)) $criteria->add(TaxRuleTableMap::IS_DEFAULT, $this->is_default); if ($this->isColumnModified(TaxRuleTableMap::CREATED_AT)) $criteria->add(TaxRuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TaxRuleTableMap::UPDATED_AT)) $criteria->add(TaxRuleTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1182,7 +1173,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1192,7 +1183,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1206,7 +1197,6 @@ abstract class TaxRule implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1216,9 +1206,9 @@ abstract class TaxRule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\TaxRule (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\TaxRule (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1266,8 +1256,8 @@ abstract class TaxRule implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\TaxRule Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\TaxRule Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1286,7 +1276,7 @@ abstract class TaxRule implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1331,8 +1321,8 @@ abstract class TaxRule implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1354,8 +1344,8 @@ abstract class TaxRule implements ActiveRecordInterface * If this ChildTaxRule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProduct[] List of ChildProduct objects * @throws PropelException */ @@ -1411,15 +1401,14 @@ abstract class TaxRule implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $products A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTaxRule The current object (for fluent API support) + * @param Collection $products A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTaxRule The current object (for fluent API support) */ public function setProducts(Collection $products, ConnectionInterface $con = null) { $productsToDelete = $this->getProducts(new Criteria(), $con)->diff($products); - $this->productsScheduledForDeletion = $productsToDelete; foreach ($productsToDelete as $productRemoved) { @@ -1440,10 +1429,10 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the number of related Product objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Product objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Product objects. * @throws PropelException */ public function countProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1475,8 +1464,8 @@ abstract class TaxRule implements ActiveRecordInterface * Method called to associate a ChildProduct object to this object * through the ChildProduct foreign key attribute. * - * @param ChildProduct $l ChildProduct - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param ChildProduct $l ChildProduct + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function addProduct(ChildProduct $l) { @@ -1502,7 +1491,7 @@ abstract class TaxRule implements ActiveRecordInterface } /** - * @param Product $product The product object to remove. + * @param Product $product The product object to remove. * @return ChildTaxRule The current object (for fluent API support) */ public function removeProduct($product) @@ -1520,7 +1509,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1532,9 +1520,9 @@ abstract class TaxRule implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in TaxRule. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProduct[] List of ChildProduct objects */ public function getProductsJoinTemplate($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1574,8 +1562,8 @@ abstract class TaxRule implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1597,8 +1585,8 @@ abstract class TaxRule implements ActiveRecordInterface * If this ChildTaxRule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects * @throws PropelException */ @@ -1654,15 +1642,14 @@ abstract class TaxRule implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $taxRuleCountries A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTaxRule The current object (for fluent API support) + * @param Collection $taxRuleCountries A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTaxRule The current object (for fluent API support) */ public function setTaxRuleCountries(Collection $taxRuleCountries, ConnectionInterface $con = null) { $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1686,10 +1673,10 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the number of related TaxRuleCountry objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TaxRuleCountry objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TaxRuleCountry objects. * @throws PropelException */ public function countTaxRuleCountries(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1721,8 +1708,8 @@ abstract class TaxRule implements ActiveRecordInterface * Method called to associate a ChildTaxRuleCountry object to this object * through the ChildTaxRuleCountry foreign key attribute. * - * @param ChildTaxRuleCountry $l ChildTaxRuleCountry - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param ChildTaxRuleCountry $l ChildTaxRuleCountry + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function addTaxRuleCountry(ChildTaxRuleCountry $l) { @@ -1749,7 +1736,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * @param TaxRuleCountry $taxRuleCountry The taxRuleCountry object to remove. - * @return ChildTaxRule The current object (for fluent API support) + * @return ChildTaxRule The current object (for fluent API support) */ public function removeTaxRuleCountry($taxRuleCountry) { @@ -1766,7 +1753,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1778,9 +1764,9 @@ abstract class TaxRule implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in TaxRule. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinTax($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1791,7 +1777,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getTaxRuleCountries($query, $con); } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1803,9 +1788,9 @@ abstract class TaxRule implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in TaxRule. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildTaxRuleCountry[] List of ChildTaxRuleCountry objects */ public function getTaxRuleCountriesJoinCountry($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1845,8 +1830,8 @@ abstract class TaxRule implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1868,8 +1853,8 @@ abstract class TaxRule implements ActiveRecordInterface * If this ChildTaxRule is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTaxRuleI18n[] List of ChildTaxRuleI18n objects * @throws PropelException */ @@ -1925,15 +1910,14 @@ abstract class TaxRule implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $taxRuleI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTaxRule The current object (for fluent API support) + * @param Collection $taxRuleI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTaxRule The current object (for fluent API support) */ public function setTaxRuleI18ns(Collection $taxRuleI18ns, ConnectionInterface $con = null) { $taxRuleI18nsToDelete = $this->getTaxRuleI18ns(new Criteria(), $con)->diff($taxRuleI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -1957,10 +1941,10 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the number of related TaxRuleI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TaxRuleI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TaxRuleI18n objects. * @throws PropelException */ public function countTaxRuleI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1992,8 +1976,8 @@ abstract class TaxRule implements ActiveRecordInterface * Method called to associate a ChildTaxRuleI18n object to this object * through the ChildTaxRuleI18n foreign key attribute. * - * @param ChildTaxRuleI18n $l ChildTaxRuleI18n - * @return \Thelia\Model\TaxRule The current object (for fluent API support) + * @param ChildTaxRuleI18n $l ChildTaxRuleI18n + * @return \Thelia\Model\TaxRule The current object (for fluent API support) */ public function addTaxRuleI18n(ChildTaxRuleI18n $l) { @@ -2023,7 +2007,7 @@ abstract class TaxRule implements ActiveRecordInterface } /** - * @param TaxRuleI18n $taxRuleI18n The taxRuleI18n object to remove. + * @param TaxRuleI18n $taxRuleI18n The taxRuleI18n object to remove. * @return ChildTaxRule The current object (for fluent API support) */ public function removeTaxRuleI18n($taxRuleI18n) @@ -2065,7 +2049,7 @@ abstract class TaxRule implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2111,7 +2095,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildTaxRule The current object (for fluent API support) + * @return ChildTaxRule The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2125,9 +2109,9 @@ abstract class TaxRule implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildTaxRule The current object (for fluent API support) + * @return ChildTaxRule The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2139,7 +2123,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2149,8 +2133,8 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRuleI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2183,10 +2167,10 @@ abstract class TaxRule implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildTaxRule The current object (for fluent API support) + * @return ChildTaxRule The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2211,7 +2195,7 @@ abstract class TaxRule implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRuleI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2219,7 +2203,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } - /** * Get the [title] column value. * @@ -2230,7 +2213,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getCurrentTranslation()->getTitle(); } - /** * Set the value of [title] column. * @@ -2243,7 +2225,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this; } - /** * Get the [description] column value. * @@ -2254,7 +2235,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getCurrentTranslation()->getDescription(); } - /** * Set the value of [description] column. * @@ -2343,7 +2323,6 @@ abstract class TaxRule implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php index 1cf976873..d6d0298e8 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -33,7 +33,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TaxRuleCountryTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -328,9 +327,9 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return TaxRuleCountry The current object, for fluid interface */ @@ -380,44 +379,40 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the [tax_rule_id] column value. * - * @return int + * @return int */ public function getTaxRuleId() { - return $this->tax_rule_id; } /** * Get the [country_id] column value. * - * @return int + * @return int */ public function getCountryId() { - return $this->country_id; } /** * Get the [tax_id] column value. * - * @return int + * @return int */ public function getTaxId() { - return $this->tax_id; } /** * Get the [position] column value. * - * @return int + * @return int */ public function getPosition() { - return $this->position; } @@ -425,8 +420,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -445,8 +440,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -464,8 +459,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Set the value of [tax_rule_id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setTaxRuleId($v) { @@ -482,15 +477,14 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $this->aTaxRule = null; } - return $this; } // setTaxRuleId() /** * Set the value of [country_id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setCountryId($v) { @@ -507,15 +501,14 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $this->aCountry = null; } - return $this; } // setCountryId() /** * Set the value of [tax_id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setTaxId($v) { @@ -532,15 +525,14 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $this->aTax = null; } - return $this; } // setTaxId() /** * Set the value of [position] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setPosition($v) { @@ -553,16 +545,15 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $this->modifiedColumns[TaxRuleCountryTableMap::POSITION] = true; } - return $this; } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -574,16 +565,15 @@ abstract class TaxRuleCountry implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -595,7 +585,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -705,10 +694,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -746,7 +735,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see TaxRuleCountry::setDeleted() @@ -789,8 +778,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -851,8 +840,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -909,7 +898,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -919,7 +908,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; - // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_RULE_ID)) { $modifiedColumns[':p' . $index++] = '`TAX_RULE_ID`'; @@ -982,7 +970,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -998,12 +986,12 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1017,7 +1005,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1053,12 +1041,12 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1100,12 +1088,12 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1119,8 +1107,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1160,8 +1148,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1191,7 +1179,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleCountryTableMap::POSITION)) $criteria->add(TaxRuleCountryTableMap::POSITION, $this->position); if ($this->isColumnModified(TaxRuleCountryTableMap::CREATED_AT)) $criteria->add(TaxRuleCountryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TaxRuleCountryTableMap::UPDATED_AT)) $criteria->add(TaxRuleCountryTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1231,7 +1218,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1247,7 +1234,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getTaxRuleId()) && (null === $this->getCountryId()) && (null === $this->getTaxId()); } @@ -1257,9 +1243,9 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\TaxRuleCountry (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\TaxRuleCountry (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1283,8 +1269,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\TaxRuleCountry Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\TaxRuleCountry Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1300,8 +1286,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Declares an association between this object and a ChildTax object. * - * @param ChildTax $v - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param ChildTax $v + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) * @throws PropelException */ public function setTax(ChildTax $v = null) @@ -1320,7 +1306,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $v->addTaxRuleCountry($this); } - return $this; } @@ -1328,8 +1313,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the associated ChildTax object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTax The associated ChildTax object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTax The associated ChildTax object. * @throws PropelException */ public function getTax(ConnectionInterface $con = null) @@ -1351,8 +1336,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Declares an association between this object and a ChildTaxRule object. * - * @param ChildTaxRule $v - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param ChildTaxRule $v + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) * @throws PropelException */ public function setTaxRule(ChildTaxRule $v = null) @@ -1371,7 +1356,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $v->addTaxRuleCountry($this); } - return $this; } @@ -1379,8 +1363,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the associated ChildTaxRule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTaxRule The associated ChildTaxRule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTaxRule The associated ChildTaxRule object. * @throws PropelException */ public function getTaxRule(ConnectionInterface $con = null) @@ -1402,8 +1386,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Declares an association between this object and a ChildCountry object. * - * @param ChildCountry $v - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) + * @param ChildCountry $v + * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) * @throws PropelException */ public function setCountry(ChildCountry $v = null) @@ -1422,7 +1406,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $v->addTaxRuleCountry($this); } - return $this; } @@ -1430,8 +1413,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Get the associated ChildCountry object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCountry The associated ChildCountry object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCountry The associated ChildCountry object. * @throws PropelException */ public function getCountry(ConnectionInterface $con = null) @@ -1475,7 +1458,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -1502,7 +1485,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildTaxRuleCountry The current object (for fluent API support) + * @return ChildTaxRuleCountry The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php index 02f5079af..eec8d4d77 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php @@ -75,9 +75,9 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TaxRuleCountryQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\TaxRuleCountry', $modelAlias = null) { @@ -87,8 +87,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Returns a new ChildTaxRuleCountryQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTaxRuleCountryQuery */ @@ -148,10 +148,10 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTaxRuleCountry A model object, or null if the key is not found + * @return ChildTaxRuleCountry A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -180,8 +180,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTaxRuleCountry|array|mixed the result, formatted by the current formatter */ @@ -201,8 +201,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -223,7 +223,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -239,7 +239,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -272,11 +272,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see filterByTaxRule() * - * @param mixed $taxRuleId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $taxRuleId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -315,11 +315,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see filterByCountry() * - * @param mixed $countryId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $countryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -358,11 +358,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see filterByTax() * - * @param mixed $taxId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $taxId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -399,11 +399,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $position The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -440,13 +440,13 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -483,13 +483,13 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -519,8 +519,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Tax object * - * @param \Thelia\Model\Tax|ObjectCollection $tax The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Tax|ObjectCollection $tax The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -544,8 +544,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Tax relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -578,11 +578,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query */ public function useTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -594,8 +594,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRule object * - * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -619,8 +619,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -653,11 +653,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query */ public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -669,8 +669,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Country object * - * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -694,8 +694,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Country relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -728,11 +728,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query */ public function useCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -744,7 +744,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTaxRuleCountry $taxRuleCountry Object to remove from the list of results + * @param ChildTaxRuleCountry $taxRuleCountry Object to remove from the list of results * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ @@ -763,8 +763,8 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Deletes all rows from the tax_rule_country table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -795,13 +795,13 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTaxRuleCountry or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTaxRuleCountry object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTaxRuleCountry object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -821,7 +821,6 @@ abstract class TaxRuleCountryQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TaxRuleCountryTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -840,9 +839,9 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -852,9 +851,9 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -864,7 +863,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -874,7 +873,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -884,7 +883,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -894,7 +893,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface + * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index cb9460331..8e77fd85c 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -26,7 +26,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TaxRuleI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -313,9 +312,9 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return TaxRuleI18n The current object, for fluid interface */ @@ -365,52 +364,48 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [title] column value. * - * @return string + * @return string */ public function getTitle() { - return $this->title; } /** * Get the [description] column value. * - * @return string + * @return string */ public function getDescription() { - return $this->description; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) */ public function setId($v) { @@ -427,15 +422,14 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $this->aTaxRule = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -448,15 +442,14 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $this->modifiedColumns[TaxRuleI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [title] column. * - * @param string $v new value - * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) */ public function setTitle($v) { @@ -469,15 +462,14 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $this->modifiedColumns[TaxRuleI18nTableMap::TITLE] = true; } - return $this; } // setTitle() /** * Set the value of [description] column. * - * @param string $v new value - * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) */ public function setDescription($v) { @@ -490,7 +482,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $this->modifiedColumns[TaxRuleI18nTableMap::DESCRIPTION] = true; } - return $this; } // setDescription() @@ -534,7 +525,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -586,10 +576,10 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -625,7 +615,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see TaxRuleI18n::setDeleted() @@ -668,8 +658,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -719,8 +709,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -763,7 +753,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -824,7 +814,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -840,12 +830,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -859,7 +849,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -889,12 +879,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -928,12 +918,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -947,8 +937,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -982,8 +972,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1009,7 +999,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleI18nTableMap::LOCALE)) $criteria->add(TaxRuleI18nTableMap::LOCALE, $this->locale); if ($this->isColumnModified(TaxRuleI18nTableMap::TITLE)) $criteria->add(TaxRuleI18nTableMap::TITLE, $this->title); if ($this->isColumnModified(TaxRuleI18nTableMap::DESCRIPTION)) $criteria->add(TaxRuleI18nTableMap::DESCRIPTION, $this->description); - return $criteria; } @@ -1047,7 +1036,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1062,7 +1051,6 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1072,9 +1060,9 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\TaxRuleI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\TaxRuleI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1096,8 +1084,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\TaxRuleI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\TaxRuleI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1113,8 +1101,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildTaxRule object. * - * @param ChildTaxRule $v - * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + * @param ChildTaxRule $v + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) * @throws PropelException */ public function setTaxRule(ChildTaxRule $v = null) @@ -1133,16 +1121,14 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $v->addTaxRuleI18n($this); } - return $this; } - /** * Get the associated ChildTaxRule object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTaxRule The associated ChildTaxRule object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTaxRule The associated ChildTaxRule object. * @throws PropelException */ public function getTaxRule(ConnectionInterface $con = null) @@ -1185,7 +1171,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php index 25ad51db5..9e0452aa1 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php @@ -59,9 +59,9 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TaxRuleI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\TaxRuleI18n', $modelAlias = null) { @@ -71,8 +71,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Returns a new ChildTaxRuleI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTaxRuleI18nQuery */ @@ -132,10 +132,10 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTaxRuleI18n A model object, or null if the key is not found + * @return ChildTaxRuleI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -163,8 +163,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTaxRuleI18n|array|mixed the result, formatted by the current formatter */ @@ -184,8 +184,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -206,7 +206,7 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -221,7 +221,7 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -252,11 +252,11 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * * @see filterByTaxRule() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -292,9 +292,9 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -321,9 +321,9 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' * * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -350,9 +350,9 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -373,8 +373,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRule object * - * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRule|ObjectCollection $taxRule The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -398,8 +398,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRule relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -432,11 +432,11 @@ abstract class TaxRuleI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query */ public function useTaxRuleQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -448,7 +448,7 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTaxRuleI18n $taxRuleI18n Object to remove from the list of results + * @param ChildTaxRuleI18n $taxRuleI18n Object to remove from the list of results * * @return ChildTaxRuleI18nQuery The current query, for fluid interface */ @@ -466,8 +466,8 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Deletes all rows from the tax_rule_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -498,13 +498,13 @@ abstract class TaxRuleI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTaxRuleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTaxRuleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTaxRuleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -524,7 +524,6 @@ abstract class TaxRuleI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TaxRuleI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php index 5d2743bfd..2a2a102ea 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php @@ -68,9 +68,9 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TaxRuleQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\TaxRule', $modelAlias = null) { @@ -80,8 +80,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Returns a new ChildTaxRuleQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTaxRuleQuery */ @@ -110,7 +110,7 @@ abstract class TaxRuleQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRule|array|mixed the result, formatted by the current formatter @@ -141,10 +141,10 @@ abstract class TaxRuleQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTaxRule A model object, or null if the key is not found + * @return ChildTaxRule A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTaxRule|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class TaxRuleQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,26 +214,24 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTaxRuleQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(TaxRuleTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTaxRuleQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(TaxRuleTableMap::ID, $keys, Criteria::IN); } @@ -247,11 +245,11 @@ abstract class TaxRuleQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -287,12 +285,12 @@ abstract class TaxRuleQuery extends ModelCriteria * $query->filterByIsDefault('yes'); // WHERE is_default = true * * - * @param boolean|string $isDefault The value to use as filter. - * Non-boolean arguments are converted using the following rules: - * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true - * * 0, '0', 'false', 'off', and 'no' are converted to boolean false - * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param boolean|string $isDefault The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -315,13 +313,13 @@ abstract class TaxRuleQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -358,13 +356,13 @@ abstract class TaxRuleQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -394,8 +392,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -417,8 +415,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -451,11 +449,11 @@ abstract class TaxRuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -467,8 +465,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRuleCountry object * - * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRuleCountry|ObjectCollection $taxRuleCountry the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -490,8 +488,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRuleCountry relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -524,11 +522,11 @@ abstract class TaxRuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -540,8 +538,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TaxRuleI18n object * - * @param \Thelia\Model\TaxRuleI18n|ObjectCollection $taxRuleI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TaxRuleI18n|ObjectCollection $taxRuleI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -563,8 +561,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TaxRuleI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -597,11 +595,11 @@ abstract class TaxRuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TaxRuleI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TaxRuleI18nQuery A secondary query class using the current class as primary query */ public function useTaxRuleI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -613,7 +611,7 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTaxRule $taxRule Object to remove from the list of results + * @param ChildTaxRule $taxRule Object to remove from the list of results * * @return ChildTaxRuleQuery The current query, for fluid interface */ @@ -629,8 +627,8 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Deletes all rows from the tax_rule table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -661,13 +659,13 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTaxRule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTaxRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTaxRule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -687,7 +685,6 @@ abstract class TaxRuleQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TaxRuleTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -706,9 +703,9 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -718,9 +715,9 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -730,7 +727,7 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -740,7 +737,7 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -750,7 +747,7 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -760,7 +757,7 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function firstCreatedFirst() { @@ -772,11 +769,11 @@ abstract class TaxRuleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -791,10 +788,10 @@ abstract class TaxRuleQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxRuleQuery The current query, for fluid interface + * @return ChildTaxRuleQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -811,11 +808,11 @@ abstract class TaxRuleQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTaxRuleI18nQuery A secondary query class using the current class as primary query + * @return ChildTaxRuleI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { diff --git a/core/lib/Thelia/Model/Base/Template.php b/core/lib/Thelia/Model/Base/Template.php index 88b44a7a2..bf85e3d90 100644 --- a/core/lib/Thelia/Model/Base/Template.php +++ b/core/lib/Thelia/Model/Base/Template.php @@ -40,7 +40,6 @@ abstract class Template implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TemplateTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -386,9 +385,9 @@ abstract class Template implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return Template The current object, for fluid interface */ @@ -438,11 +437,10 @@ abstract class Template implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } @@ -450,8 +448,8 @@ abstract class Template implements ActiveRecordInterface * Get the [optionally formatted] temporal [created_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -470,8 +468,8 @@ abstract class Template implements ActiveRecordInterface * Get the [optionally formatted] temporal [updated_at] column value. * * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. * * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 * @@ -489,8 +487,8 @@ abstract class Template implements ActiveRecordInterface /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function setId($v) { @@ -503,16 +501,15 @@ abstract class Template implements ActiveRecordInterface $this->modifiedColumns[TemplateTableMap::ID] = true; } - return $this; } // setId() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function setCreatedAt($v) { @@ -524,16 +521,15 @@ abstract class Template implements ActiveRecordInterface } } // if either are not null - return $this; } // setCreatedAt() /** * Sets the value of [updated_at] column to a normalized version of the date/time value specified. * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function setUpdatedAt($v) { @@ -545,7 +541,6 @@ abstract class Template implements ActiveRecordInterface } } // if either are not null - return $this; } // setUpdatedAt() @@ -637,10 +632,10 @@ abstract class Template implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -685,7 +680,7 @@ abstract class Template implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see Template::setDeleted() @@ -728,8 +723,8 @@ abstract class Template implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -790,8 +785,8 @@ abstract class Template implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -945,7 +940,7 @@ abstract class Template implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -1011,7 +1006,7 @@ abstract class Template implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -1027,12 +1022,12 @@ abstract class Template implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -1046,7 +1041,7 @@ abstract class Template implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -1073,12 +1068,12 @@ abstract class Template implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -1120,12 +1115,12 @@ abstract class Template implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -1139,8 +1134,8 @@ abstract class Template implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -1171,8 +1166,8 @@ abstract class Template implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -1196,7 +1191,6 @@ abstract class Template implements ActiveRecordInterface if ($this->isColumnModified(TemplateTableMap::ID)) $criteria->add(TemplateTableMap::ID, $this->id); if ($this->isColumnModified(TemplateTableMap::CREATED_AT)) $criteria->add(TemplateTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TemplateTableMap::UPDATED_AT)) $criteria->add(TemplateTableMap::UPDATED_AT, $this->updated_at); - return $criteria; } @@ -1218,7 +1212,7 @@ abstract class Template implements ActiveRecordInterface /** * Returns the primary key for this object (row). - * @return int + * @return int */ public function getPrimaryKey() { @@ -1228,7 +1222,7 @@ abstract class Template implements ActiveRecordInterface /** * Generic method to set the primary key (id column). * - * @param int $key Primary key. + * @param int $key Primary key. * @return void */ public function setPrimaryKey($key) @@ -1242,7 +1236,6 @@ abstract class Template implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return null === $this->getId(); } @@ -1252,9 +1245,9 @@ abstract class Template implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\Template (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\Template (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1307,8 +1300,8 @@ abstract class Template implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\Template Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\Template Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1327,7 +1320,7 @@ abstract class Template implements ActiveRecordInterface * Avoids crafting an 'init[$relationName]s' method name * that wouldn't work when StandardEnglishPluralizer is used. * - * @param string $relationName The name of the relation to initialize + * @param string $relationName The name of the relation to initialize * @return void */ public function initRelation($relationName) @@ -1375,8 +1368,8 @@ abstract class Template implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1398,8 +1391,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildProduct[] List of ChildProduct objects * @throws PropelException */ @@ -1455,15 +1448,14 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $products A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $products A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setProducts(Collection $products, ConnectionInterface $con = null) { $productsToDelete = $this->getProducts(new Criteria(), $con)->diff($products); - $this->productsScheduledForDeletion = $productsToDelete; foreach ($productsToDelete as $productRemoved) { @@ -1484,10 +1476,10 @@ abstract class Template implements ActiveRecordInterface /** * Returns the number of related Product objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Product objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Product objects. * @throws PropelException */ public function countProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1519,8 +1511,8 @@ abstract class Template implements ActiveRecordInterface * Method called to associate a ChildProduct object to this object * through the ChildProduct foreign key attribute. * - * @param ChildProduct $l ChildProduct - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param ChildProduct $l ChildProduct + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function addProduct(ChildProduct $l) { @@ -1546,7 +1538,7 @@ abstract class Template implements ActiveRecordInterface } /** - * @param Product $product The product object to remove. + * @param Product $product The product object to remove. * @return ChildTemplate The current object (for fluent API support) */ public function removeProduct($product) @@ -1564,7 +1556,6 @@ abstract class Template implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1576,9 +1567,9 @@ abstract class Template implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Template. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildProduct[] List of ChildProduct objects */ public function getProductsJoinTaxRule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1618,8 +1609,8 @@ abstract class Template implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1641,8 +1632,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildFeatureTemplate[] List of ChildFeatureTemplate objects * @throws PropelException */ @@ -1698,15 +1689,14 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $featureTemplates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $featureTemplates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setFeatureTemplates(Collection $featureTemplates, ConnectionInterface $con = null) { $featureTemplatesToDelete = $this->getFeatureTemplates(new Criteria(), $con)->diff($featureTemplates); - $this->featureTemplatesScheduledForDeletion = $featureTemplatesToDelete; foreach ($featureTemplatesToDelete as $featureTemplateRemoved) { @@ -1727,10 +1717,10 @@ abstract class Template implements ActiveRecordInterface /** * Returns the number of related FeatureTemplate objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related FeatureTemplate objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related FeatureTemplate objects. * @throws PropelException */ public function countFeatureTemplates(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -1762,8 +1752,8 @@ abstract class Template implements ActiveRecordInterface * Method called to associate a ChildFeatureTemplate object to this object * through the ChildFeatureTemplate foreign key attribute. * - * @param ChildFeatureTemplate $l ChildFeatureTemplate - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param ChildFeatureTemplate $l ChildFeatureTemplate + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function addFeatureTemplate(ChildFeatureTemplate $l) { @@ -1790,7 +1780,7 @@ abstract class Template implements ActiveRecordInterface /** * @param FeatureTemplate $featureTemplate The featureTemplate object to remove. - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function removeFeatureTemplate($featureTemplate) { @@ -1807,7 +1797,6 @@ abstract class Template implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -1819,9 +1808,9 @@ abstract class Template implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Template. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildFeatureTemplate[] List of ChildFeatureTemplate objects */ public function getFeatureTemplatesJoinFeature($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -1861,8 +1850,8 @@ abstract class Template implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -1884,8 +1873,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects * @throws PropelException */ @@ -1941,15 +1930,14 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributeTemplates A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $attributeTemplates A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setAttributeTemplates(Collection $attributeTemplates, ConnectionInterface $con = null) { $attributeTemplatesToDelete = $this->getAttributeTemplates(new Criteria(), $con)->diff($attributeTemplates); - $this->attributeTemplatesScheduledForDeletion = $attributeTemplatesToDelete; foreach ($attributeTemplatesToDelete as $attributeTemplateRemoved) { @@ -1970,10 +1958,10 @@ abstract class Template implements ActiveRecordInterface /** * Returns the number of related AttributeTemplate objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related AttributeTemplate objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related AttributeTemplate objects. * @throws PropelException */ public function countAttributeTemplates(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2005,8 +1993,8 @@ abstract class Template implements ActiveRecordInterface * Method called to associate a ChildAttributeTemplate object to this object * through the ChildAttributeTemplate foreign key attribute. * - * @param ChildAttributeTemplate $l ChildAttributeTemplate - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param ChildAttributeTemplate $l ChildAttributeTemplate + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function addAttributeTemplate(ChildAttributeTemplate $l) { @@ -2033,7 +2021,7 @@ abstract class Template implements ActiveRecordInterface /** * @param AttributeTemplate $attributeTemplate The attributeTemplate object to remove. - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function removeAttributeTemplate($attributeTemplate) { @@ -2050,7 +2038,6 @@ abstract class Template implements ActiveRecordInterface return $this; } - /** * If this collection has already been initialized with * an identical criteria, it returns the collection. @@ -2062,9 +2049,9 @@ abstract class Template implements ActiveRecordInterface * api reasonable. You can provide public methods for those you * actually need in Template. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects */ public function getAttributeTemplatesJoinAttribute($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) @@ -2104,8 +2091,8 @@ abstract class Template implements ActiveRecordInterface * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty * * @return void */ @@ -2127,8 +2114,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object * @return Collection|ChildTemplateI18n[] List of ChildTemplateI18n objects * @throws PropelException */ @@ -2184,15 +2171,14 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $templateI18ns A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $templateI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setTemplateI18ns(Collection $templateI18ns, ConnectionInterface $con = null) { $templateI18nsToDelete = $this->getTemplateI18ns(new Criteria(), $con)->diff($templateI18ns); - //since at least one column in the foreign key is at the same time a PK //we can not just set a PK to NULL in the lines below. We have to store //a backup of all values, so we are able to manipulate these items based on the onDelete value later. @@ -2216,10 +2202,10 @@ abstract class Template implements ActiveRecordInterface /** * Returns the number of related TemplateI18n objects. * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related TemplateI18n objects. + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related TemplateI18n objects. * @throws PropelException */ public function countTemplateI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) @@ -2251,8 +2237,8 @@ abstract class Template implements ActiveRecordInterface * Method called to associate a ChildTemplateI18n object to this object * through the ChildTemplateI18n foreign key attribute. * - * @param ChildTemplateI18n $l ChildTemplateI18n - * @return \Thelia\Model\Template The current object (for fluent API support) + * @param ChildTemplateI18n $l ChildTemplateI18n + * @return \Thelia\Model\Template The current object (for fluent API support) */ public function addTemplateI18n(ChildTemplateI18n $l) { @@ -2282,7 +2268,7 @@ abstract class Template implements ActiveRecordInterface } /** - * @param TemplateI18n $templateI18n The templateI18n object to remove. + * @param TemplateI18n $templateI18n The templateI18n object to remove. * @return ChildTemplate The current object (for fluent API support) */ public function removeTemplateI18n($templateI18n) @@ -2340,8 +2326,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildFeature[] List of ChildFeature objects */ @@ -2371,9 +2357,9 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $features A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $features A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setFeatures(Collection $features, ConnectionInterface $con = null) { @@ -2397,9 +2383,9 @@ abstract class Template implements ActiveRecordInterface * Gets the number of ChildFeature objects related by a many-to-many relationship * to the current object by way of the feature_template cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildFeature objects */ @@ -2427,7 +2413,7 @@ abstract class Template implements ActiveRecordInterface * Associate a ChildFeature object to this object * through the feature_template cross reference table. * - * @param ChildFeature $feature The ChildFeatureTemplate object to relate + * @param ChildFeature $feature The ChildFeatureTemplate object to relate * @return ChildTemplate The current object (for fluent API support) */ public function addFeature(ChildFeature $feature) @@ -2445,7 +2431,7 @@ abstract class Template implements ActiveRecordInterface } /** - * @param Feature $feature The feature object to add. + * @param Feature $feature The feature object to add. */ protected function doAddFeature($feature) { @@ -2464,7 +2450,7 @@ abstract class Template implements ActiveRecordInterface * Remove a ChildFeature object to this object * through the feature_template cross reference table. * - * @param ChildFeature $feature The ChildFeatureTemplate object to relate + * @param ChildFeature $feature The ChildFeatureTemplate object to relate * @return ChildTemplate The current object (for fluent API support) */ public function removeFeature(ChildFeature $feature) @@ -2523,8 +2509,8 @@ abstract class Template implements ActiveRecordInterface * If this ChildTemplate is new, it will return * an empty collection or the current collection; the criteria is ignored on a new object. * - * @param Criteria $criteria Optional query object to filter the query - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param ConnectionInterface $con Optional connection object * * @return ObjectCollection|ChildAttribute[] List of ChildAttribute objects */ @@ -2554,9 +2540,9 @@ abstract class Template implements ActiveRecordInterface * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $attributes A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildTemplate The current object (for fluent API support) + * @param Collection $attributes A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildTemplate The current object (for fluent API support) */ public function setAttributes(Collection $attributes, ConnectionInterface $con = null) { @@ -2580,9 +2566,9 @@ abstract class Template implements ActiveRecordInterface * Gets the number of ChildAttribute objects related by a many-to-many relationship * to the current object by way of the attribute_template cross-reference table. * - * @param Criteria $criteria Optional query object to filter the query - * @param boolean $distinct Set to true to force count distinct - * @param ConnectionInterface $con Optional connection object + * @param Criteria $criteria Optional query object to filter the query + * @param boolean $distinct Set to true to force count distinct + * @param ConnectionInterface $con Optional connection object * * @return int the number of related ChildAttribute objects */ @@ -2611,7 +2597,7 @@ abstract class Template implements ActiveRecordInterface * through the attribute_template cross reference table. * * @param ChildAttribute $attribute The ChildAttributeTemplate object to relate - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function addAttribute(ChildAttribute $attribute) { @@ -2628,7 +2614,7 @@ abstract class Template implements ActiveRecordInterface } /** - * @param Attribute $attribute The attribute object to add. + * @param Attribute $attribute The attribute object to add. */ protected function doAddAttribute($attribute) { @@ -2647,8 +2633,8 @@ abstract class Template implements ActiveRecordInterface * Remove a ChildAttribute object to this object * through the attribute_template cross reference table. * - * @param ChildAttribute $attribute The ChildAttributeTemplate object to relate - * @return ChildTemplate The current object (for fluent API support) + * @param ChildAttribute $attribute The ChildAttributeTemplate object to relate + * @return ChildTemplate The current object (for fluent API support) */ public function removeAttribute(ChildAttribute $attribute) { @@ -2688,7 +2674,7 @@ abstract class Template implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { @@ -2752,9 +2738,9 @@ abstract class Template implements ActiveRecordInterface /** * Sets the locale for translations * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' * - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function setLocale($locale = 'en_US') { @@ -2766,7 +2752,7 @@ abstract class Template implements ActiveRecordInterface /** * Gets the locale for translations * - * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' */ public function getLocale() { @@ -2776,8 +2762,8 @@ abstract class Template implements ActiveRecordInterface /** * Returns the current translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * * @return ChildTemplateI18n */ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) @@ -2810,10 +2796,10 @@ abstract class Template implements ActiveRecordInterface /** * Remove the translation for a given locale * - * @param string $locale Locale to use for the translation, e.g. 'fr_FR' - * @param ConnectionInterface $con an optional connection object + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object * - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) { @@ -2838,7 +2824,7 @@ abstract class Template implements ActiveRecordInterface /** * Returns the current translation * - * @param ConnectionInterface $con an optional connection object + * @param ConnectionInterface $con an optional connection object * * @return ChildTemplateI18n */ public function getCurrentTranslation(ConnectionInterface $con = null) @@ -2875,7 +2861,7 @@ abstract class Template implements ActiveRecordInterface /** * Mark the current object so that the update date doesn't get updated during next save * - * @return ChildTemplate The current object (for fluent API support) + * @return ChildTemplate The current object (for fluent API support) */ public function keepUpdateDateUnchanged() { @@ -2960,7 +2946,6 @@ abstract class Template implements ActiveRecordInterface } - /** * Derived method to catches calls to undefined methods. * diff --git a/core/lib/Thelia/Model/Base/TemplateI18n.php b/core/lib/Thelia/Model/Base/TemplateI18n.php index f6a0ba085..12d365f60 100644 --- a/core/lib/Thelia/Model/Base/TemplateI18n.php +++ b/core/lib/Thelia/Model/Base/TemplateI18n.php @@ -26,7 +26,6 @@ abstract class TemplateI18n implements ActiveRecordInterface */ const TABLE_MAP = '\\Thelia\\Model\\Map\\TemplateI18nTableMap'; - /** * attribute to determine if this object has previously been saved. * @var boolean @@ -307,9 +306,9 @@ abstract class TemplateI18n implements ActiveRecordInterface * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); * * - * @param mixed $parser A AbstractParser instance, + * @param mixed $parser A AbstractParser instance, * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from + * @param string $data The source data to import from * * @return TemplateI18n The current object, for fluid interface */ @@ -359,41 +358,38 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Get the [id] column value. * - * @return int + * @return int */ public function getId() { - return $this->id; } /** * Get the [locale] column value. * - * @return string + * @return string */ public function getLocale() { - return $this->locale; } /** * Get the [name] column value. * - * @return string + * @return string */ public function getName() { - return $this->name; } /** * Set the value of [id] column. * - * @param int $v new value - * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) + * @param int $v new value + * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) */ public function setId($v) { @@ -410,15 +406,14 @@ abstract class TemplateI18n implements ActiveRecordInterface $this->aTemplate = null; } - return $this; } // setId() /** * Set the value of [locale] column. * - * @param string $v new value - * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) */ public function setLocale($v) { @@ -431,15 +426,14 @@ abstract class TemplateI18n implements ActiveRecordInterface $this->modifiedColumns[TemplateI18nTableMap::LOCALE] = true; } - return $this; } // setLocale() /** * Set the value of [name] column. * - * @param string $v new value - * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) + * @param string $v new value + * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) */ public function setName($v) { @@ -452,7 +446,6 @@ abstract class TemplateI18n implements ActiveRecordInterface $this->modifiedColumns[TemplateI18nTableMap::NAME] = true; } - return $this; } // setName() @@ -496,7 +489,6 @@ abstract class TemplateI18n implements ActiveRecordInterface { try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TemplateI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; @@ -545,10 +537,10 @@ abstract class TemplateI18n implements ActiveRecordInterface * * This will only work if the object has been saved and has a valid primary key set. * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db */ public function reload($deep = false, ConnectionInterface $con = null) { @@ -584,7 +576,7 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Removes this object from datastore and sets delete attribute. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * @return void * @throws PropelException * @see TemplateI18n::setDeleted() @@ -627,8 +619,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * method. This method wraps all precipitate database operations in a * single transaction. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see doSave() */ @@ -678,8 +670,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * If the object is new, it inserts it; otherwise an update is performed. * All related objects are also updated in this method. * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. * @throws PropelException * @see save() */ @@ -722,7 +714,7 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Insert the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @throws PropelException * @see doSave() @@ -777,7 +769,7 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Update the row in the database. * - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return Integer Number of updated rows * @see doSave() @@ -793,12 +785,12 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Retrieves a field from the object by name passed in as a string. * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. */ public function getByName($name, $type = TableMap::TYPE_PHPNAME) { @@ -812,7 +804,7 @@ abstract class TemplateI18n implements ActiveRecordInterface * Retrieves a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema + * @param int $pos position in xml schema * @return mixed Value of field at $pos */ public function getByPosition($pos) @@ -839,12 +831,12 @@ abstract class TemplateI18n implements ActiveRecordInterface * You can specify the key type of the array by passing one of the class * type constants. * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ @@ -877,12 +869,12 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Sets a field from the object by name passed in as a string. * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. * @return void */ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) @@ -896,8 +888,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * Sets a field from the object by Position as specified in the xml schema. * Zero-based. * - * @param int $pos position in xml schema - * @param mixed $value field value + * @param int $pos position in xml schema + * @param mixed $value field value * @return void */ public function setByPosition($pos, $value) @@ -928,8 +920,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * The default key type is the column's TableMap::TYPE_PHPNAME. * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. * @return void */ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) @@ -953,7 +945,6 @@ abstract class TemplateI18n implements ActiveRecordInterface if ($this->isColumnModified(TemplateI18nTableMap::ID)) $criteria->add(TemplateI18nTableMap::ID, $this->id); if ($this->isColumnModified(TemplateI18nTableMap::LOCALE)) $criteria->add(TemplateI18nTableMap::LOCALE, $this->locale); if ($this->isColumnModified(TemplateI18nTableMap::NAME)) $criteria->add(TemplateI18nTableMap::NAME, $this->name); - return $criteria; } @@ -991,7 +982,7 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Set the [composite] primary key. * - * @param array $keys The elements of the composite key (order must match the order in XML file). + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ public function setPrimaryKey($keys) @@ -1006,7 +997,6 @@ abstract class TemplateI18n implements ActiveRecordInterface */ public function isPrimaryKeyNull() { - return (null === $this->getId()) && (null === $this->getLocale()); } @@ -1016,9 +1006,9 @@ abstract class TemplateI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param object $copyObj An object of \Thelia\Model\TemplateI18n (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @param object $copyObj An object of \Thelia\Model\TemplateI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. * @throws PropelException */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) @@ -1039,8 +1029,8 @@ abstract class TemplateI18n implements ActiveRecordInterface * If desired, this method can also make copies of all associated (fkey referrers) * objects. * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\TemplateI18n Clone of current object. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\TemplateI18n Clone of current object. * @throws PropelException */ public function copy($deepCopy = false) @@ -1056,8 +1046,8 @@ abstract class TemplateI18n implements ActiveRecordInterface /** * Declares an association between this object and a ChildTemplate object. * - * @param ChildTemplate $v - * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) + * @param ChildTemplate $v + * @return \Thelia\Model\TemplateI18n The current object (for fluent API support) * @throws PropelException */ public function setTemplate(ChildTemplate $v = null) @@ -1076,16 +1066,14 @@ abstract class TemplateI18n implements ActiveRecordInterface $v->addTemplateI18n($this); } - return $this; } - /** * Get the associated ChildTemplate object * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildTemplate The associated ChildTemplate object. + * @param ConnectionInterface $con Optional Connection object. + * @return ChildTemplate The associated ChildTemplate object. * @throws PropelException */ public function getTemplate(ConnectionInterface $con = null) @@ -1127,7 +1115,7 @@ abstract class TemplateI18n implements ActiveRecordInterface * objects with circular references (even in PHP 5.3). This is currently necessary * when using Propel in certain daemon or large-volume/high-memory operations. * - * @param boolean $deep Whether to also clear the references on all referrer objects. + * @param boolean $deep Whether to also clear the references on all referrer objects. */ public function clearAllReferences($deep = false) { diff --git a/core/lib/Thelia/Model/Base/TemplateI18nQuery.php b/core/lib/Thelia/Model/Base/TemplateI18nQuery.php index 2607e770f..8c897ef21 100644 --- a/core/lib/Thelia/Model/Base/TemplateI18nQuery.php +++ b/core/lib/Thelia/Model/Base/TemplateI18nQuery.php @@ -55,9 +55,9 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TemplateI18nQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\TemplateI18n', $modelAlias = null) { @@ -67,8 +67,8 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Returns a new ChildTemplateI18nQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTemplateI18nQuery */ @@ -128,10 +128,10 @@ abstract class TemplateI18nQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTemplateI18n A model object, or null if the key is not found + * @return ChildTemplateI18n A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -159,8 +159,8 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTemplateI18n|array|mixed the result, formatted by the current formatter */ @@ -180,8 +180,8 @@ abstract class TemplateI18nQuery extends ModelCriteria * * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -202,7 +202,7 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -217,7 +217,7 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -248,11 +248,11 @@ abstract class TemplateI18nQuery extends ModelCriteria * * @see filterByTemplate() * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -288,9 +288,9 @@ abstract class TemplateI18nQuery extends ModelCriteria * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' * * - * @param string $locale The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -317,9 +317,9 @@ abstract class TemplateI18nQuery extends ModelCriteria * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%' * * - * @param string $name The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $name The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -340,8 +340,8 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Template object * - * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -365,8 +365,8 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Template relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -399,11 +399,11 @@ abstract class TemplateI18nQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query */ public function useTemplateQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -415,7 +415,7 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTemplateI18n $templateI18n Object to remove from the list of results + * @param ChildTemplateI18n $templateI18n Object to remove from the list of results * * @return ChildTemplateI18nQuery The current query, for fluid interface */ @@ -433,8 +433,8 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Deletes all rows from the template_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -465,13 +465,13 @@ abstract class TemplateI18nQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTemplateI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTemplateI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTemplateI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -491,7 +491,6 @@ abstract class TemplateI18nQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TemplateI18nTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); diff --git a/core/lib/Thelia/Model/Base/TemplateQuery.php b/core/lib/Thelia/Model/Base/TemplateQuery.php index f6821b35d..3b2637e6e 100644 --- a/core/lib/Thelia/Model/Base/TemplateQuery.php +++ b/core/lib/Thelia/Model/Base/TemplateQuery.php @@ -68,9 +68,9 @@ abstract class TemplateQuery extends ModelCriteria /** * Initializes internal state of \Thelia\Model\Base\TemplateQuery object. * - * @param string $dbName The database name - * @param string $modelName The phpName of a model, e.g. 'Book' - * @param string $modelAlias The alias for the model in this query, e.g. 'b' + * @param string $dbName The database name + * @param string $modelName The phpName of a model, e.g. 'Book' + * @param string $modelAlias The alias for the model in this query, e.g. 'b' */ public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Template', $modelAlias = null) { @@ -80,8 +80,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Returns a new ChildTemplateQuery object. * - * @param string $modelAlias The alias of a model in the query - * @param Criteria $criteria Optional Criteria to build the query from + * @param string $modelAlias The alias of a model in the query + * @param Criteria $criteria Optional Criteria to build the query from * * @return ChildTemplateQuery */ @@ -110,7 +110,7 @@ abstract class TemplateQuery extends ModelCriteria * $obj = $c->findPk(12, $con); * * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildTemplate|array|mixed the result, formatted by the current formatter @@ -141,10 +141,10 @@ abstract class TemplateQuery extends ModelCriteria * Find object by primary key using raw SQL to go fast. * Bypass doSelect() and the object formatter by using generated code. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * - * @return ChildTemplate A model object, or null if the key is not found + * @return ChildTemplate A model object, or null if the key is not found */ protected function findPkSimple($key, $con) { @@ -171,8 +171,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Find object by primary key. * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object * * @return ChildTemplate|array|mixed the result, formatted by the current formatter */ @@ -192,8 +192,8 @@ abstract class TemplateQuery extends ModelCriteria * * $objs = $c->findPks(array(12, 56, 832), $con); * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object * * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter */ @@ -214,26 +214,24 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter the query by primary key * - * @param mixed $key Primary key to use for the query + * @param mixed $key Primary key to use for the query * * @return ChildTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKey($key) { - return $this->addUsingAlias(TemplateTableMap::ID, $key, Criteria::EQUAL); } /** * Filter the query by a list of primary keys * - * @param array $keys The list of primary key to use for the query + * @param array $keys The list of primary key to use for the query * * @return ChildTemplateQuery The current query, for fluid interface */ public function filterByPrimaryKeys($keys) { - return $this->addUsingAlias(TemplateTableMap::ID, $keys, Criteria::IN); } @@ -247,11 +245,11 @@ abstract class TemplateQuery extends ModelCriteria * $query->filterById(array('min' => 12)); // WHERE id > 12 * * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -288,13 +286,13 @@ abstract class TemplateQuery extends ModelCriteria * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' * * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -331,13 +329,13 @@ abstract class TemplateQuery extends ModelCriteria * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' * * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -367,8 +365,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\Product object * - * @param \Thelia\Model\Product|ObjectCollection $product the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\Product|ObjectCollection $product the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -390,8 +388,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the Product relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -424,11 +422,11 @@ abstract class TemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query */ public function useProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -440,8 +438,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\FeatureTemplate object * - * @param \Thelia\Model\FeatureTemplate|ObjectCollection $featureTemplate the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\FeatureTemplate|ObjectCollection $featureTemplate the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -463,8 +461,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the FeatureTemplate relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -497,11 +495,11 @@ abstract class TemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\FeatureTemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\FeatureTemplateQuery A secondary query class using the current class as primary query */ public function useFeatureTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -513,8 +511,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\AttributeTemplate object * - * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -536,8 +534,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the AttributeTemplate relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -570,11 +568,11 @@ abstract class TemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query */ public function useAttributeTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { @@ -586,8 +584,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter the query by a related \Thelia\Model\TemplateI18n object * - * @param \Thelia\Model\TemplateI18n|ObjectCollection $templateI18n the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param \Thelia\Model\TemplateI18n|ObjectCollection $templateI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -609,8 +607,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the TemplateI18n relation * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -643,11 +641,11 @@ abstract class TemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\TemplateI18nQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\TemplateI18nQuery A secondary query class using the current class as primary query */ public function useTemplateI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') { @@ -660,8 +658,8 @@ abstract class TemplateQuery extends ModelCriteria * Filter the query by a related Feature object * using the feature_template table as cross reference * - * @param Feature $feature the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Feature $feature the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -677,8 +675,8 @@ abstract class TemplateQuery extends ModelCriteria * Filter the query by a related Attribute object * using the attribute_template table as cross reference * - * @param Attribute $attribute the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param Attribute $attribute the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -693,7 +691,7 @@ abstract class TemplateQuery extends ModelCriteria /** * Exclude object from result * - * @param ChildTemplate $template Object to remove from the list of results + * @param ChildTemplate $template Object to remove from the list of results * * @return ChildTemplateQuery The current query, for fluid interface */ @@ -709,8 +707,8 @@ abstract class TemplateQuery extends ModelCriteria /** * Deletes all rows from the template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public function doDeleteAll(ConnectionInterface $con = null) { @@ -741,13 +739,13 @@ abstract class TemplateQuery extends ModelCriteria /** * Performs a DELETE on the database, given a ChildTemplate or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ChildTemplate object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ChildTemplate object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public function delete(ConnectionInterface $con = null) { @@ -767,7 +765,6 @@ abstract class TemplateQuery extends ModelCriteria // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - TemplateTableMap::removeInstanceFromPool($criteria); $affectedRows += ModelCriteria::delete($con); @@ -786,11 +783,11 @@ abstract class TemplateQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the i18n relation * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -805,10 +802,10 @@ abstract class TemplateQuery extends ModelCriteria * Adds a JOIN clause to the query and hydrates the related I18n object. * Shortcut for $c->joinI18n($locale)->with() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) { @@ -825,11 +822,11 @@ abstract class TemplateQuery extends ModelCriteria * * @see useQuery() * - * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. * - * @return ChildTemplateI18nQuery A secondary query class using the current class as primary query + * @return ChildTemplateI18nQuery A secondary query class using the current class as primary query */ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { @@ -843,9 +840,9 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter by the latest updated * - * @param int $nbDays Maximum age of the latest update in days + * @param int $nbDays Maximum age of the latest update in days * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function recentlyUpdated($nbDays = 7) { @@ -855,9 +852,9 @@ abstract class TemplateQuery extends ModelCriteria /** * Filter by the latest created * - * @param int $nbDays Maximum age of in days + * @param int $nbDays Maximum age of in days * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function recentlyCreated($nbDays = 7) { @@ -867,7 +864,7 @@ abstract class TemplateQuery extends ModelCriteria /** * Order by update date desc * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function lastUpdatedFirst() { @@ -877,7 +874,7 @@ abstract class TemplateQuery extends ModelCriteria /** * Order by update date asc * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function firstUpdatedFirst() { @@ -887,7 +884,7 @@ abstract class TemplateQuery extends ModelCriteria /** * Order by create date desc * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function lastCreatedFirst() { @@ -897,7 +894,7 @@ abstract class TemplateQuery extends ModelCriteria /** * Order by create date asc * - * @return ChildTemplateQuery The current query, for fluid interface + * @return ChildTemplateQuery The current query, for fluid interface */ public function firstCreatedFirst() { diff --git a/core/lib/Thelia/Model/Cart.php b/core/lib/Thelia/Model/Cart.php index 507b1c2e2..efd37c344 100644 --- a/core/lib/Thelia/Model/Cart.php +++ b/core/lib/Thelia/Model/Cart.php @@ -6,9 +6,6 @@ use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\Cart as BaseCart; - -use Thelia\TaxEngine\Calculator; - class Cart extends BaseCart { public function duplicate($token, Customer $customer = null) @@ -22,13 +19,13 @@ class Cart extends BaseCart // TODO : set current Currency $cart->setCurrencyId($this->getCurrencyId()); - if ($customer){ + if ($customer) { $cart->setCustomer($customer); } $cart->save(); $currentDateTime = new \DateTime(); - foreach ($cartItems as $cartItem){ + foreach ($cartItems as $cartItem) { $product = $cartItem->getProduct(); $productSaleElements = $cartItem->getProductSaleElements(); @@ -78,7 +75,7 @@ class Cart extends BaseCart { $total = 0; - foreach($this->getCartItems() as $cartItem) { + foreach ($this->getCartItems() as $cartItem) { $total += $cartItem->getRealTaxedPrice($country) * $cartItem->getQuantity(); } @@ -91,7 +88,7 @@ class Cart extends BaseCart { $total = 0; - foreach($this->getCartItems() as $cartItem) { + foreach ($this->getCartItems() as $cartItem) { $subtotal = $cartItem->getRealPrice(); $subtotal *= $cartItem->getQuantity(); @@ -107,7 +104,7 @@ class Cart extends BaseCart { $weight = 0; - foreach($this->getCartItems() as $cartItem) { + foreach ($this->getCartItems() as $cartItem) { $itemWeight = $cartItem->getProductSaleElements()->getWeight(); $itemWeight *= $cartItem->getQuantity(); diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php index 1fe266aee..7818f63d2 100644 --- a/core/lib/Thelia/Model/CartItem.php +++ b/core/lib/Thelia/Model/CartItem.php @@ -37,7 +37,6 @@ class CartItem extends BaseCartItem } } - /** * @param $value * @return $this @@ -46,16 +45,14 @@ class CartItem extends BaseCartItem { $currentQuantity = $this->getQuantity(); - if($value <= 0) - { + if ($value <= 0) { $value = $currentQuantity; } - if(ConfigQuery::checkAvailableStock()) - { + if (ConfigQuery::checkAvailableStock()) { $productSaleElements = $this->getProductSaleElements(); - if($productSaleElements->getQuantity() < $value) { + if ($productSaleElements->getQuantity() < $value) { $value = $currentQuantity; } } @@ -70,16 +67,14 @@ class CartItem extends BaseCartItem $currentQuantity = $this->getQuantity(); $newQuantity = $currentQuantity + $value; - if($value <= 0) - { + if ($value <= 0) { $value = $currentQuantity; } - if(ConfigQuery::checkAvailableStock()) - { + if (ConfigQuery::checkAvailableStock()) { $productSaleElements = $this->getProductSaleElements(); - if($productSaleElements->getQuantity() < $newQuantity) { + if ($productSaleElements->getQuantity() < $newQuantity) { $newQuantity = $currentQuantity; } } @@ -102,12 +97,14 @@ class CartItem extends BaseCartItem public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()), 2); } public function getTaxedPromoPrice(Country $country) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()), 2); } } diff --git a/core/lib/Thelia/Model/CartItemQuery.php b/core/lib/Thelia/Model/CartItemQuery.php index 152da05f9..e72745457 100644 --- a/core/lib/Thelia/Model/CartItemQuery.php +++ b/core/lib/Thelia/Model/CartItemQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CartItemQuery as BaseCartItemQuery; - /** * Skeleton subclass for performing query and update operations on the 'cart_item' table. * diff --git a/core/lib/Thelia/Model/CartQuery.php b/core/lib/Thelia/Model/CartQuery.php index fcb9a82da..f95eb09a4 100644 --- a/core/lib/Thelia/Model/CartQuery.php +++ b/core/lib/Thelia/Model/CartQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CartQuery as BaseCartQuery; - /** * Skeleton subclass for performing query and update operations on the 'cart' table. * @@ -18,5 +17,4 @@ use Thelia\Model\Base\CartQuery as BaseCartQuery; class CartQuery extends BaseCartQuery { - } // CartQuery diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index d6ac1c394..82f029e61 100644 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -5,7 +5,6 @@ namespace Thelia\Model; use Thelia\Core\Event\Category\CategoryEvent; use Thelia\Model\Base\Category as BaseCategory; - use Thelia\Core\Event\TheliaEvents; use Propel\Runtime\Connection\ConnectionInterface; @@ -28,7 +27,8 @@ class Category extends BaseCategory /** * {@inheritDoc} */ - protected function getRewrittenUrlViewName() { + protected function getRewrittenUrlViewName() + { return 'category'; } @@ -45,8 +45,7 @@ class Category extends BaseCategory $countProduct = 0; - foreach($children as $child) - { + foreach ($children as $child) { $countProduct += ProductQuery::create() ->filterByCategory($child) ->count(); @@ -58,7 +57,8 @@ class Category extends BaseCategory /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByParent($this->getParent()); } @@ -69,10 +69,10 @@ class Category extends BaseCategory ->filterByDefaultCategory(1) ->find($con); - if($productsCategories) { + if ($productsCategories) { foreach ($productsCategories as $productCategory) { $product = $productCategory->getProduct(); - if($product) { + if ($product) { $product->delete($con); } } @@ -129,6 +129,7 @@ class Category extends BaseCategory ) ); $this->deleteProducts($con); + return true; } @@ -142,7 +143,7 @@ class Category extends BaseCategory //delete all subcategories $subCategories = CategoryQuery::findAllChild($this->getId()); - foreach($subCategories as $category) { + foreach ($subCategories as $category) { if (!is_null($this->dispatcher)) { $category->setDispatcher($this->getDispatcher()); } @@ -152,4 +153,4 @@ class Category extends BaseCategory $this->dispatchEvent(TheliaEvents::AFTER_DELETECATEGORY, new CategoryEvent($this)); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/CategoryAssociatedContent.php b/core/lib/Thelia/Model/CategoryAssociatedContent.php index e5fcddc41..471520052 100644 --- a/core/lib/Thelia/Model/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/CategoryAssociatedContent.php @@ -7,8 +7,8 @@ use Thelia\Core\Event\Category\CategoryAssociatedContentEvent; use Thelia\Core\Event\TheliaEvents; use Propel\Runtime\Connection\ConnectionInterface; -class CategoryAssociatedContent extends BaseCategoryAssociatedContent { - +class CategoryAssociatedContent extends BaseCategoryAssociatedContent +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** diff --git a/core/lib/Thelia/Model/CategoryAssociatedContentQuery.php b/core/lib/Thelia/Model/CategoryAssociatedContentQuery.php index 11fc406f3..2f891eeee 100644 --- a/core/lib/Thelia/Model/CategoryAssociatedContentQuery.php +++ b/core/lib/Thelia/Model/CategoryAssociatedContentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryAssociatedContentQuery as BaseCategoryAssociatedContentQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_associated_content' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CategoryAssociatedContentQuery as BaseCategoryAssociatedCo * long as it does not already exist in the output directory. * */ -class CategoryAssociatedContentQuery extends BaseCategoryAssociatedContentQuery { - +class CategoryAssociatedContentQuery extends BaseCategoryAssociatedContentQuery +{ } // CategoryAssociatedContentQuery diff --git a/core/lib/Thelia/Model/CategoryDocument.php b/core/lib/Thelia/Model/CategoryDocument.php index 432f61bf3..a8cb463b7 100644 --- a/core/lib/Thelia/Model/CategoryDocument.php +++ b/core/lib/Thelia/Model/CategoryDocument.php @@ -13,7 +13,8 @@ class CategoryDocument extends BaseCategoryDocument /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByCategory($this->getCategory()); } @@ -58,6 +59,7 @@ class CategoryDocument extends BaseCategoryDocument "category_id" => $this->getCategoryId(), ) ); + return true; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/CategoryDocumentI18nQuery.php b/core/lib/Thelia/Model/CategoryDocumentI18nQuery.php index e17bec8c3..ab4c0849f 100644 --- a/core/lib/Thelia/Model/CategoryDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/CategoryDocumentI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryDocumentI18nQuery as BaseCategoryDocumentI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_document_i18n' table. * diff --git a/core/lib/Thelia/Model/CategoryDocumentQuery.php b/core/lib/Thelia/Model/CategoryDocumentQuery.php index 76fec35e2..9e48ca46e 100644 --- a/core/lib/Thelia/Model/CategoryDocumentQuery.php +++ b/core/lib/Thelia/Model/CategoryDocumentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryDocumentQuery as BaseCategoryDocumentQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_document' table. * diff --git a/core/lib/Thelia/Model/CategoryI18n.php b/core/lib/Thelia/Model/CategoryI18n.php index de3e38663..f3be364fc 100644 --- a/core/lib/Thelia/Model/CategoryI18n.php +++ b/core/lib/Thelia/Model/CategoryI18n.php @@ -5,7 +5,8 @@ namespace Thelia\Model; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\CategoryI18n as BaseCategoryI18n; -class CategoryI18n extends BaseCategoryI18n { +class CategoryI18n extends BaseCategoryI18n +{ public function postInsert(ConnectionInterface $con = null) { $category = $this->getCategory(); diff --git a/core/lib/Thelia/Model/CategoryI18nQuery.php b/core/lib/Thelia/Model/CategoryI18nQuery.php index 2d96d5580..11eba7564 100644 --- a/core/lib/Thelia/Model/CategoryI18nQuery.php +++ b/core/lib/Thelia/Model/CategoryI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryI18nQuery as BaseCategoryI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CategoryI18nQuery as BaseCategoryI18nQuery; * long as it does not already exist in the output directory. * */ -class CategoryI18nQuery extends BaseCategoryI18nQuery { - +class CategoryI18nQuery extends BaseCategoryI18nQuery +{ } // CategoryI18nQuery diff --git a/core/lib/Thelia/Model/CategoryImage.php b/core/lib/Thelia/Model/CategoryImage.php index 1a0b7a5fc..f21a6d37c 100644 --- a/core/lib/Thelia/Model/CategoryImage.php +++ b/core/lib/Thelia/Model/CategoryImage.php @@ -2,7 +2,6 @@ namespace Thelia\Model; - use Thelia\Model\Base\CategoryImage as BaseCategoryImage; use Propel\Runtime\Connection\ConnectionInterface; @@ -14,7 +13,8 @@ class CategoryImage extends BaseCategoryImage /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByCategory($this->getCategory()); } @@ -59,6 +59,7 @@ class CategoryImage extends BaseCategoryImage "category_id" => $this->getCategoryId(), ) ); + return true; } } diff --git a/core/lib/Thelia/Model/CategoryImageI18nQuery.php b/core/lib/Thelia/Model/CategoryImageI18nQuery.php index 9de4b313a..1823401ea 100644 --- a/core/lib/Thelia/Model/CategoryImageI18nQuery.php +++ b/core/lib/Thelia/Model/CategoryImageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryImageI18nQuery as BaseCategoryImageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_image_i18n' table. * diff --git a/core/lib/Thelia/Model/CategoryImageQuery.php b/core/lib/Thelia/Model/CategoryImageQuery.php index 4f2cc6a3d..652814ae4 100644 --- a/core/lib/Thelia/Model/CategoryImageQuery.php +++ b/core/lib/Thelia/Model/CategoryImageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryImageQuery as BaseCategoryImageQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_image' table. * diff --git a/core/lib/Thelia/Model/CategoryQuery.php b/core/lib/Thelia/Model/CategoryQuery.php index 2abb04fa4..d5053cbe5 100644 --- a/core/lib/Thelia/Model/CategoryQuery.php +++ b/core/lib/Thelia/Model/CategoryQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryQuery as BaseCategoryQuery; - /** * Skeleton subclass for performing query and update operations on the 'category' table. * @@ -15,12 +14,13 @@ use Thelia\Model\Base\CategoryQuery as BaseCategoryQuery; * long as it does not already exist in the output directory. * */ -class CategoryQuery extends BaseCategoryQuery { +class CategoryQuery extends BaseCategoryQuery +{ /** * * count how many direct children have a category * - * @param int $parent category parent id + * @param int $parent category parent id * @return int */ public static function countChild($parent) @@ -33,16 +33,16 @@ class CategoryQuery extends BaseCategoryQuery { * find all category children for a given category. an array of \Thelia\Model\Category is return * * @param $categoryId the category id or an array of id - * @param int $depth max depth you want to search - * @param int $currentPos don't change this param, it is used for recursion + * @param int $depth max depth you want to search + * @param int $currentPos don't change this param, it is used for recursion * @return \Thelia\Model\Category[] */ public static function findAllChild($categoryId, $depth = 0, $currentPos = 0) { $result = array(); - if(is_array($categoryId)) { - foreach($categoryId as $categorySingleId) { + if (is_array($categoryId)) { + foreach ($categoryId as $categorySingleId) { $result = array_merge($result, (array) self::findAllChild($categorySingleId, $depth, $currentPos)); } } else { @@ -54,7 +54,6 @@ class CategoryQuery extends BaseCategoryQuery { ->filterByParent($categoryId) ->find(); - foreach ($categories as $category) { array_push($result, $category); $result = array_merge($result, (array) self::findAllChild($category->getId(), $depth, $currentPos)); diff --git a/core/lib/Thelia/Model/CategoryVersion.php b/core/lib/Thelia/Model/CategoryVersion.php index 29f3fdafa..4a05bfdc1 100644 --- a/core/lib/Thelia/Model/CategoryVersion.php +++ b/core/lib/Thelia/Model/CategoryVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryVersion as BaseCategoryVersion; -class CategoryVersion extends BaseCategoryVersion { - +class CategoryVersion extends BaseCategoryVersion +{ } diff --git a/core/lib/Thelia/Model/CategoryVersionQuery.php b/core/lib/Thelia/Model/CategoryVersionQuery.php index 0817ad6c5..8730630fb 100644 --- a/core/lib/Thelia/Model/CategoryVersionQuery.php +++ b/core/lib/Thelia/Model/CategoryVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CategoryVersionQuery as BaseCategoryVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'category_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CategoryVersionQuery as BaseCategoryVersionQuery; * long as it does not already exist in the output directory. * */ -class CategoryVersionQuery extends BaseCategoryVersionQuery { - +class CategoryVersionQuery extends BaseCategoryVersionQuery +{ } // CategoryVersionQuery diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php index 9b44f1981..19803d9b9 100644 --- a/core/lib/Thelia/Model/Config.php +++ b/core/lib/Thelia/Model/Config.php @@ -28,8 +28,8 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\Config\ConfigEvent; -class Config extends BaseConfig { - +class Config extends BaseConfig +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** @@ -92,4 +92,4 @@ class Config extends BaseConfig { { ConfigQuery::resetCache($this->getName()); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/ConfigI18n.php b/core/lib/Thelia/Model/ConfigI18n.php index 459782a15..80c3b0929 100644 --- a/core/lib/Thelia/Model/ConfigI18n.php +++ b/core/lib/Thelia/Model/ConfigI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ConfigI18n as BaseConfigI18n; -class ConfigI18n extends BaseConfigI18n { - +class ConfigI18n extends BaseConfigI18n +{ } diff --git a/core/lib/Thelia/Model/ConfigI18nQuery.php b/core/lib/Thelia/Model/ConfigI18nQuery.php index f115a029b..33b6e1b68 100644 --- a/core/lib/Thelia/Model/ConfigI18nQuery.php +++ b/core/lib/Thelia/Model/ConfigI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ConfigI18nQuery as BaseConfigI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'config_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ConfigI18nQuery as BaseConfigI18nQuery; * long as it does not already exist in the output directory. * */ -class ConfigI18nQuery extends BaseConfigI18nQuery { - +class ConfigI18nQuery extends BaseConfigI18nQuery +{ } // ConfigI18nQuery diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php index d0c629e99..77653ade1 100644 --- a/core/lib/Thelia/Model/ConfigQuery.php +++ b/core/lib/Thelia/Model/ConfigQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ConfigQuery as BaseConfigQuery; - /** * Skeleton subclass for performing query and update operations on the 'config' table. * @@ -15,8 +14,8 @@ use Thelia\Model\Base\ConfigQuery as BaseConfigQuery; * long as it does not already exist in the output directory. * */ -class ConfigQuery extends BaseConfigQuery { - +class ConfigQuery extends BaseConfigQuery +{ protected static $cache = array(); public static function read($search, $default = null) @@ -36,7 +35,7 @@ class ConfigQuery extends BaseConfigQuery { { $config = self::create()->findOneByName($configName); - if(null == $config) { + if (null == $config) { $config = new Config(); $config->setName($configName); } @@ -52,13 +51,15 @@ class ConfigQuery extends BaseConfigQuery { public static function resetCache($key = null) { - if($key) { - if(array_key_exists($key, self::$cache)) { + if ($key) { + if (array_key_exists($key, self::$cache)) { unset(self::$cache[$key]); + return true; } } self::$cache = array(); + return true; } @@ -92,7 +93,8 @@ class ConfigQuery extends BaseConfigQuery { return self::read('check-available-stock', 1) != 0; } - public static function getUnknownFlagPath() { + public static function getUnknownFlagPath() + { return self::read('unknown-flag-path', '/assets/img/flags/unknown.png'); } /* smtp config */ diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index d8ce9457a..983580540 100644 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -22,15 +22,16 @@ class Content extends BaseContent /** * {@inheritDoc} */ - protected function getRewrittenUrlViewName() { + protected function getRewrittenUrlViewName() + { return 'content'; } /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { - + protected function addCriteriaToPositionQuery($query) + { // TODO: Find the default folder for this content, // and generate the position relative to this folder } @@ -55,7 +56,6 @@ class Content extends BaseContent return $this; } - public function updateDefaultFolder($defaultFolderId) { // Allow uncategorized content (NULL instead of 0, to bypass delete cascade constraint) @@ -118,7 +118,7 @@ class Content extends BaseContent $con->commit(); $this->dispatchEvent(TheliaEvents::AFTER_CREATECONTENT,new ContentEvent($this)); - } catch(\Exception $ex) { + } catch (\Exception $ex) { $con->rollback(); @@ -126,7 +126,6 @@ class Content extends BaseContent } } - public function preUpdate(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_UPDATECONTENT, new ContentEvent($this)); diff --git a/core/lib/Thelia/Model/ContentDocument.php b/core/lib/Thelia/Model/ContentDocument.php index 0faab1829..0ffa355d7 100644 --- a/core/lib/Thelia/Model/ContentDocument.php +++ b/core/lib/Thelia/Model/ContentDocument.php @@ -13,7 +13,8 @@ class ContentDocument extends BaseContentDocument /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByContent($this->getContent()); } @@ -58,6 +59,7 @@ class ContentDocument extends BaseContentDocument "content_id" => $this->getContentId(), ) ); + return true; } } diff --git a/core/lib/Thelia/Model/ContentDocumentI18nQuery.php b/core/lib/Thelia/Model/ContentDocumentI18nQuery.php index b235479e8..67fa6ca79 100644 --- a/core/lib/Thelia/Model/ContentDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/ContentDocumentI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentDocumentI18nQuery as BaseContentDocumentI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_document_i18n' table. * diff --git a/core/lib/Thelia/Model/ContentDocumentQuery.php b/core/lib/Thelia/Model/ContentDocumentQuery.php index f3efa047e..414322e6e 100644 --- a/core/lib/Thelia/Model/ContentDocumentQuery.php +++ b/core/lib/Thelia/Model/ContentDocumentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentDocumentQuery as BaseContentDocumentQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_document' table. * diff --git a/core/lib/Thelia/Model/ContentFolder.php b/core/lib/Thelia/Model/ContentFolder.php index 3091ca9d2..5d11d7f30 100644 --- a/core/lib/Thelia/Model/ContentFolder.php +++ b/core/lib/Thelia/Model/ContentFolder.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentFolder as BaseContentFolder; -class ContentFolder extends BaseContentFolder { - +class ContentFolder extends BaseContentFolder +{ } diff --git a/core/lib/Thelia/Model/ContentFolderQuery.php b/core/lib/Thelia/Model/ContentFolderQuery.php index 935096c15..f67b669a5 100644 --- a/core/lib/Thelia/Model/ContentFolderQuery.php +++ b/core/lib/Thelia/Model/ContentFolderQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentFolderQuery as BaseContentFolderQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_folder' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ContentFolderQuery as BaseContentFolderQuery; * long as it does not already exist in the output directory. * */ -class ContentFolderQuery extends BaseContentFolderQuery { - +class ContentFolderQuery extends BaseContentFolderQuery +{ } // ContentFolderQuery diff --git a/core/lib/Thelia/Model/ContentI18n.php b/core/lib/Thelia/Model/ContentI18n.php index 11713d57b..dd47c86de 100644 --- a/core/lib/Thelia/Model/ContentI18n.php +++ b/core/lib/Thelia/Model/ContentI18n.php @@ -5,7 +5,8 @@ namespace Thelia\Model; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\ContentI18n as BaseContentI18n; -class ContentI18n extends BaseContentI18n { +class ContentI18n extends BaseContentI18n +{ public function postInsert(ConnectionInterface $con = null) { $content = $this->getContent(); diff --git a/core/lib/Thelia/Model/ContentI18nQuery.php b/core/lib/Thelia/Model/ContentI18nQuery.php index 3c85003f4..5ab4c7a47 100644 --- a/core/lib/Thelia/Model/ContentI18nQuery.php +++ b/core/lib/Thelia/Model/ContentI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentI18nQuery as BaseContentI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ContentI18nQuery as BaseContentI18nQuery; * long as it does not already exist in the output directory. * */ -class ContentI18nQuery extends BaseContentI18nQuery { - +class ContentI18nQuery extends BaseContentI18nQuery +{ } // ContentI18nQuery diff --git a/core/lib/Thelia/Model/ContentImage.php b/core/lib/Thelia/Model/ContentImage.php index 410f48ff8..d8b919647 100644 --- a/core/lib/Thelia/Model/ContentImage.php +++ b/core/lib/Thelia/Model/ContentImage.php @@ -13,7 +13,8 @@ class ContentImage extends BaseContentImage /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByContent($this->getContent()); } @@ -58,6 +59,7 @@ class ContentImage extends BaseContentImage "content_id" => $this->getContentId(), ) ); + return true; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/ContentImageI18nQuery.php b/core/lib/Thelia/Model/ContentImageI18nQuery.php index 840e3f83e..428476979 100644 --- a/core/lib/Thelia/Model/ContentImageI18nQuery.php +++ b/core/lib/Thelia/Model/ContentImageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentImageI18nQuery as BaseContentImageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_image_i18n' table. * diff --git a/core/lib/Thelia/Model/ContentImageQuery.php b/core/lib/Thelia/Model/ContentImageQuery.php index d22d9fb3f..fc1f91fe2 100644 --- a/core/lib/Thelia/Model/ContentImageQuery.php +++ b/core/lib/Thelia/Model/ContentImageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentImageQuery as BaseContentImageQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_image' table. * diff --git a/core/lib/Thelia/Model/ContentQuery.php b/core/lib/Thelia/Model/ContentQuery.php index 6446d242a..1303fb675 100644 --- a/core/lib/Thelia/Model/ContentQuery.php +++ b/core/lib/Thelia/Model/ContentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentQuery as BaseContentQuery; - /** * Skeleton subclass for performing query and update operations on the 'content' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ContentQuery as BaseContentQuery; * long as it does not already exist in the output directory. * */ -class ContentQuery extends BaseContentQuery { - +class ContentQuery extends BaseContentQuery +{ } // ContentQuery diff --git a/core/lib/Thelia/Model/ContentVersion.php b/core/lib/Thelia/Model/ContentVersion.php index cd00d21bf..14be329d2 100644 --- a/core/lib/Thelia/Model/ContentVersion.php +++ b/core/lib/Thelia/Model/ContentVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentVersion as BaseContentVersion; -class ContentVersion extends BaseContentVersion { - +class ContentVersion extends BaseContentVersion +{ } diff --git a/core/lib/Thelia/Model/ContentVersionQuery.php b/core/lib/Thelia/Model/ContentVersionQuery.php index dd6e722cb..a9052e714 100644 --- a/core/lib/Thelia/Model/ContentVersionQuery.php +++ b/core/lib/Thelia/Model/ContentVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ContentVersionQuery as BaseContentVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'content_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ContentVersionQuery as BaseContentVersionQuery; * long as it does not already exist in the output directory. * */ -class ContentVersionQuery extends BaseContentVersionQuery { - +class ContentVersionQuery extends BaseContentVersionQuery +{ } // ContentVersionQuery diff --git a/core/lib/Thelia/Model/Country.php b/core/lib/Thelia/Model/Country.php index 5646496da..1e7748f75 100644 --- a/core/lib/Thelia/Model/Country.php +++ b/core/lib/Thelia/Model/Country.php @@ -18,7 +18,7 @@ class Country extends BaseCountry public function toggleDefault() { - if($this->getId() === null) { + if ($this->getId() === null) { throw new \RuntimeException("impossible to just uncheck default country, choose a new one"); } @@ -35,7 +35,7 @@ class Country extends BaseCountry ->save($con); $con->commit(); - } catch(PropelException $e) { + } catch (PropelException $e) { $con->rollBack(); throw $e; } @@ -45,6 +45,7 @@ class Country extends BaseCountry public function preInsert(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_CREATECOUNTRY, new CountryEvent($this)); + return true; } @@ -67,7 +68,7 @@ class Country extends BaseCountry public function preDelete(ConnectionInterface $con = null) { - if($this->getByDefault()) { + if ($this->getByDefault()) { return false; } @@ -86,7 +87,8 @@ class Country extends BaseCountry * * @throws LogicException if no default country is defined */ - public static function getDefaultCountry() { + public static function getDefaultCountry() + { $dc = CountryQuery::create()->findOneByByDefault(true); if ($dc == null) @@ -100,7 +102,8 @@ class Country extends BaseCountry * * @throws LogicException if no shop country is defined */ - public static function getShopLocation() { + public static function getShopLocation() + { $dc = CountryQuery::create()->findOneByShopCountry(true); if ($dc == null) diff --git a/core/lib/Thelia/Model/CountryI18n.php b/core/lib/Thelia/Model/CountryI18n.php index 3246be1b9..794b47e22 100644 --- a/core/lib/Thelia/Model/CountryI18n.php +++ b/core/lib/Thelia/Model/CountryI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CountryI18n as BaseCountryI18n; -class CountryI18n extends BaseCountryI18n { - +class CountryI18n extends BaseCountryI18n +{ } diff --git a/core/lib/Thelia/Model/CountryI18nQuery.php b/core/lib/Thelia/Model/CountryI18nQuery.php index d939acebb..f0bf1647c 100644 --- a/core/lib/Thelia/Model/CountryI18nQuery.php +++ b/core/lib/Thelia/Model/CountryI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CountryI18nQuery as BaseCountryI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'country_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CountryI18nQuery as BaseCountryI18nQuery; * long as it does not already exist in the output directory. * */ -class CountryI18nQuery extends BaseCountryI18nQuery { - +class CountryI18nQuery extends BaseCountryI18nQuery +{ } // CountryI18nQuery diff --git a/core/lib/Thelia/Model/CountryQuery.php b/core/lib/Thelia/Model/CountryQuery.php index 039b2942e..f5348e5f5 100644 --- a/core/lib/Thelia/Model/CountryQuery.php +++ b/core/lib/Thelia/Model/CountryQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CountryQuery as BaseCountryQuery; - /** * Skeleton subclass for performing query and update operations on the 'country' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CountryQuery as BaseCountryQuery; * long as it does not already exist in the output directory. * */ -class CountryQuery extends BaseCountryQuery { - +class CountryQuery extends BaseCountryQuery +{ } // CountryQuery diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index 55fa6445d..b0d860ba4 100644 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -24,8 +24,6 @@ namespace Thelia\Model; use Propel\Runtime\Propel; -use Thelia\Constraint\Rule\CouponRuleInterface; -use Thelia\Coupon\ConditionCollection; use Thelia\Model\Base\Coupon as BaseCoupon; use Thelia\Model\Exception\InvalidArgumentException; use Thelia\Model\Map\CouponTableMap; @@ -44,7 +42,6 @@ class Coupon extends BaseCoupon use \Thelia\Model\Tools\ModelEventDispatcherTrait; - /** * Create or Update this Coupon * @@ -65,7 +62,7 @@ class Coupon extends BaseCoupon * * @throws \Exception */ - function createOrUpdate($code, $title, array $effects, $type, $isRemovingPostage, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $defaultSerializedRule, $locale = null) + public function createOrUpdate($code, $title, array $effects, $type, $isRemovingPostage, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $defaultSerializedRule, $locale = null) { $this->setCode($code) ->setType($type) @@ -96,7 +93,7 @@ class Coupon extends BaseCoupon $this->save($con); $con->commit(); - } catch(\Exception $e) { + } catch (\Exception $e) { $con->rollback(); throw $e; } @@ -124,7 +121,7 @@ class Coupon extends BaseCoupon try { $this->save($con); $con->commit(); - } catch(\Exception $e) { + } catch (\Exception $e) { $con->rollback(); throw $e; } diff --git a/core/lib/Thelia/Model/CouponI18n.php b/core/lib/Thelia/Model/CouponI18n.php index ee34845ac..89c78fe20 100644 --- a/core/lib/Thelia/Model/CouponI18n.php +++ b/core/lib/Thelia/Model/CouponI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CouponI18n as BaseCouponI18n; -class CouponI18n extends BaseCouponI18n { - +class CouponI18n extends BaseCouponI18n +{ } diff --git a/core/lib/Thelia/Model/CouponI18nQuery.php b/core/lib/Thelia/Model/CouponI18nQuery.php index 22115b773..e6c5836a2 100644 --- a/core/lib/Thelia/Model/CouponI18nQuery.php +++ b/core/lib/Thelia/Model/CouponI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CouponI18nQuery as BaseCouponI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'coupon_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CouponI18nQuery as BaseCouponI18nQuery; * long as it does not already exist in the output directory. * */ -class CouponI18nQuery extends BaseCouponI18nQuery { - +class CouponI18nQuery extends BaseCouponI18nQuery +{ } // CouponI18nQuery diff --git a/core/lib/Thelia/Model/CouponQuery.php b/core/lib/Thelia/Model/CouponQuery.php index b03a05a12..acd852b57 100644 --- a/core/lib/Thelia/Model/CouponQuery.php +++ b/core/lib/Thelia/Model/CouponQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CouponQuery as BaseCouponQuery; - /** * Skeleton subclass for performing query and update operations on the 'coupon' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CouponQuery as BaseCouponQuery; * long as it does not already exist in the output directory. * */ -class CouponQuery extends BaseCouponQuery { - +class CouponQuery extends BaseCouponQuery +{ } // CouponQuery diff --git a/core/lib/Thelia/Model/CouponVersion.php b/core/lib/Thelia/Model/CouponVersion.php index 8203c2e81..5f9990199 100644 --- a/core/lib/Thelia/Model/CouponVersion.php +++ b/core/lib/Thelia/Model/CouponVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CouponVersion as BaseCouponVersion; -class CouponVersion extends BaseCouponVersion { - +class CouponVersion extends BaseCouponVersion +{ } diff --git a/core/lib/Thelia/Model/CouponVersionQuery.php b/core/lib/Thelia/Model/CouponVersionQuery.php index f8ad72a2c..3485a413b 100644 --- a/core/lib/Thelia/Model/CouponVersionQuery.php +++ b/core/lib/Thelia/Model/CouponVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CouponVersionQuery as BaseCouponVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'coupon_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CouponVersionQuery as BaseCouponVersionQuery; * long as it does not already exist in the output directory. * */ -class CouponVersionQuery extends BaseCouponVersionQuery { - +class CouponVersionQuery extends BaseCouponVersionQuery +{ } // CouponVersionQuery diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php index c5b77fc08..706553430 100644 --- a/core/lib/Thelia/Model/Currency.php +++ b/core/lib/Thelia/Model/Currency.php @@ -8,8 +8,8 @@ use Thelia\Core\Event\TheliaEvents; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\Currency\CurrencyEvent; -class Currency extends BaseCurrency { - +class Currency extends BaseCurrency +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; @@ -85,15 +85,15 @@ class Currency extends BaseCurrency { /** * Get the [rate] column value. * - * @return double + * @return double * @throws PropelException */ public function getRate() { - if(false === filter_var($this->rate, FILTER_VALIDATE_FLOAT)) { + if (false === filter_var($this->rate, FILTER_VALIDATE_FLOAT)) { throw new PropelException('Currency::rate is not float value'); } return $this->rate; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/CurrencyI18nQuery.php b/core/lib/Thelia/Model/CurrencyI18nQuery.php index 9e8e5623a..ba9dba054 100644 --- a/core/lib/Thelia/Model/CurrencyI18nQuery.php +++ b/core/lib/Thelia/Model/CurrencyI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CurrencyI18nQuery as BaseCurrencyI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'currency_i18n' table. * diff --git a/core/lib/Thelia/Model/CurrencyQuery.php b/core/lib/Thelia/Model/CurrencyQuery.php index ea9c5cb43..3d55651f1 100644 --- a/core/lib/Thelia/Model/CurrencyQuery.php +++ b/core/lib/Thelia/Model/CurrencyQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CurrencyQuery as BaseCurrencyQuery; - /** * Skeleton subclass for performing query and update operations on the 'currency' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CurrencyQuery as BaseCurrencyQuery; * long as it does not already exist in the output directory. * */ -class CurrencyQuery extends BaseCurrencyQuery { - +class CurrencyQuery extends BaseCurrencyQuery +{ } // CurrencyQuery diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php index 832526e6b..ed0a3707b 100644 --- a/core/lib/Thelia/Model/Customer.php +++ b/core/lib/Thelia/Model/Customer.php @@ -8,8 +8,6 @@ use Thelia\Model\Base\Customer as BaseCustomer; use Thelia\Model\Exception\InvalidArgumentException; - -use Thelia\Core\Event\CustomRefEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\User\UserInterface; @@ -35,29 +33,29 @@ class Customer extends BaseCustomer implements UserInterface use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** - * @param int $titleId customer title id (from customer_title table) - * @param string $firstname customer first name - * @param string $lastname customer last name - * @param string $address1 customer address - * @param string $address2 customer adress complement 1 - * @param string $address3 customer adress complement 2 - * @param string $phone customer phone number - * @param string $cellphone customer cellphone number - * @param string $zipcode customer zipcode - * @param string $city - * @param int $countryId customer country id (from Country table) - * @param string $email customer email, must be unique - * @param string $plainPassword customer plain password, hash is made calling setPassword method. Not mandatory parameter but an exception is thrown if customer is new without password - * @param string $lang - * @param int $reseller - * @param null $sponsor - * @param int $discount + * @param int $titleId customer title id (from customer_title table) + * @param string $firstname customer first name + * @param string $lastname customer last name + * @param string $address1 customer address + * @param string $address2 customer adress complement 1 + * @param string $address3 customer adress complement 2 + * @param string $phone customer phone number + * @param string $cellphone customer cellphone number + * @param string $zipcode customer zipcode + * @param string $city + * @param int $countryId customer country id (from Country table) + * @param string $email customer email, must be unique + * @param string $plainPassword customer plain password, hash is made calling setPassword method. Not mandatory parameter but an exception is thrown if customer is new without password + * @param string $lang + * @param int $reseller + * @param null $sponsor + * @param int $discount * @throws \Exception|\Symfony\Component\Config\Definition\Exception\Exception */ public function createOrUpdate($titleId, $firstname, $lastname, $address1, $address2, $address3, $phone, $cellphone, $zipcode, $city, $countryId, $email = null, $plainPassword = null, $lang = null, $reseller = 0, $sponsor = null, $discount = 0, $company = null, $ref = null) { $this - ->setTitleId($titleId) + ->setTitleId($titleId) ->setFirstname($firstname) ->setLastname($lastname) ->setEmail($email) @@ -68,11 +66,10 @@ class Customer extends BaseCustomer implements UserInterface ->setRef($ref) ; - if(!is_null($lang)) { + if (!is_null($lang)) { $this->setLang($lang); } - $con = Propel::getWriteConnection(CustomerTableMap::DATABASE_NAME); $con->beginTransaction(); try { @@ -121,7 +118,7 @@ class Customer extends BaseCustomer implements UserInterface $con->commit(); - } catch(PropelException $e) { + } catch (PropelException $e) { $con->rollback(); throw $e; } @@ -146,7 +143,7 @@ class Customer extends BaseCustomer implements UserInterface /** * create hash for plain password and set it in Customer object * - * @param string $password plain password before hashing + * @param string $password plain password before hashing * @throws Exception\InvalidArgumentException * @return $this|Customer */ @@ -156,18 +153,20 @@ class Customer extends BaseCustomer implements UserInterface throw new InvalidArgumentException("customer password is mandatory on creation"); } - if($password !== null && trim($password) != "") { + if ($password !== null && trim($password) != "") { $this->setAlgo("PASSWORD_BCRYPT"); + return parent::setPassword(password_hash($password, PASSWORD_BCRYPT)); } + return $this; } public function setRef($ref) { - if(null === $ref && null === $this->ref) { + if (null === $ref && null === $this->ref) { parent::setRef($this->generateRef()); - } else if(null !== $ref) { + } elseif (null !== $ref) { parent::setRef($ref); } @@ -192,8 +191,9 @@ class Customer extends BaseCustomer implements UserInterface /** * {@inheritDoc} */ - public function getUsername() { - return $this->getEmail(); + public function getUsername() + { + return $this->getEmail(); } /** @@ -201,41 +201,46 @@ class Customer extends BaseCustomer implements UserInterface */ public function checkPassword($password) { - return password_verify($password, $this->password); + return password_verify($password, $this->password); } /** * {@inheritDoc} */ - public function eraseCredentials() { - $this->setPassword(null); + public function eraseCredentials() + { + $this->setPassword(null); } /** * {@inheritDoc} */ - public function getRoles() { - return array(new Role('CUSTOMER')); + public function getRoles() + { + return array(new Role('CUSTOMER')); } /** * {@inheritDoc} */ - public function getToken() { + public function getToken() + { return $this->getRememberMeToken(); } /** * {@inheritDoc} */ - public function setToken($token) { + public function setToken($token) + { $this->setRememberMeToken($token)->save(); } /** * {@inheritDoc} */ - public function getSerial() { + public function getSerial() + { return $this->getRememberMeSerial(); } @@ -251,7 +256,8 @@ class Customer extends BaseCustomer implements UserInterface /** * {@inheritDoc} */ - public function setSerial($serial) { + public function setSerial($serial) + { $this->setRememberMeSerial($serial)->save(); } @@ -268,6 +274,7 @@ class Customer extends BaseCustomer implements UserInterface } $this->dispatchEvent(TheliaEvents::BEFORE_CREATECUSTOMER, new CustomerEvent($this)); + return true; } @@ -285,6 +292,7 @@ class Customer extends BaseCustomer implements UserInterface public function preUpdate(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_UPDATECUSTOMER, new CustomerEvent($this)); + return true; } @@ -302,6 +310,7 @@ class Customer extends BaseCustomer implements UserInterface public function preDelete(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_DELETECUSTOMER, new CustomerEvent($this)); + return true; } diff --git a/core/lib/Thelia/Model/CustomerQuery.php b/core/lib/Thelia/Model/CustomerQuery.php index 7a2f2c60e..c2f174539 100644 --- a/core/lib/Thelia/Model/CustomerQuery.php +++ b/core/lib/Thelia/Model/CustomerQuery.php @@ -5,7 +5,6 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\CustomerQuery as BaseCustomerQuery; - /** * Skeleton subclass for performing query and update operations on the 'customer' table. * @@ -16,8 +15,8 @@ use Thelia\Model\Base\CustomerQuery as BaseCustomerQuery; * long as it does not already exist in the output directory. * */ -class CustomerQuery extends BaseCustomerQuery { - +class CustomerQuery extends BaseCustomerQuery +{ public static function getCustomerByEmail($email) { return self::create()->findOneByEmail($email); @@ -28,7 +27,7 @@ class CustomerQuery extends BaseCustomerQuery { $numberOfDay = cal_days_in_month(CAL_GREGORIAN, $month, $year); $stats = array(); - for($day=1; $day<=$numberOfDay; $day++) { + for ($day=1; $day<=$numberOfDay; $day++) { $dayCustomers = self::create() ->filterByCreatedAt(sprintf("%s-%s-%s 00:00:00", $year, $month, $day), Criteria::GREATER_EQUAL) ->filterByCreatedAt(sprintf("%s-%s-%s 23:59:59", $year, $month, $day), Criteria::LESS_EQUAL) diff --git a/core/lib/Thelia/Model/CustomerTitle.php b/core/lib/Thelia/Model/CustomerTitle.php index fc30404e6..43378f62e 100644 --- a/core/lib/Thelia/Model/CustomerTitle.php +++ b/core/lib/Thelia/Model/CustomerTitle.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CustomerTitle as BaseCustomerTitle; -class CustomerTitle extends BaseCustomerTitle { - +class CustomerTitle extends BaseCustomerTitle +{ } diff --git a/core/lib/Thelia/Model/CustomerTitleI18n.php b/core/lib/Thelia/Model/CustomerTitleI18n.php index 9d93d6f0b..12018237c 100644 --- a/core/lib/Thelia/Model/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/CustomerTitleI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CustomerTitleI18n as BaseCustomerTitleI18n; -class CustomerTitleI18n extends BaseCustomerTitleI18n { - +class CustomerTitleI18n extends BaseCustomerTitleI18n +{ } diff --git a/core/lib/Thelia/Model/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/CustomerTitleI18nQuery.php index 3ee224179..0b30d874b 100644 --- a/core/lib/Thelia/Model/CustomerTitleI18nQuery.php +++ b/core/lib/Thelia/Model/CustomerTitleI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CustomerTitleI18nQuery as BaseCustomerTitleI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'customer_title_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CustomerTitleI18nQuery as BaseCustomerTitleI18nQuery; * long as it does not already exist in the output directory. * */ -class CustomerTitleI18nQuery extends BaseCustomerTitleI18nQuery { - +class CustomerTitleI18nQuery extends BaseCustomerTitleI18nQuery +{ } // CustomerTitleI18nQuery diff --git a/core/lib/Thelia/Model/CustomerTitleQuery.php b/core/lib/Thelia/Model/CustomerTitleQuery.php index 8eec87864..5fd1633bb 100644 --- a/core/lib/Thelia/Model/CustomerTitleQuery.php +++ b/core/lib/Thelia/Model/CustomerTitleQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\CustomerTitleQuery as BaseCustomerTitleQuery; - /** * Skeleton subclass for performing query and update operations on the 'customer_title' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\CustomerTitleQuery as BaseCustomerTitleQuery; * long as it does not already exist in the output directory. * */ -class CustomerTitleQuery extends BaseCustomerTitleQuery { - +class CustomerTitleQuery extends BaseCustomerTitleQuery +{ } // CustomerTitleQuery diff --git a/core/lib/Thelia/Model/Exception/InvalidArgumentException.php b/core/lib/Thelia/Model/Exception/InvalidArgumentException.php index a7cb0b367..ab8ca49c9 100644 --- a/core/lib/Thelia/Model/Exception/InvalidArgumentException.php +++ b/core/lib/Thelia/Model/Exception/InvalidArgumentException.php @@ -22,6 +22,5 @@ /*************************************************************************************/ namespace Thelia\Model\Exception; - class InvalidArgumentException extends ModelException -{} \ No newline at end of file +{} diff --git a/core/lib/Thelia/Model/Exception/ModelException.php b/core/lib/Thelia/Model/Exception/ModelException.php index 4dca757cb..505a3068c 100644 --- a/core/lib/Thelia/Model/Exception/ModelException.php +++ b/core/lib/Thelia/Model/Exception/ModelException.php @@ -22,7 +22,6 @@ /*************************************************************************************/ namespace Thelia\Model\Exception; - class ModelException extends \RuntimeException { -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/Feature.php b/core/lib/Thelia/Model/Feature.php index 2627d5190..1e643db70 100644 --- a/core/lib/Thelia/Model/Feature.php +++ b/core/lib/Thelia/Model/Feature.php @@ -7,8 +7,8 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\Feature\FeatureEvent; -class Feature extends BaseFeature { - +class Feature extends BaseFeature +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; diff --git a/core/lib/Thelia/Model/FeatureAv.php b/core/lib/Thelia/Model/FeatureAv.php index 8d21b4cb1..5a7b5c4e8 100644 --- a/core/lib/Thelia/Model/FeatureAv.php +++ b/core/lib/Thelia/Model/FeatureAv.php @@ -7,8 +7,8 @@ use Thelia\Core\Event\TheliaEvents; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\Feature\FeatureAvEvent; -class FeatureAv extends BaseFeatureAv { - +class FeatureAv extends BaseFeatureAv +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; @@ -16,7 +16,8 @@ class FeatureAv extends BaseFeatureAv { /** * when dealing with position, be sure to work insite the current feature. */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByFeatureId($this->getFeatureId()); } diff --git a/core/lib/Thelia/Model/FeatureAvI18n.php b/core/lib/Thelia/Model/FeatureAvI18n.php index 1cb81bf2d..34eee66ba 100644 --- a/core/lib/Thelia/Model/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/FeatureAvI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureAvI18n as BaseFeatureAvI18n; -class FeatureAvI18n extends BaseFeatureAvI18n { - +class FeatureAvI18n extends BaseFeatureAvI18n +{ } diff --git a/core/lib/Thelia/Model/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/FeatureAvI18nQuery.php index cb3cb34c2..2fce2b289 100644 --- a/core/lib/Thelia/Model/FeatureAvI18nQuery.php +++ b/core/lib/Thelia/Model/FeatureAvI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureAvI18nQuery as BaseFeatureAvI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature_av_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FeatureAvI18nQuery as BaseFeatureAvI18nQuery; * long as it does not already exist in the output directory. * */ -class FeatureAvI18nQuery extends BaseFeatureAvI18nQuery { - +class FeatureAvI18nQuery extends BaseFeatureAvI18nQuery +{ } // FeatureAvI18nQuery diff --git a/core/lib/Thelia/Model/FeatureAvQuery.php b/core/lib/Thelia/Model/FeatureAvQuery.php index f217cd24f..a4399b891 100644 --- a/core/lib/Thelia/Model/FeatureAvQuery.php +++ b/core/lib/Thelia/Model/FeatureAvQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureAvQuery as BaseFeatureAvQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature_av' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FeatureAvQuery as BaseFeatureAvQuery; * long as it does not already exist in the output directory. * */ -class FeatureAvQuery extends BaseFeatureAvQuery { - +class FeatureAvQuery extends BaseFeatureAvQuery +{ } // FeatureAvQuery diff --git a/core/lib/Thelia/Model/FeatureI18n.php b/core/lib/Thelia/Model/FeatureI18n.php index 26a85e13a..70ff17710 100644 --- a/core/lib/Thelia/Model/FeatureI18n.php +++ b/core/lib/Thelia/Model/FeatureI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureI18n as BaseFeatureI18n; -class FeatureI18n extends BaseFeatureI18n { - +class FeatureI18n extends BaseFeatureI18n +{ } diff --git a/core/lib/Thelia/Model/FeatureI18nQuery.php b/core/lib/Thelia/Model/FeatureI18nQuery.php index 270fd8ab1..4b53a7f88 100644 --- a/core/lib/Thelia/Model/FeatureI18nQuery.php +++ b/core/lib/Thelia/Model/FeatureI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureI18nQuery as BaseFeatureI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FeatureI18nQuery as BaseFeatureI18nQuery; * long as it does not already exist in the output directory. * */ -class FeatureI18nQuery extends BaseFeatureI18nQuery { - +class FeatureI18nQuery extends BaseFeatureI18nQuery +{ } // FeatureI18nQuery diff --git a/core/lib/Thelia/Model/FeatureProductQuery.php b/core/lib/Thelia/Model/FeatureProductQuery.php index 2eb3e3697..4f25a164c 100644 --- a/core/lib/Thelia/Model/FeatureProductQuery.php +++ b/core/lib/Thelia/Model/FeatureProductQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureProductQuery as BaseFeatureProductQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature_product' table. * diff --git a/core/lib/Thelia/Model/FeatureQuery.php b/core/lib/Thelia/Model/FeatureQuery.php index 1991402ea..3263dbe05 100644 --- a/core/lib/Thelia/Model/FeatureQuery.php +++ b/core/lib/Thelia/Model/FeatureQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureQuery as BaseFeatureQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FeatureQuery as BaseFeatureQuery; * long as it does not already exist in the output directory. * */ -class FeatureQuery extends BaseFeatureQuery { - +class FeatureQuery extends BaseFeatureQuery +{ } // FeatureQuery diff --git a/core/lib/Thelia/Model/FeatureTemplateQuery.php b/core/lib/Thelia/Model/FeatureTemplateQuery.php index 43693692a..327e9b35c 100644 --- a/core/lib/Thelia/Model/FeatureTemplateQuery.php +++ b/core/lib/Thelia/Model/FeatureTemplateQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FeatureTemplateQuery as BaseFeatureTemplateQuery; - /** * Skeleton subclass for performing query and update operations on the 'feature_template' table. * diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index 1189a44e4..e8bc43498 100644 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -19,7 +19,8 @@ class Folder extends BaseFolder /** * {@inheritDoc} */ - protected function getRewrittenUrlViewName() { + protected function getRewrittenUrlViewName() + { return 'folder'; } @@ -44,8 +45,7 @@ class Folder extends BaseFolder $contentsCount = 0; - foreach($children as $child) - { + foreach ($children as $child) { $contentsCount += ContentQuery::create() ->filterByFolder($child) ->count(); @@ -58,7 +58,8 @@ class Folder extends BaseFolder /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByParent($this->getParent()); } @@ -99,6 +100,7 @@ class Folder extends BaseFolder "parent" => $this->getParent(), ) ); + return true; } diff --git a/core/lib/Thelia/Model/FolderDocument.php b/core/lib/Thelia/Model/FolderDocument.php index 9940c3eed..3fce9450f 100644 --- a/core/lib/Thelia/Model/FolderDocument.php +++ b/core/lib/Thelia/Model/FolderDocument.php @@ -13,7 +13,8 @@ class FolderDocument extends BaseFolderDocument /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByFolder($this->getFolder()); } @@ -58,6 +59,7 @@ class FolderDocument extends BaseFolderDocument "folder_id" => $this->getFolderId(), ) ); + return true; } } diff --git a/core/lib/Thelia/Model/FolderDocumentI18nQuery.php b/core/lib/Thelia/Model/FolderDocumentI18nQuery.php index 355df38da..5af78ecaf 100644 --- a/core/lib/Thelia/Model/FolderDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/FolderDocumentI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderDocumentI18nQuery as BaseFolderDocumentI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_document_i18n' table. * diff --git a/core/lib/Thelia/Model/FolderDocumentQuery.php b/core/lib/Thelia/Model/FolderDocumentQuery.php index 397437930..146d27acd 100644 --- a/core/lib/Thelia/Model/FolderDocumentQuery.php +++ b/core/lib/Thelia/Model/FolderDocumentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderDocumentQuery as BaseFolderDocumentQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_document' table. * diff --git a/core/lib/Thelia/Model/FolderI18n.php b/core/lib/Thelia/Model/FolderI18n.php index 7ede39502..e42ba3cf0 100644 --- a/core/lib/Thelia/Model/FolderI18n.php +++ b/core/lib/Thelia/Model/FolderI18n.php @@ -5,8 +5,8 @@ namespace Thelia\Model; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\FolderI18n as BaseFolderI18n; -class FolderI18n extends BaseFolderI18n { - +class FolderI18n extends BaseFolderI18n +{ public function postInsert(ConnectionInterface $con = null) { $folder = $this->getFolder(); diff --git a/core/lib/Thelia/Model/FolderI18nQuery.php b/core/lib/Thelia/Model/FolderI18nQuery.php index 49b451f38..8f8cb5d10 100644 --- a/core/lib/Thelia/Model/FolderI18nQuery.php +++ b/core/lib/Thelia/Model/FolderI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderI18nQuery as BaseFolderI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FolderI18nQuery as BaseFolderI18nQuery; * long as it does not already exist in the output directory. * */ -class FolderI18nQuery extends BaseFolderI18nQuery { - +class FolderI18nQuery extends BaseFolderI18nQuery +{ } // FolderI18nQuery diff --git a/core/lib/Thelia/Model/FolderImage.php b/core/lib/Thelia/Model/FolderImage.php index 32b9180ed..8c66e98d2 100644 --- a/core/lib/Thelia/Model/FolderImage.php +++ b/core/lib/Thelia/Model/FolderImage.php @@ -13,7 +13,8 @@ class FolderImage extends BaseFolderImage /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByFolder($this->getFolder()); } @@ -58,6 +59,7 @@ class FolderImage extends BaseFolderImage "folder_id" => $this->getFolderId(), ) ); + return true; } } diff --git a/core/lib/Thelia/Model/FolderImageI18nQuery.php b/core/lib/Thelia/Model/FolderImageI18nQuery.php index afde25368..3f1008463 100644 --- a/core/lib/Thelia/Model/FolderImageI18nQuery.php +++ b/core/lib/Thelia/Model/FolderImageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderImageI18nQuery as BaseFolderImageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_image_i18n' table. * diff --git a/core/lib/Thelia/Model/FolderImageQuery.php b/core/lib/Thelia/Model/FolderImageQuery.php index 7a4f4164c..d00df7c69 100644 --- a/core/lib/Thelia/Model/FolderImageQuery.php +++ b/core/lib/Thelia/Model/FolderImageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderImageQuery as BaseFolderImageQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_image' table. * diff --git a/core/lib/Thelia/Model/FolderQuery.php b/core/lib/Thelia/Model/FolderQuery.php index 949cbbc43..12e0235b9 100644 --- a/core/lib/Thelia/Model/FolderQuery.php +++ b/core/lib/Thelia/Model/FolderQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderQuery as BaseFolderQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder' table. * @@ -21,7 +20,7 @@ class FolderQuery extends BaseFolderQuery * * count how many direct contents a folder has * - * @param int $parent folder id + * @param int $parent folder id * @return int */ public static function countChild($parent) @@ -33,16 +32,16 @@ class FolderQuery extends BaseFolderQuery * find all contents for a given folder. * * @param $folderId the folder id or an array of id - * @param int $depth max depth you want to search - * @param int $currentPosition don't change this param, it is used for recursion + * @param int $depth max depth you want to search + * @param int $currentPosition don't change this param, it is used for recursion * @return \Thelia\Model\Folder[] */ public static function findAllChild($folderId, $depth = 0, $currentPosition = 0) { $result = array(); - if(is_array($folderId)) { - foreach($folderId as $folderSingleId) { + if (is_array($folderId)) { + foreach ($folderId as $folderSingleId) { $result = array_merge($result, (array) self::findAllChild($folderSingleId, $depth, $currentPosition)); } } else { @@ -54,7 +53,6 @@ class FolderQuery extends BaseFolderQuery ->filterByParent($folderId) ->find(); - foreach ($categories as $folder) { array_push($result, $folder); $result = array_merge($result, (array) self::findAllChild($folder->getId(), $depth, $currentPosition)); diff --git a/core/lib/Thelia/Model/FolderVersion.php b/core/lib/Thelia/Model/FolderVersion.php index e28f9a0ee..9dd261728 100644 --- a/core/lib/Thelia/Model/FolderVersion.php +++ b/core/lib/Thelia/Model/FolderVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderVersion as BaseFolderVersion; -class FolderVersion extends BaseFolderVersion { - +class FolderVersion extends BaseFolderVersion +{ } diff --git a/core/lib/Thelia/Model/FolderVersionQuery.php b/core/lib/Thelia/Model/FolderVersionQuery.php index 8f2110d7e..1ba50896e 100644 --- a/core/lib/Thelia/Model/FolderVersionQuery.php +++ b/core/lib/Thelia/Model/FolderVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\FolderVersionQuery as BaseFolderVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'folder_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\FolderVersionQuery as BaseFolderVersionQuery; * long as it does not already exist in the output directory. * */ -class FolderVersionQuery extends BaseFolderVersionQuery { - +class FolderVersionQuery extends BaseFolderVersionQuery +{ } // FolderVersionQuery diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php index f4f524e97..a6a138a65 100644 --- a/core/lib/Thelia/Model/Lang.php +++ b/core/lib/Thelia/Model/Lang.php @@ -14,27 +14,25 @@ use Thelia\Model\Base\Lang as BaseLang; use Thelia\Model\Map\LangTableMap; -class Lang extends BaseLang { - +class Lang extends BaseLang +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** * Return the default language object, using a local variable to cache it. * * @throws \RuntimeException */ - public static function getDefaultLanguage() { - - + public static function getDefaultLanguage() + { $default_lang = LangQuery::create()->findOneByByDefault(1); if ($default_lang == null) throw new \RuntimeException("No default language is defined. Please define one."); - return $default_lang; } public function toggleDefault() { - if($this->getId() === null) { + if ($this->getId() === null) { throw new \RuntimeException("impossible to just uncheck default language, choose a new one"); } $con = Propel::getWriteConnection(LangTableMap::DATABASE_NAME); @@ -49,14 +47,15 @@ class Lang extends BaseLang { ->save($con); $con->commit(); - } catch(PropelException $e) { + } catch (PropelException $e) { $con->rollBack(); throw $e; } } - protected function fixMissingFlag() { + protected function fixMissingFlag() + { // Be sure that a lang have a flag, otherwise copy the // "unknown" flag $adminTemplate = TemplateHelper::getInstance()->getActiveAdminTemplate(); diff --git a/core/lib/Thelia/Model/LangQuery.php b/core/lib/Thelia/Model/LangQuery.php index ecdd85e7d..a8adb4f10 100644 --- a/core/lib/Thelia/Model/LangQuery.php +++ b/core/lib/Thelia/Model/LangQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\LangQuery as BaseLangQuery; - /** * Skeleton subclass for performing query and update operations on the 'lang' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\LangQuery as BaseLangQuery; * long as it does not already exist in the output directory. * */ -class LangQuery extends BaseLangQuery { - +class LangQuery extends BaseLangQuery +{ } // LangQuery diff --git a/core/lib/Thelia/Model/Map/AccessoryTableMap.php b/core/lib/Thelia/Model/Map/AccessoryTableMap.php index 8f32fa987..d2b6b6d90 100644 --- a/core/lib/Thelia/Model/Map/AccessoryTableMap.php +++ b/core/lib/Thelia/Model/Map/AccessoryTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Accessory; use Thelia\Model\AccessoryQuery; - /** * This class defines the structure of the 'accessory' table. * @@ -191,7 +190,7 @@ class AccessoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -211,13 +210,12 @@ class AccessoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -233,8 +231,8 @@ class AccessoryTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -251,8 +249,8 @@ class AccessoryTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Accessory object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Accessory object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -276,10 +274,10 @@ class AccessoryTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -312,10 +310,10 @@ class AccessoryTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -341,7 +339,7 @@ class AccessoryTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -362,13 +360,13 @@ class AccessoryTableMap extends TableMap /** * Performs a DELETE on the database, given a Accessory or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Accessory object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Accessory object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -401,8 +399,8 @@ class AccessoryTableMap extends TableMap /** * Deletes all rows from the accessory table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -412,11 +410,11 @@ class AccessoryTableMap extends TableMap /** * Performs an INSERT on the database, given a Accessory or Criteria object. * - * @param mixed $criteria Criteria or Accessory object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Accessory object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -434,7 +432,6 @@ class AccessoryTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AccessoryTableMap::ID.')'); } - // Set the correct dbName $query = AccessoryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AddressTableMap.php b/core/lib/Thelia/Model/Map/AddressTableMap.php index a85353a10..a1bbbee59 100644 --- a/core/lib/Thelia/Model/Map/AddressTableMap.php +++ b/core/lib/Thelia/Model/Map/AddressTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Address; use Thelia\Model\AddressQuery; - /** * This class defines the structure of the 'address' table. * @@ -265,7 +264,7 @@ class AddressTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -285,13 +284,12 @@ class AddressTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -307,8 +305,8 @@ class AddressTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -325,8 +323,8 @@ class AddressTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Address object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Address object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -350,10 +348,10 @@ class AddressTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -386,10 +384,10 @@ class AddressTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -439,7 +437,7 @@ class AddressTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -460,13 +458,13 @@ class AddressTableMap extends TableMap /** * Performs a DELETE on the database, given a Address or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Address object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Address object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -499,8 +497,8 @@ class AddressTableMap extends TableMap /** * Deletes all rows from the address table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -510,11 +508,11 @@ class AddressTableMap extends TableMap /** * Performs an INSERT on the database, given a Address or Criteria object. * - * @param mixed $criteria Criteria or Address object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Address object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -532,7 +530,6 @@ class AddressTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AddressTableMap::ID.')'); } - // Set the correct dbName $query = AddressQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AdminLogTableMap.php b/core/lib/Thelia/Model/Map/AdminLogTableMap.php index 5da91b3ee..db2b22b0a 100644 --- a/core/lib/Thelia/Model/Map/AdminLogTableMap.php +++ b/core/lib/Thelia/Model/Map/AdminLogTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AdminLog; use Thelia\Model\AdminLogQuery; - /** * This class defines the structure of the 'admin_log' table. * @@ -212,7 +211,7 @@ class AdminLogTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -232,13 +231,12 @@ class AdminLogTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -254,8 +252,8 @@ class AdminLogTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -272,8 +270,8 @@ class AdminLogTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AdminLog object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AdminLog object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -297,10 +295,10 @@ class AdminLogTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -333,10 +331,10 @@ class AdminLogTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -370,7 +368,7 @@ class AdminLogTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -391,13 +389,13 @@ class AdminLogTableMap extends TableMap /** * Performs a DELETE on the database, given a AdminLog or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AdminLog object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AdminLog object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -430,8 +428,8 @@ class AdminLogTableMap extends TableMap /** * Deletes all rows from the admin_log table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -441,11 +439,11 @@ class AdminLogTableMap extends TableMap /** * Performs an INSERT on the database, given a AdminLog or Criteria object. * - * @param mixed $criteria Criteria or AdminLog object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AdminLog object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -463,7 +461,6 @@ class AdminLogTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AdminLogTableMap::ID.')'); } - // Set the correct dbName $query = AdminLogQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AdminTableMap.php b/core/lib/Thelia/Model/Map/AdminTableMap.php index 2010f9a9c..5191e1315 100644 --- a/core/lib/Thelia/Model/Map/AdminTableMap.php +++ b/core/lib/Thelia/Model/Map/AdminTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Admin; use Thelia\Model\AdminQuery; - /** * This class defines the structure of the 'admin' table. * @@ -231,7 +230,7 @@ class AdminTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -251,13 +250,12 @@ class AdminTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -273,8 +271,8 @@ class AdminTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -291,8 +289,8 @@ class AdminTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Admin object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Admin object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -316,10 +314,10 @@ class AdminTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -352,10 +350,10 @@ class AdminTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -395,7 +393,7 @@ class AdminTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -416,13 +414,13 @@ class AdminTableMap extends TableMap /** * Performs a DELETE on the database, given a Admin or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Admin object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Admin object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -455,8 +453,8 @@ class AdminTableMap extends TableMap /** * Deletes all rows from the admin table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -466,11 +464,11 @@ class AdminTableMap extends TableMap /** * Performs an INSERT on the database, given a Admin or Criteria object. * - * @param mixed $criteria Criteria or Admin object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Admin object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -488,7 +486,6 @@ class AdminTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AdminTableMap::ID.')'); } - // Set the correct dbName $query = AdminQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AreaDeliveryModuleTableMap.php b/core/lib/Thelia/Model/Map/AreaDeliveryModuleTableMap.php index ac064bc17..7ebfe43db 100644 --- a/core/lib/Thelia/Model/Map/AreaDeliveryModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/AreaDeliveryModuleTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AreaDeliveryModule; use Thelia\Model\AreaDeliveryModuleQuery; - /** * This class defines the structure of the 'area_delivery_module' table. * @@ -184,7 +183,7 @@ class AreaDeliveryModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -204,13 +203,12 @@ class AreaDeliveryModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -226,8 +224,8 @@ class AreaDeliveryModuleTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -244,8 +242,8 @@ class AreaDeliveryModuleTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AreaDeliveryModule object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AreaDeliveryModule object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -269,10 +267,10 @@ class AreaDeliveryModuleTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -305,10 +303,10 @@ class AreaDeliveryModuleTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -332,7 +330,7 @@ class AreaDeliveryModuleTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -353,13 +351,13 @@ class AreaDeliveryModuleTableMap extends TableMap /** * Performs a DELETE on the database, given a AreaDeliveryModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AreaDeliveryModule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AreaDeliveryModule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -392,8 +390,8 @@ class AreaDeliveryModuleTableMap extends TableMap /** * Deletes all rows from the area_delivery_module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -403,11 +401,11 @@ class AreaDeliveryModuleTableMap extends TableMap /** * Performs an INSERT on the database, given a AreaDeliveryModule or Criteria object. * - * @param mixed $criteria Criteria or AreaDeliveryModule object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AreaDeliveryModule object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -425,7 +423,6 @@ class AreaDeliveryModuleTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AreaDeliveryModuleTableMap::ID.')'); } - // Set the correct dbName $query = AreaDeliveryModuleQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AreaTableMap.php b/core/lib/Thelia/Model/Map/AreaTableMap.php index 1c0bfee4f..90557587a 100644 --- a/core/lib/Thelia/Model/Map/AreaTableMap.php +++ b/core/lib/Thelia/Model/Map/AreaTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Area; use Thelia\Model\AreaQuery; - /** * This class defines the structure of the 'area' table. * @@ -194,7 +193,7 @@ class AreaTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -214,13 +213,12 @@ class AreaTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -236,8 +234,8 @@ class AreaTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -254,8 +252,8 @@ class AreaTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Area object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Area object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -279,10 +277,10 @@ class AreaTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -315,10 +313,10 @@ class AreaTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -342,7 +340,7 @@ class AreaTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -363,13 +361,13 @@ class AreaTableMap extends TableMap /** * Performs a DELETE on the database, given a Area or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Area object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Area object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -402,8 +400,8 @@ class AreaTableMap extends TableMap /** * Deletes all rows from the area table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -413,11 +411,11 @@ class AreaTableMap extends TableMap /** * Performs an INSERT on the database, given a Area or Criteria object. * - * @param mixed $criteria Criteria or Area object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Area object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -435,7 +433,6 @@ class AreaTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AreaTableMap::ID.')'); } - // Set the correct dbName $query = AreaQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php index 041fa5b07..d0eb59dc8 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AttributeAvI18n; use Thelia\Model\AttributeAvI18nQuery; - /** * This class defines the structure of the 'attribute_av_i18n' table. * @@ -176,7 +175,7 @@ class AttributeAvI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\AttributeAvI18n $obj A \Thelia\Model\AttributeAvI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class AttributeAvI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class AttributeAvI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class AttributeAvI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class AttributeAvI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AttributeAvI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AttributeAvI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class AttributeAvI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class AttributeAvI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class AttributeAvI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class AttributeAvI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a AttributeAvI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AttributeAvI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AttributeAvI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class AttributeAvI18nTableMap extends TableMap /** * Deletes all rows from the attribute_av_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class AttributeAvI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a AttributeAvI18n or Criteria object. * - * @param mixed $criteria Criteria or AttributeAvI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AttributeAvI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class AttributeAvI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from AttributeAvI18n object } - // Set the correct dbName $query = AttributeAvI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php index 1064fb94b..88cd17550 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AttributeAv; use Thelia\Model\AttributeAvQuery; - /** * This class defines the structure of the 'attribute_av' table. * @@ -205,7 +204,7 @@ class AttributeAvTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -225,13 +224,12 @@ class AttributeAvTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -247,8 +245,8 @@ class AttributeAvTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -265,8 +263,8 @@ class AttributeAvTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AttributeAv object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AttributeAv object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -290,10 +288,10 @@ class AttributeAvTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -326,10 +324,10 @@ class AttributeAvTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -353,7 +351,7 @@ class AttributeAvTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -374,13 +372,13 @@ class AttributeAvTableMap extends TableMap /** * Performs a DELETE on the database, given a AttributeAv or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AttributeAv object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AttributeAv object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -413,8 +411,8 @@ class AttributeAvTableMap extends TableMap /** * Deletes all rows from the attribute_av table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -424,11 +422,11 @@ class AttributeAvTableMap extends TableMap /** * Performs an INSERT on the database, given a AttributeAv or Criteria object. * - * @param mixed $criteria Criteria or AttributeAv object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AttributeAv object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -446,7 +444,6 @@ class AttributeAvTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeAvTableMap::ID.')'); } - // Set the correct dbName $query = AttributeAvQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php index 0881dccc4..cc8dfd655 100644 --- a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AttributeCombination; use Thelia\Model\AttributeCombinationQuery; - /** * This class defines the structure of the 'attribute_combination' table. * @@ -185,7 +184,7 @@ class AttributeCombinationTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\AttributeCombination $obj A \Thelia\Model\AttributeCombination object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -238,7 +237,7 @@ class AttributeCombinationTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class AttributeCombinationTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -276,8 +274,8 @@ class AttributeCombinationTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -294,8 +292,8 @@ class AttributeCombinationTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AttributeCombination object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AttributeCombination object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -319,10 +317,10 @@ class AttributeCombinationTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -355,10 +353,10 @@ class AttributeCombinationTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -382,7 +380,7 @@ class AttributeCombinationTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -403,13 +401,13 @@ class AttributeCombinationTableMap extends TableMap /** * Performs a DELETE on the database, given a AttributeCombination or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AttributeCombination object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AttributeCombination object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -453,8 +451,8 @@ class AttributeCombinationTableMap extends TableMap /** * Deletes all rows from the attribute_combination table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -464,11 +462,11 @@ class AttributeCombinationTableMap extends TableMap /** * Performs an INSERT on the database, given a AttributeCombination or Criteria object. * - * @param mixed $criteria Criteria or AttributeCombination object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AttributeCombination object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -482,7 +480,6 @@ class AttributeCombinationTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from AttributeCombination object } - // Set the correct dbName $query = AttributeCombinationQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php index 1b4059076..c392f9e56 100644 --- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AttributeI18n; use Thelia\Model\AttributeI18nQuery; - /** * This class defines the structure of the 'attribute_i18n' table. * @@ -176,7 +175,7 @@ class AttributeI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\AttributeI18n $obj A \Thelia\Model\AttributeI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class AttributeI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class AttributeI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class AttributeI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class AttributeI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AttributeI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AttributeI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class AttributeI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class AttributeI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class AttributeI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class AttributeI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a AttributeI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AttributeI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AttributeI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class AttributeI18nTableMap extends TableMap /** * Deletes all rows from the attribute_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class AttributeI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a AttributeI18n or Criteria object. * - * @param mixed $criteria Criteria or AttributeI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AttributeI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class AttributeI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from AttributeI18n object } - // Set the correct dbName $query = AttributeI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php index e7aae7f83..828c93680 100644 --- a/core/lib/Thelia/Model/Map/AttributeTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Attribute; use Thelia\Model\AttributeQuery; - /** * This class defines the structure of the 'attribute' table. * @@ -203,7 +202,7 @@ class AttributeTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -223,13 +222,12 @@ class AttributeTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -245,8 +243,8 @@ class AttributeTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -263,8 +261,8 @@ class AttributeTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Attribute object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Attribute object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -288,10 +286,10 @@ class AttributeTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -324,10 +322,10 @@ class AttributeTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -349,7 +347,7 @@ class AttributeTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -370,13 +368,13 @@ class AttributeTableMap extends TableMap /** * Performs a DELETE on the database, given a Attribute or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Attribute object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Attribute object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -409,8 +407,8 @@ class AttributeTableMap extends TableMap /** * Deletes all rows from the attribute table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -420,11 +418,11 @@ class AttributeTableMap extends TableMap /** * Performs an INSERT on the database, given a Attribute or Criteria object. * - * @param mixed $criteria Criteria or Attribute object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Attribute object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -442,7 +440,6 @@ class AttributeTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeTableMap::ID.')'); } - // Set the correct dbName $query = AttributeQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php b/core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php index f3a6823ea..49e2bf16f 100644 --- a/core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\AttributeTemplate; use Thelia\Model\AttributeTemplateQuery; - /** * This class defines the structure of the 'attribute_template' table. * @@ -191,7 +190,7 @@ class AttributeTemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -211,13 +210,12 @@ class AttributeTemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -233,8 +231,8 @@ class AttributeTemplateTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -251,8 +249,8 @@ class AttributeTemplateTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (AttributeTemplate object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (AttributeTemplate object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -276,10 +274,10 @@ class AttributeTemplateTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -312,10 +310,10 @@ class AttributeTemplateTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -341,7 +339,7 @@ class AttributeTemplateTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -362,13 +360,13 @@ class AttributeTemplateTableMap extends TableMap /** * Performs a DELETE on the database, given a AttributeTemplate or Criteria object OR a primary key value. * - * @param mixed $values Criteria or AttributeTemplate object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or AttributeTemplate object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -401,8 +399,8 @@ class AttributeTemplateTableMap extends TableMap /** * Deletes all rows from the attribute_template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -412,11 +410,11 @@ class AttributeTemplateTableMap extends TableMap /** * Performs an INSERT on the database, given a AttributeTemplate or Criteria object. * - * @param mixed $criteria Criteria or AttributeTemplate object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or AttributeTemplate object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -434,7 +432,6 @@ class AttributeTemplateTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeTemplateTableMap::ID.')'); } - // Set the correct dbName $query = AttributeTemplateQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CartItemTableMap.php b/core/lib/Thelia/Model/Map/CartItemTableMap.php index ab5a188da..246b919b5 100644 --- a/core/lib/Thelia/Model/Map/CartItemTableMap.php +++ b/core/lib/Thelia/Model/Map/CartItemTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CartItem; use Thelia\Model\CartItemQuery; - /** * This class defines the structure of the 'cart_item' table. * @@ -221,7 +220,7 @@ class CartItemTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -241,13 +240,12 @@ class CartItemTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -263,8 +261,8 @@ class CartItemTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -281,8 +279,8 @@ class CartItemTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CartItem object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CartItem object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -306,10 +304,10 @@ class CartItemTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -342,10 +340,10 @@ class CartItemTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -381,7 +379,7 @@ class CartItemTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -402,13 +400,13 @@ class CartItemTableMap extends TableMap /** * Performs a DELETE on the database, given a CartItem or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CartItem object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CartItem object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -441,8 +439,8 @@ class CartItemTableMap extends TableMap /** * Deletes all rows from the cart_item table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -452,11 +450,11 @@ class CartItemTableMap extends TableMap /** * Performs an INSERT on the database, given a CartItem or Criteria object. * - * @param mixed $criteria Criteria or CartItem object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CartItem object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class CartItemTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CartItemTableMap::ID.')'); } - // Set the correct dbName $query = CartItemQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CartTableMap.php b/core/lib/Thelia/Model/Map/CartTableMap.php index 7769c721e..56b12ad81 100644 --- a/core/lib/Thelia/Model/Map/CartTableMap.php +++ b/core/lib/Thelia/Model/Map/CartTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Cart; use Thelia\Model\CartQuery; - /** * This class defines the structure of the 'cart' table. * @@ -220,7 +219,7 @@ class CartTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -240,13 +239,12 @@ class CartTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -262,8 +260,8 @@ class CartTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -280,8 +278,8 @@ class CartTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Cart object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Cart object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -305,10 +303,10 @@ class CartTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -341,10 +339,10 @@ class CartTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -376,7 +374,7 @@ class CartTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -397,13 +395,13 @@ class CartTableMap extends TableMap /** * Performs a DELETE on the database, given a Cart or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Cart object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Cart object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -436,8 +434,8 @@ class CartTableMap extends TableMap /** * Deletes all rows from the cart table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -447,11 +445,11 @@ class CartTableMap extends TableMap /** * Performs an INSERT on the database, given a Cart or Criteria object. * - * @param mixed $criteria Criteria or Cart object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Cart object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -469,7 +467,6 @@ class CartTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CartTableMap::ID.')'); } - // Set the correct dbName $query = CartQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php b/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php index f761d3a54..20726e88b 100644 --- a/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryAssociatedContent; use Thelia\Model\CategoryAssociatedContentQuery; - /** * This class defines the structure of the 'category_associated_content' table. * @@ -190,7 +189,7 @@ class CategoryAssociatedContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -210,13 +209,12 @@ class CategoryAssociatedContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -232,8 +230,8 @@ class CategoryAssociatedContentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -250,8 +248,8 @@ class CategoryAssociatedContentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryAssociatedContent object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryAssociatedContent object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -275,10 +273,10 @@ class CategoryAssociatedContentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -311,10 +309,10 @@ class CategoryAssociatedContentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -340,7 +338,7 @@ class CategoryAssociatedContentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -361,13 +359,13 @@ class CategoryAssociatedContentTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryAssociatedContent or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryAssociatedContent object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -400,8 +398,8 @@ class CategoryAssociatedContentTableMap extends TableMap /** * Deletes all rows from the category_associated_content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -411,11 +409,11 @@ class CategoryAssociatedContentTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryAssociatedContent or Criteria object. * - * @param mixed $criteria Criteria or CategoryAssociatedContent object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryAssociatedContent object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -433,7 +431,6 @@ class CategoryAssociatedContentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CategoryAssociatedContentTableMap::ID.')'); } - // Set the correct dbName $query = CategoryAssociatedContentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php index 3ba1d060f..c41d4a943 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryDocumentI18n; use Thelia\Model\CategoryDocumentI18nQuery; - /** * This class defines the structure of the 'category_document_i18n' table. * @@ -176,7 +175,7 @@ class CategoryDocumentI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CategoryDocumentI18n $obj A \Thelia\Model\CategoryDocumentI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class CategoryDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class CategoryDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class CategoryDocumentI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class CategoryDocumentI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryDocumentI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryDocumentI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class CategoryDocumentI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class CategoryDocumentI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class CategoryDocumentI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class CategoryDocumentI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class CategoryDocumentI18nTableMap extends TableMap /** * Deletes all rows from the category_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class CategoryDocumentI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryDocumentI18n or Criteria object. * - * @param mixed $criteria Criteria or CategoryDocumentI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryDocumentI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class CategoryDocumentI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CategoryDocumentI18n object } - // Set the correct dbName $query = CategoryDocumentI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php index c0e1970c3..97c903299 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryDocument; use Thelia\Model\CategoryDocumentQuery; - /** * This class defines the structure of the 'category_document' table. * @@ -209,7 +208,7 @@ class CategoryDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class CategoryDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class CategoryDocumentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class CategoryDocumentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryDocument object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryDocument object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class CategoryDocumentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class CategoryDocumentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class CategoryDocumentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class CategoryDocumentTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class CategoryDocumentTableMap extends TableMap /** * Deletes all rows from the category_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class CategoryDocumentTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryDocument or Criteria object. * - * @param mixed $criteria Criteria or CategoryDocument object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryDocument object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class CategoryDocumentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CategoryDocumentTableMap::ID.')'); } - // Set the correct dbName $query = CategoryDocumentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php index ebfdefbcd..3431d5703 100644 --- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryI18n; use Thelia\Model\CategoryI18nQuery; - /** * This class defines the structure of the 'category_i18n' table. * @@ -194,7 +193,7 @@ class CategoryI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CategoryI18n $obj A \Thelia\Model\CategoryI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class CategoryI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class CategoryI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class CategoryI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class CategoryI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class CategoryI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class CategoryI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class CategoryI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class CategoryI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class CategoryI18nTableMap extends TableMap /** * Deletes all rows from the category_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class CategoryI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryI18n or Criteria object. * - * @param mixed $criteria Criteria or CategoryI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class CategoryI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CategoryI18n object } - // Set the correct dbName $query = CategoryI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php index 38c456f46..1faea04f8 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryImageI18n; use Thelia\Model\CategoryImageI18nQuery; - /** * This class defines the structure of the 'category_image_i18n' table. * @@ -176,7 +175,7 @@ class CategoryImageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CategoryImageI18n $obj A \Thelia\Model\CategoryImageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class CategoryImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class CategoryImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class CategoryImageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class CategoryImageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryImageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryImageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class CategoryImageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class CategoryImageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class CategoryImageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class CategoryImageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class CategoryImageI18nTableMap extends TableMap /** * Deletes all rows from the category_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class CategoryImageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryImageI18n or Criteria object. * - * @param mixed $criteria Criteria or CategoryImageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryImageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class CategoryImageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CategoryImageI18n object } - // Set the correct dbName $query = CategoryImageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php index c6199c978..2de7ffdb4 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryImage; use Thelia\Model\CategoryImageQuery; - /** * This class defines the structure of the 'category_image' table. * @@ -209,7 +208,7 @@ class CategoryImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class CategoryImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class CategoryImageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class CategoryImageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryImage object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryImage object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class CategoryImageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class CategoryImageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class CategoryImageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class CategoryImageTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class CategoryImageTableMap extends TableMap /** * Deletes all rows from the category_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class CategoryImageTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryImage or Criteria object. * - * @param mixed $criteria Criteria or CategoryImage object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryImage object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class CategoryImageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CategoryImageTableMap::ID.')'); } - // Set the correct dbName $query = CategoryImageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php index 19c7486cb..62665baac 100644 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Category; use Thelia\Model\CategoryQuery; - /** * This class defines the structure of the 'category' table. * @@ -238,7 +237,7 @@ class CategoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class CategoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -280,8 +278,8 @@ class CategoryTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -298,8 +296,8 @@ class CategoryTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Category object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Category object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -323,10 +321,10 @@ class CategoryTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -359,10 +357,10 @@ class CategoryTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -394,7 +392,7 @@ class CategoryTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -415,13 +413,13 @@ class CategoryTableMap extends TableMap /** * Performs a DELETE on the database, given a Category or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Category object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Category object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -454,8 +452,8 @@ class CategoryTableMap extends TableMap /** * Deletes all rows from the category table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -465,11 +463,11 @@ class CategoryTableMap extends TableMap /** * Performs an INSERT on the database, given a Category or Criteria object. * - * @param mixed $criteria Criteria or Category object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Category object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -487,7 +485,6 @@ class CategoryTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CategoryTableMap::ID.')'); } - // Set the correct dbName $query = CategoryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php b/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php index 0d9cd2180..3734030d9 100644 --- a/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CategoryVersion; use Thelia\Model\CategoryVersionQuery; - /** * This class defines the structure of the 'category_version' table. * @@ -194,7 +193,7 @@ class CategoryVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CategoryVersion $obj A \Thelia\Model\CategoryVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class CategoryVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class CategoryVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class CategoryVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class CategoryVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CategoryVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CategoryVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class CategoryVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class CategoryVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class CategoryVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class CategoryVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a CategoryVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CategoryVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CategoryVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class CategoryVersionTableMap extends TableMap /** * Deletes all rows from the category_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class CategoryVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a CategoryVersion or Criteria object. * - * @param mixed $criteria Criteria or CategoryVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CategoryVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class CategoryVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CategoryVersion object } - // Set the correct dbName $query = CategoryVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php index 0c759e497..577e8fd76 100644 --- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ConfigI18n; use Thelia\Model\ConfigI18nQuery; - /** * This class defines the structure of the 'config_i18n' table. * @@ -176,7 +175,7 @@ class ConfigI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ConfigI18n $obj A \Thelia\Model\ConfigI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ConfigI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ConfigI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ConfigI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ConfigI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ConfigI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ConfigI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ConfigI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ConfigI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ConfigI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ConfigI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ConfigI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ConfigI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ConfigI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ConfigI18nTableMap extends TableMap /** * Deletes all rows from the config_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ConfigI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ConfigI18n or Criteria object. * - * @param mixed $criteria Criteria or ConfigI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ConfigI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ConfigI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ConfigI18n object } - // Set the correct dbName $query = ConfigI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php index 0d8271134..4486273d4 100644 --- a/core/lib/Thelia/Model/Map/ConfigTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Config; use Thelia\Model\ConfigQuery; - /** * This class defines the structure of the 'config' table. * @@ -214,7 +213,7 @@ class ConfigTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -234,13 +233,12 @@ class ConfigTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -256,8 +254,8 @@ class ConfigTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -274,8 +272,8 @@ class ConfigTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Config object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Config object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -299,10 +297,10 @@ class ConfigTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -335,10 +333,10 @@ class ConfigTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -366,7 +364,7 @@ class ConfigTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -387,13 +385,13 @@ class ConfigTableMap extends TableMap /** * Performs a DELETE on the database, given a Config or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Config object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Config object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -426,8 +424,8 @@ class ConfigTableMap extends TableMap /** * Deletes all rows from the config table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -437,11 +435,11 @@ class ConfigTableMap extends TableMap /** * Performs an INSERT on the database, given a Config or Criteria object. * - * @param mixed $criteria Criteria or Config object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Config object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -459,7 +457,6 @@ class ConfigTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ConfigTableMap::ID.')'); } - // Set the correct dbName $query = ConfigQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php index efaad427c..ed503421b 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentDocumentI18n; use Thelia\Model\ContentDocumentI18nQuery; - /** * This class defines the structure of the 'content_document_i18n' table. * @@ -176,7 +175,7 @@ class ContentDocumentI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ContentDocumentI18n $obj A \Thelia\Model\ContentDocumentI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ContentDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ContentDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ContentDocumentI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ContentDocumentI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentDocumentI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentDocumentI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ContentDocumentI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ContentDocumentI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ContentDocumentI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ContentDocumentI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ContentDocumentI18nTableMap extends TableMap /** * Deletes all rows from the content_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ContentDocumentI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentDocumentI18n or Criteria object. * - * @param mixed $criteria Criteria or ContentDocumentI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentDocumentI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ContentDocumentI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ContentDocumentI18n object } - // Set the correct dbName $query = ContentDocumentI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php index 4e2cf4000..b4cbf2abd 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentDocument; use Thelia\Model\ContentDocumentQuery; - /** * This class defines the structure of the 'content_document' table. * @@ -209,7 +208,7 @@ class ContentDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class ContentDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class ContentDocumentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class ContentDocumentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentDocument object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentDocument object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class ContentDocumentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class ContentDocumentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class ContentDocumentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class ContentDocumentTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class ContentDocumentTableMap extends TableMap /** * Deletes all rows from the content_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class ContentDocumentTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentDocument or Criteria object. * - * @param mixed $criteria Criteria or ContentDocument object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentDocument object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class ContentDocumentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ContentDocumentTableMap::ID.')'); } - // Set the correct dbName $query = ContentDocumentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php index 459f8f959..ca69b4986 100644 --- a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentFolder; use Thelia\Model\ContentFolderQuery; - /** * This class defines the structure of the 'content_folder' table. * @@ -185,7 +184,7 @@ class ContentFolderTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ContentFolder $obj A \Thelia\Model\ContentFolder object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -238,7 +237,7 @@ class ContentFolderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class ContentFolderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -276,8 +274,8 @@ class ContentFolderTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -294,8 +292,8 @@ class ContentFolderTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentFolder object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentFolder object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -319,10 +317,10 @@ class ContentFolderTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -355,10 +353,10 @@ class ContentFolderTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -382,7 +380,7 @@ class ContentFolderTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -403,13 +401,13 @@ class ContentFolderTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentFolder or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentFolder object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentFolder object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -452,8 +450,8 @@ class ContentFolderTableMap extends TableMap /** * Deletes all rows from the content_folder table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -463,11 +461,11 @@ class ContentFolderTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentFolder or Criteria object. * - * @param mixed $criteria Criteria or ContentFolder object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentFolder object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -481,7 +479,6 @@ class ContentFolderTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ContentFolder object } - // Set the correct dbName $query = ContentFolderQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php index 703c7c902..0f6aba2d6 100644 --- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentI18n; use Thelia\Model\ContentI18nQuery; - /** * This class defines the structure of the 'content_i18n' table. * @@ -194,7 +193,7 @@ class ContentI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ContentI18n $obj A \Thelia\Model\ContentI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class ContentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class ContentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class ContentI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class ContentI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class ContentI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class ContentI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class ContentI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class ContentI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class ContentI18nTableMap extends TableMap /** * Deletes all rows from the content_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class ContentI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentI18n or Criteria object. * - * @param mixed $criteria Criteria or ContentI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class ContentI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ContentI18n object } - // Set the correct dbName $query = ContentI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php index f95f9f048..ee0c50b5d 100644 --- a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentImageI18n; use Thelia\Model\ContentImageI18nQuery; - /** * This class defines the structure of the 'content_image_i18n' table. * @@ -176,7 +175,7 @@ class ContentImageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ContentImageI18n $obj A \Thelia\Model\ContentImageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ContentImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ContentImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ContentImageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ContentImageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentImageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentImageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ContentImageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ContentImageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ContentImageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ContentImageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ContentImageI18nTableMap extends TableMap /** * Deletes all rows from the content_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ContentImageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentImageI18n or Criteria object. * - * @param mixed $criteria Criteria or ContentImageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentImageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ContentImageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ContentImageI18n object } - // Set the correct dbName $query = ContentImageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php index 8494b354f..35611d524 100644 --- a/core/lib/Thelia/Model/Map/ContentImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentImage; use Thelia\Model\ContentImageQuery; - /** * This class defines the structure of the 'content_image' table. * @@ -209,7 +208,7 @@ class ContentImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class ContentImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class ContentImageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class ContentImageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentImage object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentImage object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class ContentImageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class ContentImageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class ContentImageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class ContentImageTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class ContentImageTableMap extends TableMap /** * Deletes all rows from the content_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class ContentImageTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentImage or Criteria object. * - * @param mixed $criteria Criteria or ContentImage object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentImage object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class ContentImageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ContentImageTableMap::ID.')'); } - // Set the correct dbName $query = ContentImageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php index 0f3b056c6..0b253acb2 100644 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Content; use Thelia\Model\ContentQuery; - /** * This class defines the structure of the 'content' table. * @@ -234,7 +233,7 @@ class ContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -254,13 +253,12 @@ class ContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -276,8 +274,8 @@ class ContentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -294,8 +292,8 @@ class ContentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Content object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Content object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -319,10 +317,10 @@ class ContentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -355,10 +353,10 @@ class ContentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -388,7 +386,7 @@ class ContentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -409,13 +407,13 @@ class ContentTableMap extends TableMap /** * Performs a DELETE on the database, given a Content or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Content object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Content object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -448,8 +446,8 @@ class ContentTableMap extends TableMap /** * Deletes all rows from the content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -459,11 +457,11 @@ class ContentTableMap extends TableMap /** * Performs an INSERT on the database, given a Content or Criteria object. * - * @param mixed $criteria Criteria or Content object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Content object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -481,7 +479,6 @@ class ContentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ContentTableMap::ID.')'); } - // Set the correct dbName $query = ContentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ContentVersionTableMap.php b/core/lib/Thelia/Model/Map/ContentVersionTableMap.php index 4c0d7a1b8..e8c8c8ac6 100644 --- a/core/lib/Thelia/Model/Map/ContentVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ContentVersion; use Thelia\Model\ContentVersionQuery; - /** * This class defines the structure of the 'content_version' table. * @@ -188,7 +187,7 @@ class ContentVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ContentVersion $obj A \Thelia\Model\ContentVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -241,7 +240,7 @@ class ContentVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -261,13 +260,12 @@ class ContentVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -279,8 +277,8 @@ class ContentVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -297,8 +295,8 @@ class ContentVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ContentVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ContentVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -322,10 +320,10 @@ class ContentVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -358,10 +356,10 @@ class ContentVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -391,7 +389,7 @@ class ContentVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -412,13 +410,13 @@ class ContentVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a ContentVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ContentVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ContentVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -461,8 +459,8 @@ class ContentVersionTableMap extends TableMap /** * Deletes all rows from the content_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -472,11 +470,11 @@ class ContentVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a ContentVersion or Criteria object. * - * @param mixed $criteria Criteria or ContentVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ContentVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -490,7 +488,6 @@ class ContentVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ContentVersion object } - // Set the correct dbName $query = ContentVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php index d34589486..02d8d0095 100644 --- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CountryI18n; use Thelia\Model\CountryI18nQuery; - /** * This class defines the structure of the 'country_i18n' table. * @@ -176,7 +175,7 @@ class CountryI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CountryI18n $obj A \Thelia\Model\CountryI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class CountryI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class CountryI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class CountryI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class CountryI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CountryI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CountryI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class CountryI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class CountryI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class CountryI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class CountryI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CountryI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CountryI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CountryI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class CountryI18nTableMap extends TableMap /** * Deletes all rows from the country_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class CountryI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CountryI18n or Criteria object. * - * @param mixed $criteria Criteria or CountryI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CountryI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class CountryI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CountryI18n object } - // Set the correct dbName $query = CountryI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php index 8ec8e5999..2906b5d0f 100644 --- a/core/lib/Thelia/Model/Map/CountryTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Country; use Thelia\Model\CountryQuery; - /** * This class defines the structure of the 'country' table. * @@ -230,7 +229,7 @@ class CountryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -250,13 +249,12 @@ class CountryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -272,8 +270,8 @@ class CountryTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -290,8 +288,8 @@ class CountryTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Country object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Country object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -315,10 +313,10 @@ class CountryTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -351,10 +349,10 @@ class CountryTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -386,7 +384,7 @@ class CountryTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -407,13 +405,13 @@ class CountryTableMap extends TableMap /** * Performs a DELETE on the database, given a Country or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Country object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Country object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -446,8 +444,8 @@ class CountryTableMap extends TableMap /** * Deletes all rows from the country table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -457,11 +455,11 @@ class CountryTableMap extends TableMap /** * Performs an INSERT on the database, given a Country or Criteria object. * - * @param mixed $criteria Criteria or Country object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Country object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -479,7 +477,6 @@ class CountryTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CountryTableMap::ID.')'); } - // Set the correct dbName $query = CountryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php index 6f8d2e938..c4f33389a 100644 --- a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CouponI18n; use Thelia\Model\CouponI18nQuery; - /** * This class defines the structure of the 'coupon_i18n' table. * @@ -170,7 +169,7 @@ class CouponI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CouponI18n $obj A \Thelia\Model\CouponI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -223,7 +222,7 @@ class CouponI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -243,13 +242,12 @@ class CouponI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -261,8 +259,8 @@ class CouponI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -279,8 +277,8 @@ class CouponI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CouponI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CouponI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -304,10 +302,10 @@ class CouponI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -340,10 +338,10 @@ class CouponI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -367,7 +365,7 @@ class CouponI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -388,13 +386,13 @@ class CouponI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CouponI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CouponI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CouponI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -437,8 +435,8 @@ class CouponI18nTableMap extends TableMap /** * Deletes all rows from the coupon_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -448,11 +446,11 @@ class CouponI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CouponI18n or Criteria object. * - * @param mixed $criteria Criteria or CouponI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CouponI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -466,7 +464,6 @@ class CouponI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CouponI18n object } - // Set the correct dbName $query = CouponI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index d18038790..bfd2b0535 100644 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Coupon; use Thelia\Model\CouponQuery; - /** * This class defines the structure of the 'coupon' table. * @@ -265,7 +264,7 @@ class CouponTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -285,13 +284,12 @@ class CouponTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -307,8 +305,8 @@ class CouponTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -325,8 +323,8 @@ class CouponTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Coupon object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Coupon object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -350,10 +348,10 @@ class CouponTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -386,10 +384,10 @@ class CouponTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -433,7 +431,7 @@ class CouponTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -454,13 +452,13 @@ class CouponTableMap extends TableMap /** * Performs a DELETE on the database, given a Coupon or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Coupon object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Coupon object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -493,8 +491,8 @@ class CouponTableMap extends TableMap /** * Deletes all rows from the coupon table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -504,11 +502,11 @@ class CouponTableMap extends TableMap /** * Performs an INSERT on the database, given a Coupon or Criteria object. * - * @param mixed $criteria Criteria or Coupon object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Coupon object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -526,7 +524,6 @@ class CouponTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CouponTableMap::ID.')'); } - // Set the correct dbName $query = CouponQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php index e111d1682..3f58a2231 100644 --- a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CouponVersion; use Thelia\Model\CouponVersionQuery; - /** * This class defines the structure of the 'coupon_version' table. * @@ -230,7 +229,7 @@ class CouponVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CouponVersion $obj A \Thelia\Model\CouponVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -283,7 +282,7 @@ class CouponVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -303,13 +302,12 @@ class CouponVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -321,8 +319,8 @@ class CouponVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -339,8 +337,8 @@ class CouponVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CouponVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CouponVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -364,10 +362,10 @@ class CouponVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -400,10 +398,10 @@ class CouponVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -447,7 +445,7 @@ class CouponVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -468,13 +466,13 @@ class CouponVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a CouponVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CouponVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CouponVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -517,8 +515,8 @@ class CouponVersionTableMap extends TableMap /** * Deletes all rows from the coupon_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -528,11 +526,11 @@ class CouponVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a CouponVersion or Criteria object. * - * @param mixed $criteria Criteria or CouponVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CouponVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -546,7 +544,6 @@ class CouponVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CouponVersion object } - // Set the correct dbName $query = CouponVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php index 3625eea9e..f0c68cdfd 100644 --- a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CurrencyI18n; use Thelia\Model\CurrencyI18nQuery; - /** * This class defines the structure of the 'currency_i18n' table. * @@ -158,7 +157,7 @@ class CurrencyI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CurrencyI18n $obj A \Thelia\Model\CurrencyI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -211,7 +210,7 @@ class CurrencyI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -231,13 +230,12 @@ class CurrencyI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -249,8 +247,8 @@ class CurrencyI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -267,8 +265,8 @@ class CurrencyI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CurrencyI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CurrencyI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -292,10 +290,10 @@ class CurrencyI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -328,10 +326,10 @@ class CurrencyI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -351,7 +349,7 @@ class CurrencyI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -372,13 +370,13 @@ class CurrencyI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CurrencyI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CurrencyI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CurrencyI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -421,8 +419,8 @@ class CurrencyI18nTableMap extends TableMap /** * Deletes all rows from the currency_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -432,11 +430,11 @@ class CurrencyI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CurrencyI18n or Criteria object. * - * @param mixed $criteria Criteria or CurrencyI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CurrencyI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -450,7 +448,6 @@ class CurrencyI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CurrencyI18n object } - // Set the correct dbName $query = CurrencyI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php index 61a6fb711..d6e3a7d55 100644 --- a/core/lib/Thelia/Model/Map/CurrencyTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Currency; use Thelia\Model\CurrencyQuery; - /** * This class defines the structure of the 'currency' table. * @@ -225,7 +224,7 @@ class CurrencyTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -245,13 +244,12 @@ class CurrencyTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -267,8 +265,8 @@ class CurrencyTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class CurrencyTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Currency object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Currency object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class CurrencyTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class CurrencyTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -379,7 +377,7 @@ class CurrencyTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -400,13 +398,13 @@ class CurrencyTableMap extends TableMap /** * Performs a DELETE on the database, given a Currency or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Currency object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Currency object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -439,8 +437,8 @@ class CurrencyTableMap extends TableMap /** * Deletes all rows from the currency table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -450,11 +448,11 @@ class CurrencyTableMap extends TableMap /** * Performs an INSERT on the database, given a Currency or Criteria object. * - * @param mixed $criteria Criteria or Currency object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Currency object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -472,7 +470,6 @@ class CurrencyTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CurrencyTableMap::ID.')'); } - // Set the correct dbName $query = CurrencyQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CustomerTableMap.php b/core/lib/Thelia/Model/Map/CustomerTableMap.php index 14e14e330..47bac0909 100644 --- a/core/lib/Thelia/Model/Map/CustomerTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Customer; use Thelia\Model\CustomerQuery; - /** * This class defines the structure of the 'customer' table. * @@ -262,7 +261,7 @@ class CustomerTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -282,13 +281,12 @@ class CustomerTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -304,8 +302,8 @@ class CustomerTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -322,8 +320,8 @@ class CustomerTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Customer object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Customer object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -347,10 +345,10 @@ class CustomerTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -383,10 +381,10 @@ class CustomerTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -432,7 +430,7 @@ class CustomerTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -453,13 +451,13 @@ class CustomerTableMap extends TableMap /** * Performs a DELETE on the database, given a Customer or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Customer object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Customer object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -492,8 +490,8 @@ class CustomerTableMap extends TableMap /** * Deletes all rows from the customer table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -503,11 +501,11 @@ class CustomerTableMap extends TableMap /** * Performs an INSERT on the database, given a Customer or Criteria object. * - * @param mixed $criteria Criteria or Customer object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Customer object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -525,7 +523,6 @@ class CustomerTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CustomerTableMap::ID.')'); } - // Set the correct dbName $query = CustomerQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php index c731a1227..fd7ac9a9b 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CustomerTitleI18n; use Thelia\Model\CustomerTitleI18nQuery; - /** * This class defines the structure of the 'customer_title_i18n' table. * @@ -164,7 +163,7 @@ class CustomerTitleI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\CustomerTitleI18n $obj A \Thelia\Model\CustomerTitleI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -217,7 +216,7 @@ class CustomerTitleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -237,13 +236,12 @@ class CustomerTitleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -255,8 +253,8 @@ class CustomerTitleI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -273,8 +271,8 @@ class CustomerTitleI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CustomerTitleI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CustomerTitleI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -298,10 +296,10 @@ class CustomerTitleI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -334,10 +332,10 @@ class CustomerTitleI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class CustomerTitleI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class CustomerTitleI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a CustomerTitleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CustomerTitleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CustomerTitleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -429,8 +427,8 @@ class CustomerTitleI18nTableMap extends TableMap /** * Deletes all rows from the customer_title_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -440,11 +438,11 @@ class CustomerTitleI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a CustomerTitleI18n or Criteria object. * - * @param mixed $criteria Criteria or CustomerTitleI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CustomerTitleI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -458,7 +456,6 @@ class CustomerTitleI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from CustomerTitleI18n object } - // Set the correct dbName $query = CustomerTitleI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php index b2a62a92e..6bf01fb0b 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\CustomerTitle; use Thelia\Model\CustomerTitleQuery; - /** * This class defines the structure of the 'customer_title' table. * @@ -204,7 +203,7 @@ class CustomerTitleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -224,13 +223,12 @@ class CustomerTitleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -246,8 +244,8 @@ class CustomerTitleTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -264,8 +262,8 @@ class CustomerTitleTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CustomerTitle object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (CustomerTitle object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -289,10 +287,10 @@ class CustomerTitleTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -325,10 +323,10 @@ class CustomerTitleTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -352,7 +350,7 @@ class CustomerTitleTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -373,13 +371,13 @@ class CustomerTitleTableMap extends TableMap /** * Performs a DELETE on the database, given a CustomerTitle or Criteria object OR a primary key value. * - * @param mixed $values Criteria or CustomerTitle object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or CustomerTitle object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -412,8 +410,8 @@ class CustomerTitleTableMap extends TableMap /** * Deletes all rows from the customer_title table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -423,11 +421,11 @@ class CustomerTitleTableMap extends TableMap /** * Performs an INSERT on the database, given a CustomerTitle or Criteria object. * - * @param mixed $criteria Criteria or CustomerTitle object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or CustomerTitle object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -445,7 +443,6 @@ class CustomerTitleTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.CustomerTitleTableMap::ID.')'); } - // Set the correct dbName $query = CustomerTitleQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php index 81bea461c..b2f2cbe41 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FeatureAvI18n; use Thelia\Model\FeatureAvI18nQuery; - /** * This class defines the structure of the 'feature_av_i18n' table. * @@ -176,7 +175,7 @@ class FeatureAvI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FeatureAvI18n $obj A \Thelia\Model\FeatureAvI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class FeatureAvI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class FeatureAvI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class FeatureAvI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class FeatureAvI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FeatureAvI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FeatureAvI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class FeatureAvI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class FeatureAvI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class FeatureAvI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class FeatureAvI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a FeatureAvI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FeatureAvI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FeatureAvI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class FeatureAvI18nTableMap extends TableMap /** * Deletes all rows from the feature_av_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class FeatureAvI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a FeatureAvI18n or Criteria object. * - * @param mixed $criteria Criteria or FeatureAvI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FeatureAvI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class FeatureAvI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FeatureAvI18n object } - // Set the correct dbName $query = FeatureAvI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php index 284a3bc2e..ffb8e9942 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FeatureAv; use Thelia\Model\FeatureAvQuery; - /** * This class defines the structure of the 'feature_av' table. * @@ -205,7 +204,7 @@ class FeatureAvTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -225,13 +224,12 @@ class FeatureAvTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -247,8 +245,8 @@ class FeatureAvTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -265,8 +263,8 @@ class FeatureAvTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FeatureAv object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FeatureAv object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -290,10 +288,10 @@ class FeatureAvTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -326,10 +324,10 @@ class FeatureAvTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -353,7 +351,7 @@ class FeatureAvTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -374,13 +372,13 @@ class FeatureAvTableMap extends TableMap /** * Performs a DELETE on the database, given a FeatureAv or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FeatureAv object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FeatureAv object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -413,8 +411,8 @@ class FeatureAvTableMap extends TableMap /** * Deletes all rows from the feature_av table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -424,11 +422,11 @@ class FeatureAvTableMap extends TableMap /** * Performs an INSERT on the database, given a FeatureAv or Criteria object. * - * @param mixed $criteria Criteria or FeatureAv object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FeatureAv object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -446,7 +444,6 @@ class FeatureAvTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureAvTableMap::ID.')'); } - // Set the correct dbName $query = FeatureAvQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php index 5cc7bdea1..a3addadb0 100644 --- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FeatureI18n; use Thelia\Model\FeatureI18nQuery; - /** * This class defines the structure of the 'feature_i18n' table. * @@ -176,7 +175,7 @@ class FeatureI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FeatureI18n $obj A \Thelia\Model\FeatureI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class FeatureI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class FeatureI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class FeatureI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class FeatureI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FeatureI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FeatureI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class FeatureI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class FeatureI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class FeatureI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class FeatureI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a FeatureI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FeatureI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FeatureI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class FeatureI18nTableMap extends TableMap /** * Deletes all rows from the feature_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class FeatureI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a FeatureI18n or Criteria object. * - * @param mixed $criteria Criteria or FeatureI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FeatureI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class FeatureI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FeatureI18n object } - // Set the correct dbName $query = FeatureI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureProductTableMap.php b/core/lib/Thelia/Model/Map/FeatureProductTableMap.php index c87d3176b..40daabe61 100644 --- a/core/lib/Thelia/Model/Map/FeatureProductTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureProductTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FeatureProduct; use Thelia\Model\FeatureProductQuery; - /** * This class defines the structure of the 'feature_product' table. * @@ -203,7 +202,7 @@ class FeatureProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -223,13 +222,12 @@ class FeatureProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -245,8 +243,8 @@ class FeatureProductTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -263,8 +261,8 @@ class FeatureProductTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FeatureProduct object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FeatureProduct object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -288,10 +286,10 @@ class FeatureProductTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -324,10 +322,10 @@ class FeatureProductTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -357,7 +355,7 @@ class FeatureProductTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -378,13 +376,13 @@ class FeatureProductTableMap extends TableMap /** * Performs a DELETE on the database, given a FeatureProduct or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FeatureProduct object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FeatureProduct object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -417,8 +415,8 @@ class FeatureProductTableMap extends TableMap /** * Deletes all rows from the feature_product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -428,11 +426,11 @@ class FeatureProductTableMap extends TableMap /** * Performs an INSERT on the database, given a FeatureProduct or Criteria object. * - * @param mixed $criteria Criteria or FeatureProduct object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FeatureProduct object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -450,7 +448,6 @@ class FeatureProductTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureProductTableMap::ID.')'); } - // Set the correct dbName $query = FeatureProductQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php index 222340de4..c2909d68b 100644 --- a/core/lib/Thelia/Model/Map/FeatureTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Feature; use Thelia\Model\FeatureQuery; - /** * This class defines the structure of the 'feature' table. * @@ -209,7 +208,7 @@ class FeatureTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class FeatureTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class FeatureTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class FeatureTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Feature object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Feature object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class FeatureTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class FeatureTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -357,7 +355,7 @@ class FeatureTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -378,13 +376,13 @@ class FeatureTableMap extends TableMap /** * Performs a DELETE on the database, given a Feature or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Feature object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Feature object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -417,8 +415,8 @@ class FeatureTableMap extends TableMap /** * Deletes all rows from the feature table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -428,11 +426,11 @@ class FeatureTableMap extends TableMap /** * Performs an INSERT on the database, given a Feature or Criteria object. * - * @param mixed $criteria Criteria or Feature object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Feature object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -450,7 +448,6 @@ class FeatureTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureTableMap::ID.')'); } - // Set the correct dbName $query = FeatureQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FeatureTemplateTableMap.php b/core/lib/Thelia/Model/Map/FeatureTemplateTableMap.php index 1f57bc169..f312ac08c 100644 --- a/core/lib/Thelia/Model/Map/FeatureTemplateTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureTemplateTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FeatureTemplate; use Thelia\Model\FeatureTemplateQuery; - /** * This class defines the structure of the 'feature_template' table. * @@ -191,7 +190,7 @@ class FeatureTemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -211,13 +210,12 @@ class FeatureTemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -233,8 +231,8 @@ class FeatureTemplateTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -251,8 +249,8 @@ class FeatureTemplateTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FeatureTemplate object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FeatureTemplate object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -276,10 +274,10 @@ class FeatureTemplateTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -312,10 +310,10 @@ class FeatureTemplateTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -341,7 +339,7 @@ class FeatureTemplateTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -362,13 +360,13 @@ class FeatureTemplateTableMap extends TableMap /** * Performs a DELETE on the database, given a FeatureTemplate or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FeatureTemplate object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FeatureTemplate object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -401,8 +399,8 @@ class FeatureTemplateTableMap extends TableMap /** * Deletes all rows from the feature_template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -412,11 +410,11 @@ class FeatureTemplateTableMap extends TableMap /** * Performs an INSERT on the database, given a FeatureTemplate or Criteria object. * - * @param mixed $criteria Criteria or FeatureTemplate object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FeatureTemplate object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -434,7 +432,6 @@ class FeatureTemplateTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureTemplateTableMap::ID.')'); } - // Set the correct dbName $query = FeatureTemplateQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php index f7c88d93b..91288e1f4 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderDocumentI18n; use Thelia\Model\FolderDocumentI18nQuery; - /** * This class defines the structure of the 'folder_document_i18n' table. * @@ -176,7 +175,7 @@ class FolderDocumentI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FolderDocumentI18n $obj A \Thelia\Model\FolderDocumentI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class FolderDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class FolderDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class FolderDocumentI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class FolderDocumentI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderDocumentI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderDocumentI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class FolderDocumentI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class FolderDocumentI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class FolderDocumentI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class FolderDocumentI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class FolderDocumentI18nTableMap extends TableMap /** * Deletes all rows from the folder_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class FolderDocumentI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderDocumentI18n or Criteria object. * - * @param mixed $criteria Criteria or FolderDocumentI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderDocumentI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class FolderDocumentI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FolderDocumentI18n object } - // Set the correct dbName $query = FolderDocumentI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php index 61be45118..626efd078 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderDocument; use Thelia\Model\FolderDocumentQuery; - /** * This class defines the structure of the 'folder_document' table. * @@ -209,7 +208,7 @@ class FolderDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class FolderDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class FolderDocumentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class FolderDocumentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderDocument object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderDocument object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class FolderDocumentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class FolderDocumentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class FolderDocumentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class FolderDocumentTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class FolderDocumentTableMap extends TableMap /** * Deletes all rows from the folder_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class FolderDocumentTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderDocument or Criteria object. * - * @param mixed $criteria Criteria or FolderDocument object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderDocument object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class FolderDocumentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FolderDocumentTableMap::ID.')'); } - // Set the correct dbName $query = FolderDocumentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php index 13ad89cf7..aaf2b0111 100644 --- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderI18n; use Thelia\Model\FolderI18nQuery; - /** * This class defines the structure of the 'folder_i18n' table. * @@ -194,7 +193,7 @@ class FolderI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FolderI18n $obj A \Thelia\Model\FolderI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class FolderI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class FolderI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class FolderI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class FolderI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class FolderI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class FolderI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class FolderI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class FolderI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class FolderI18nTableMap extends TableMap /** * Deletes all rows from the folder_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class FolderI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderI18n or Criteria object. * - * @param mixed $criteria Criteria or FolderI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class FolderI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FolderI18n object } - // Set the correct dbName $query = FolderI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php index 82a785b5d..03ccbed52 100644 --- a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderImageI18n; use Thelia\Model\FolderImageI18nQuery; - /** * This class defines the structure of the 'folder_image_i18n' table. * @@ -176,7 +175,7 @@ class FolderImageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FolderImageI18n $obj A \Thelia\Model\FolderImageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class FolderImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class FolderImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class FolderImageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class FolderImageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderImageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderImageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class FolderImageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class FolderImageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class FolderImageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class FolderImageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class FolderImageI18nTableMap extends TableMap /** * Deletes all rows from the folder_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class FolderImageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderImageI18n or Criteria object. * - * @param mixed $criteria Criteria or FolderImageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderImageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class FolderImageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FolderImageI18n object } - // Set the correct dbName $query = FolderImageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php index 6387373eb..6cf6459f0 100644 --- a/core/lib/Thelia/Model/Map/FolderImageTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderImage; use Thelia\Model\FolderImageQuery; - /** * This class defines the structure of the 'folder_image' table. * @@ -209,7 +208,7 @@ class FolderImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class FolderImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class FolderImageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class FolderImageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderImage object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderImage object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class FolderImageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class FolderImageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class FolderImageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class FolderImageTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class FolderImageTableMap extends TableMap /** * Deletes all rows from the folder_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class FolderImageTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderImage or Criteria object. * - * @param mixed $criteria Criteria or FolderImage object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderImage object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class FolderImageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FolderImageTableMap::ID.')'); } - // Set the correct dbName $query = FolderImageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php index 8cb336db2..75cf1368b 100644 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Folder; use Thelia\Model\FolderQuery; - /** * This class defines the structure of the 'folder' table. * @@ -236,7 +235,7 @@ class FolderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -256,13 +255,12 @@ class FolderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -278,8 +276,8 @@ class FolderTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -296,8 +294,8 @@ class FolderTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Folder object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Folder object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -321,10 +319,10 @@ class FolderTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -357,10 +355,10 @@ class FolderTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -392,7 +390,7 @@ class FolderTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -413,13 +411,13 @@ class FolderTableMap extends TableMap /** * Performs a DELETE on the database, given a Folder or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Folder object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Folder object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -452,8 +450,8 @@ class FolderTableMap extends TableMap /** * Deletes all rows from the folder table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -463,11 +461,11 @@ class FolderTableMap extends TableMap /** * Performs an INSERT on the database, given a Folder or Criteria object. * - * @param mixed $criteria Criteria or Folder object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Folder object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -485,7 +483,6 @@ class FolderTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.FolderTableMap::ID.')'); } - // Set the correct dbName $query = FolderQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/FolderVersionTableMap.php b/core/lib/Thelia/Model/Map/FolderVersionTableMap.php index 1ed8ab441..a7081f282 100644 --- a/core/lib/Thelia/Model/Map/FolderVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\FolderVersion; use Thelia\Model\FolderVersionQuery; - /** * This class defines the structure of the 'folder_version' table. * @@ -194,7 +193,7 @@ class FolderVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\FolderVersion $obj A \Thelia\Model\FolderVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class FolderVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class FolderVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class FolderVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class FolderVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (FolderVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (FolderVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class FolderVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class FolderVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class FolderVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class FolderVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a FolderVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or FolderVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or FolderVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class FolderVersionTableMap extends TableMap /** * Deletes all rows from the folder_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class FolderVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a FolderVersion or Criteria object. * - * @param mixed $criteria Criteria or FolderVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or FolderVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class FolderVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from FolderVersion object } - // Set the correct dbName $query = FolderVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/LangTableMap.php b/core/lib/Thelia/Model/Map/LangTableMap.php index 12c9d9b5b..d77a63e44 100644 --- a/core/lib/Thelia/Model/Map/LangTableMap.php +++ b/core/lib/Thelia/Model/Map/LangTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Lang; use Thelia\Model\LangQuery; - /** * This class defines the structure of the 'lang' table. * @@ -243,7 +242,7 @@ class LangTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -263,13 +262,12 @@ class LangTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -285,8 +283,8 @@ class LangTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class LangTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Lang object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Lang object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class LangTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class LangTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -411,7 +409,7 @@ class LangTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -432,13 +430,13 @@ class LangTableMap extends TableMap /** * Performs a DELETE on the database, given a Lang or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Lang object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Lang object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -471,8 +469,8 @@ class LangTableMap extends TableMap /** * Deletes all rows from the lang table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -482,11 +480,11 @@ class LangTableMap extends TableMap /** * Performs an INSERT on the database, given a Lang or Criteria object. * - * @param mixed $criteria Criteria or Lang object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Lang object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -504,7 +502,6 @@ class LangTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.LangTableMap::ID.')'); } - // Set the correct dbName $query = LangQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php index b747c230c..c759e611e 100644 --- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\MessageI18n; use Thelia\Model\MessageI18nQuery; - /** * This class defines the structure of the 'message_i18n' table. * @@ -176,7 +175,7 @@ class MessageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\MessageI18n $obj A \Thelia\Model\MessageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class MessageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class MessageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class MessageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class MessageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (MessageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (MessageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class MessageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class MessageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class MessageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class MessageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a MessageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or MessageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or MessageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class MessageI18nTableMap extends TableMap /** * Deletes all rows from the message_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class MessageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a MessageI18n or Criteria object. * - * @param mixed $criteria Criteria or MessageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or MessageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class MessageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from MessageI18n object } - // Set the correct dbName $query = MessageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php index 7a4d17ceb..79d2d1822 100644 --- a/core/lib/Thelia/Model/Map/MessageTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Message; use Thelia\Model\MessageQuery; - /** * This class defines the structure of the 'message' table. * @@ -247,7 +246,7 @@ class MessageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class MessageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -289,8 +287,8 @@ class MessageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -307,8 +305,8 @@ class MessageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Message object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Message object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -332,10 +330,10 @@ class MessageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -368,10 +366,10 @@ class MessageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -409,7 +407,7 @@ class MessageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -430,13 +428,13 @@ class MessageTableMap extends TableMap /** * Performs a DELETE on the database, given a Message or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Message object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Message object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class MessageTableMap extends TableMap /** * Deletes all rows from the message table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class MessageTableMap extends TableMap /** * Performs an INSERT on the database, given a Message or Criteria object. * - * @param mixed $criteria Criteria or Message object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Message object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -502,7 +500,6 @@ class MessageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.MessageTableMap::ID.')'); } - // Set the correct dbName $query = MessageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php index 12cc8a1be..7478be85e 100644 --- a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\MessageVersion; use Thelia\Model\MessageVersionQuery; - /** * This class defines the structure of the 'message_version' table. * @@ -212,7 +211,7 @@ class MessageVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\MessageVersion $obj A \Thelia\Model\MessageVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -265,7 +264,7 @@ class MessageVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -285,13 +284,12 @@ class MessageVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -303,8 +301,8 @@ class MessageVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -321,8 +319,8 @@ class MessageVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (MessageVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (MessageVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -346,10 +344,10 @@ class MessageVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -382,10 +380,10 @@ class MessageVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -423,7 +421,7 @@ class MessageVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -444,13 +442,13 @@ class MessageVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a MessageVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or MessageVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or MessageVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -493,8 +491,8 @@ class MessageVersionTableMap extends TableMap /** * Deletes all rows from the message_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -504,11 +502,11 @@ class MessageVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a MessageVersion or Criteria object. * - * @param mixed $criteria Criteria or MessageVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or MessageVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -522,7 +520,6 @@ class MessageVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from MessageVersion object } - // Set the correct dbName $query = MessageVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php index 9b7b1d089..602455325 100644 --- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ModuleI18n; use Thelia\Model\ModuleI18nQuery; - /** * This class defines the structure of the 'module_i18n' table. * @@ -176,7 +175,7 @@ class ModuleI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ModuleI18n $obj A \Thelia\Model\ModuleI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ModuleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ModuleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ModuleI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ModuleI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ModuleI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ModuleI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ModuleI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ModuleI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ModuleI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ModuleI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ModuleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ModuleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ModuleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ModuleI18nTableMap extends TableMap /** * Deletes all rows from the module_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ModuleI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ModuleI18n or Criteria object. * - * @param mixed $criteria Criteria or ModuleI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ModuleI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ModuleI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ModuleI18n object } - // Set the correct dbName $query = ModuleI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ModuleImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleImageI18nTableMap.php index a65c804d7..f10ee645f 100644 --- a/core/lib/Thelia/Model/Map/ModuleImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleImageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ModuleImageI18n; use Thelia\Model\ModuleImageI18nQuery; - /** * This class defines the structure of the 'module_image_i18n' table. * @@ -176,7 +175,7 @@ class ModuleImageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ModuleImageI18n $obj A \Thelia\Model\ModuleImageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ModuleImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ModuleImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ModuleImageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ModuleImageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ModuleImageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ModuleImageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ModuleImageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ModuleImageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ModuleImageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ModuleImageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ModuleImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ModuleImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ModuleImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ModuleImageI18nTableMap extends TableMap /** * Deletes all rows from the module_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ModuleImageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ModuleImageI18n or Criteria object. * - * @param mixed $criteria Criteria or ModuleImageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ModuleImageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ModuleImageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ModuleImageI18n object } - // Set the correct dbName $query = ModuleImageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ModuleImageTableMap.php b/core/lib/Thelia/Model/Map/ModuleImageTableMap.php index 2ff62a6a4..679a123b0 100644 --- a/core/lib/Thelia/Model/Map/ModuleImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleImageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ModuleImage; use Thelia\Model\ModuleImageQuery; - /** * This class defines the structure of the 'module_image' table. * @@ -209,7 +208,7 @@ class ModuleImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class ModuleImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class ModuleImageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class ModuleImageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ModuleImage object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ModuleImage object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class ModuleImageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class ModuleImageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class ModuleImageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class ModuleImageTableMap extends TableMap /** * Performs a DELETE on the database, given a ModuleImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ModuleImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ModuleImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class ModuleImageTableMap extends TableMap /** * Deletes all rows from the module_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class ModuleImageTableMap extends TableMap /** * Performs an INSERT on the database, given a ModuleImage or Criteria object. * - * @param mixed $criteria Criteria or ModuleImage object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ModuleImage object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class ModuleImageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ModuleImageTableMap::ID.')'); } - // Set the correct dbName $query = ModuleImageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php index 16a14b1bb..6e5827591 100644 --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Module; use Thelia\Model\ModuleQuery; - /** * This class defines the structure of the 'module' table. * @@ -228,7 +227,7 @@ class ModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -248,13 +247,12 @@ class ModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -270,8 +268,8 @@ class ModuleTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -288,8 +286,8 @@ class ModuleTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Module object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Module object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -313,10 +311,10 @@ class ModuleTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -349,10 +347,10 @@ class ModuleTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -382,7 +380,7 @@ class ModuleTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -403,13 +401,13 @@ class ModuleTableMap extends TableMap /** * Performs a DELETE on the database, given a Module or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Module object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Module object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -442,8 +440,8 @@ class ModuleTableMap extends TableMap /** * Deletes all rows from the module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -453,11 +451,11 @@ class ModuleTableMap extends TableMap /** * Performs an INSERT on the database, given a Module or Criteria object. * - * @param mixed $criteria Criteria or Module object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Module object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -475,7 +473,6 @@ class ModuleTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ModuleTableMap::ID.')'); } - // Set the correct dbName $query = ModuleQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/NewsletterTableMap.php b/core/lib/Thelia/Model/Map/NewsletterTableMap.php index 94ffd25d2..d8a7ff589 100644 --- a/core/lib/Thelia/Model/Map/NewsletterTableMap.php +++ b/core/lib/Thelia/Model/Map/NewsletterTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Newsletter; use Thelia\Model\NewsletterQuery; - /** * This class defines the structure of the 'newsletter' table. * @@ -194,7 +193,7 @@ class NewsletterTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -214,13 +213,12 @@ class NewsletterTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -236,8 +234,8 @@ class NewsletterTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -254,8 +252,8 @@ class NewsletterTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Newsletter object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Newsletter object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -279,10 +277,10 @@ class NewsletterTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -315,10 +313,10 @@ class NewsletterTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -346,7 +344,7 @@ class NewsletterTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -367,13 +365,13 @@ class NewsletterTableMap extends TableMap /** * Performs a DELETE on the database, given a Newsletter or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Newsletter object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Newsletter object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -406,8 +404,8 @@ class NewsletterTableMap extends TableMap /** * Deletes all rows from the newsletter table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -417,11 +415,11 @@ class NewsletterTableMap extends TableMap /** * Performs an INSERT on the database, given a Newsletter or Criteria object. * - * @param mixed $criteria Criteria or Newsletter object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Newsletter object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -439,7 +437,6 @@ class NewsletterTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.NewsletterTableMap::ID.')'); } - // Set the correct dbName $query = NewsletterQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderAddressTableMap.php b/core/lib/Thelia/Model/Map/OrderAddressTableMap.php index 178f0af4a..a43702f4d 100644 --- a/core/lib/Thelia/Model/Map/OrderAddressTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderAddressTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderAddress; use Thelia\Model\OrderAddressQuery; - /** * This class defines the structure of the 'order_address' table. * @@ -238,7 +237,7 @@ class OrderAddressTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class OrderAddressTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -280,8 +278,8 @@ class OrderAddressTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -298,8 +296,8 @@ class OrderAddressTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderAddress object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderAddress object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -323,10 +321,10 @@ class OrderAddressTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -359,10 +357,10 @@ class OrderAddressTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -404,7 +402,7 @@ class OrderAddressTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -425,13 +423,13 @@ class OrderAddressTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderAddress or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderAddress object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderAddress object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -464,8 +462,8 @@ class OrderAddressTableMap extends TableMap /** * Deletes all rows from the order_address table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -475,11 +473,11 @@ class OrderAddressTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderAddress or Criteria object. * - * @param mixed $criteria Criteria or OrderAddress object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderAddress object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -497,7 +495,6 @@ class OrderAddressTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderAddressTableMap::ID.')'); } - // Set the correct dbName $query = OrderAddressQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderCouponTableMap.php b/core/lib/Thelia/Model/Map/OrderCouponTableMap.php index 7f795ea57..8297df60d 100644 --- a/core/lib/Thelia/Model/Map/OrderCouponTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderCouponTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderCoupon; use Thelia\Model\OrderCouponQuery; - /** * This class defines the structure of the 'order_coupon' table. * @@ -243,7 +242,7 @@ class OrderCouponTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -263,13 +262,12 @@ class OrderCouponTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -285,8 +283,8 @@ class OrderCouponTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class OrderCouponTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderCoupon object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderCoupon object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class OrderCouponTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class OrderCouponTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -411,7 +409,7 @@ class OrderCouponTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -432,13 +430,13 @@ class OrderCouponTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderCoupon or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderCoupon object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderCoupon object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -471,8 +469,8 @@ class OrderCouponTableMap extends TableMap /** * Deletes all rows from the order_coupon table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -482,11 +480,11 @@ class OrderCouponTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderCoupon or Criteria object. * - * @param mixed $criteria Criteria or OrderCoupon object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderCoupon object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -504,7 +502,6 @@ class OrderCouponTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderCouponTableMap::ID.')'); } - // Set the correct dbName $query = OrderCouponQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php index 9ff1b329b..44f357dbf 100644 --- a/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderProductAttributeCombination; use Thelia\Model\OrderProductAttributeCombinationQuery; - /** * This class defines the structure of the 'order_product_attribute_combination' table. * @@ -225,7 +224,7 @@ class OrderProductAttributeCombinationTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -245,13 +244,12 @@ class OrderProductAttributeCombinationTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -267,8 +265,8 @@ class OrderProductAttributeCombinationTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class OrderProductAttributeCombinationTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderProductAttributeCombination object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderProductAttributeCombination object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class OrderProductAttributeCombinationTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class OrderProductAttributeCombinationTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -387,7 +385,7 @@ class OrderProductAttributeCombinationTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -408,13 +406,13 @@ class OrderProductAttributeCombinationTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderProductAttributeCombination or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderProductAttributeCombination object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderProductAttributeCombination object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -447,8 +445,8 @@ class OrderProductAttributeCombinationTableMap extends TableMap /** * Deletes all rows from the order_product_attribute_combination table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -458,11 +456,11 @@ class OrderProductAttributeCombinationTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderProductAttributeCombination or Criteria object. * - * @param mixed $criteria Criteria or OrderProductAttributeCombination object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderProductAttributeCombination object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -480,7 +478,6 @@ class OrderProductAttributeCombinationTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductAttributeCombinationTableMap::ID.')'); } - // Set the correct dbName $query = OrderProductAttributeCombinationQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php index dd4a957ab..939b4ea09 100644 --- a/core/lib/Thelia/Model/Map/OrderProductTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderProductTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderProduct; use Thelia\Model\OrderProductQuery; - /** * This class defines the structure of the 'order_product' table. * @@ -285,7 +284,7 @@ class OrderProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -305,13 +304,12 @@ class OrderProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -327,8 +325,8 @@ class OrderProductTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -345,8 +343,8 @@ class OrderProductTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderProduct object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderProduct object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -370,10 +368,10 @@ class OrderProductTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -406,10 +404,10 @@ class OrderProductTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -463,7 +461,7 @@ class OrderProductTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -484,13 +482,13 @@ class OrderProductTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderProduct or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderProduct object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderProduct object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -523,8 +521,8 @@ class OrderProductTableMap extends TableMap /** * Deletes all rows from the order_product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -534,11 +532,11 @@ class OrderProductTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderProduct or Criteria object. * - * @param mixed $criteria Criteria or OrderProduct object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderProduct object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -556,7 +554,6 @@ class OrderProductTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductTableMap::ID.')'); } - // Set the correct dbName $query = OrderProductQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php index 60df13bdf..32c8f5687 100644 --- a/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderProductTax; use Thelia\Model\OrderProductTaxQuery; - /** * This class defines the structure of the 'order_product_tax' table. * @@ -201,7 +200,7 @@ class OrderProductTaxTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -221,13 +220,12 @@ class OrderProductTaxTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -243,8 +241,8 @@ class OrderProductTaxTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -261,8 +259,8 @@ class OrderProductTaxTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderProductTax object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderProductTax object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -286,10 +284,10 @@ class OrderProductTaxTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -322,10 +320,10 @@ class OrderProductTaxTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -355,7 +353,7 @@ class OrderProductTaxTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -376,13 +374,13 @@ class OrderProductTaxTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderProductTax or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderProductTax object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderProductTax object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -415,8 +413,8 @@ class OrderProductTaxTableMap extends TableMap /** * Deletes all rows from the order_product_tax table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -426,11 +424,11 @@ class OrderProductTaxTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderProductTax or Criteria object. * - * @param mixed $criteria Criteria or OrderProductTax object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderProductTax object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -448,7 +446,6 @@ class OrderProductTaxTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductTaxTableMap::ID.')'); } - // Set the correct dbName $query = OrderProductTaxQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php index 0f8d61143..15e9851e8 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderStatusI18n; use Thelia\Model\OrderStatusI18nQuery; - /** * This class defines the structure of the 'order_status_i18n' table. * @@ -176,7 +175,7 @@ class OrderStatusI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\OrderStatusI18n $obj A \Thelia\Model\OrderStatusI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class OrderStatusI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class OrderStatusI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class OrderStatusI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class OrderStatusI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderStatusI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderStatusI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class OrderStatusI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class OrderStatusI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class OrderStatusI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class OrderStatusI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderStatusI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderStatusI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderStatusI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class OrderStatusI18nTableMap extends TableMap /** * Deletes all rows from the order_status_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class OrderStatusI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderStatusI18n or Criteria object. * - * @param mixed $criteria Criteria or OrderStatusI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderStatusI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class OrderStatusI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from OrderStatusI18n object } - // Set the correct dbName $query = OrderStatusI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php index dff641a6d..26241c2e0 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\OrderStatus; use Thelia\Model\OrderStatusQuery; - /** * This class defines the structure of the 'order_status' table. * @@ -197,7 +196,7 @@ class OrderStatusTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -217,13 +216,12 @@ class OrderStatusTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -239,8 +237,8 @@ class OrderStatusTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -257,8 +255,8 @@ class OrderStatusTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (OrderStatus object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (OrderStatus object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -282,10 +280,10 @@ class OrderStatusTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -318,10 +316,10 @@ class OrderStatusTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -343,7 +341,7 @@ class OrderStatusTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -364,13 +362,13 @@ class OrderStatusTableMap extends TableMap /** * Performs a DELETE on the database, given a OrderStatus or Criteria object OR a primary key value. * - * @param mixed $values Criteria or OrderStatus object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or OrderStatus object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -403,8 +401,8 @@ class OrderStatusTableMap extends TableMap /** * Deletes all rows from the order_status table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -414,11 +412,11 @@ class OrderStatusTableMap extends TableMap /** * Performs an INSERT on the database, given a OrderStatus or Criteria object. * - * @param mixed $criteria Criteria or OrderStatus object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or OrderStatus object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -436,7 +434,6 @@ class OrderStatusTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderStatusTableMap::ID.')'); } - // Set the correct dbName $query = OrderStatusQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/OrderTableMap.php b/core/lib/Thelia/Model/Map/OrderTableMap.php index 28613da80..5b1555d77 100644 --- a/core/lib/Thelia/Model/Map/OrderTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Order; use Thelia\Model\OrderQuery; - /** * This class defines the structure of the 'order' table. * @@ -286,7 +285,7 @@ class OrderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -306,13 +305,12 @@ class OrderTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -328,8 +326,8 @@ class OrderTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -346,8 +344,8 @@ class OrderTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Order object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Order object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -371,10 +369,10 @@ class OrderTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -407,10 +405,10 @@ class OrderTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -462,7 +460,7 @@ class OrderTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -483,13 +481,13 @@ class OrderTableMap extends TableMap /** * Performs a DELETE on the database, given a Order or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Order object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Order object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -522,8 +520,8 @@ class OrderTableMap extends TableMap /** * Deletes all rows from the order table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -533,11 +531,11 @@ class OrderTableMap extends TableMap /** * Performs an INSERT on the database, given a Order or Criteria object. * - * @param mixed $criteria Criteria or Order object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Order object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -555,7 +553,6 @@ class OrderTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderTableMap::ID.')'); } - // Set the correct dbName $query = OrderQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php b/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php index d3764f5c0..7a71dd29d 100644 --- a/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductAssociatedContent; use Thelia\Model\ProductAssociatedContentQuery; - /** * This class defines the structure of the 'product_associated_content' table. * @@ -190,7 +189,7 @@ class ProductAssociatedContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -210,13 +209,12 @@ class ProductAssociatedContentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -232,8 +230,8 @@ class ProductAssociatedContentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -250,8 +248,8 @@ class ProductAssociatedContentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductAssociatedContent object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductAssociatedContent object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -275,10 +273,10 @@ class ProductAssociatedContentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -311,10 +309,10 @@ class ProductAssociatedContentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -340,7 +338,7 @@ class ProductAssociatedContentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -361,13 +359,13 @@ class ProductAssociatedContentTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductAssociatedContent or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductAssociatedContent object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -400,8 +398,8 @@ class ProductAssociatedContentTableMap extends TableMap /** * Deletes all rows from the product_associated_content table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -411,11 +409,11 @@ class ProductAssociatedContentTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductAssociatedContent or Criteria object. * - * @param mixed $criteria Criteria or ProductAssociatedContent object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductAssociatedContent object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -433,7 +431,6 @@ class ProductAssociatedContentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductAssociatedContentTableMap::ID.')'); } - // Set the correct dbName $query = ProductAssociatedContentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php index c022691ad..9f808cfa5 100644 --- a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductCategory; use Thelia\Model\ProductCategoryQuery; - /** * This class defines the structure of the 'product_category' table. * @@ -185,7 +184,7 @@ class ProductCategoryTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductCategory $obj A \Thelia\Model\ProductCategory object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -238,7 +237,7 @@ class ProductCategoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class ProductCategoryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -276,8 +274,8 @@ class ProductCategoryTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -294,8 +292,8 @@ class ProductCategoryTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductCategory object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductCategory object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -319,10 +317,10 @@ class ProductCategoryTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -355,10 +353,10 @@ class ProductCategoryTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -382,7 +380,7 @@ class ProductCategoryTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -403,13 +401,13 @@ class ProductCategoryTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductCategory or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductCategory object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductCategory object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -452,8 +450,8 @@ class ProductCategoryTableMap extends TableMap /** * Deletes all rows from the product_category table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -463,11 +461,11 @@ class ProductCategoryTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductCategory or Criteria object. * - * @param mixed $criteria Criteria or ProductCategory object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductCategory object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -481,7 +479,6 @@ class ProductCategoryTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductCategory object } - // Set the correct dbName $query = ProductCategoryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php index 963d91013..cdc778238 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductDocumentI18n; use Thelia\Model\ProductDocumentI18nQuery; - /** * This class defines the structure of the 'product_document_i18n' table. * @@ -176,7 +175,7 @@ class ProductDocumentI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductDocumentI18n $obj A \Thelia\Model\ProductDocumentI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ProductDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ProductDocumentI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ProductDocumentI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ProductDocumentI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductDocumentI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductDocumentI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ProductDocumentI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ProductDocumentI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ProductDocumentI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ProductDocumentI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductDocumentI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductDocumentI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductDocumentI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ProductDocumentI18nTableMap extends TableMap /** * Deletes all rows from the product_document_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ProductDocumentI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductDocumentI18n or Criteria object. * - * @param mixed $criteria Criteria or ProductDocumentI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductDocumentI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ProductDocumentI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductDocumentI18n object } - // Set the correct dbName $query = ProductDocumentI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php index 158f6044d..59eff6d0e 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductDocument; use Thelia\Model\ProductDocumentQuery; - /** * This class defines the structure of the 'product_document' table. * @@ -209,7 +208,7 @@ class ProductDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class ProductDocumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class ProductDocumentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class ProductDocumentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductDocument object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductDocument object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class ProductDocumentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class ProductDocumentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class ProductDocumentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class ProductDocumentTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductDocument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductDocument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductDocument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class ProductDocumentTableMap extends TableMap /** * Deletes all rows from the product_document table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class ProductDocumentTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductDocument or Criteria object. * - * @param mixed $criteria Criteria or ProductDocument object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductDocument object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class ProductDocumentTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductDocumentTableMap::ID.')'); } - // Set the correct dbName $query = ProductDocumentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php index d48e1dbed..64799f3e2 100644 --- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductI18n; use Thelia\Model\ProductI18nQuery; - /** * This class defines the structure of the 'product_i18n' table. * @@ -194,7 +193,7 @@ class ProductI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductI18n $obj A \Thelia\Model\ProductI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -247,7 +246,7 @@ class ProductI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -267,13 +266,12 @@ class ProductI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -285,8 +283,8 @@ class ProductI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -303,8 +301,8 @@ class ProductI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -328,10 +326,10 @@ class ProductI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -364,10 +362,10 @@ class ProductI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -399,7 +397,7 @@ class ProductI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -420,13 +418,13 @@ class ProductI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -469,8 +467,8 @@ class ProductI18nTableMap extends TableMap /** * Deletes all rows from the product_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -480,11 +478,11 @@ class ProductI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductI18n or Criteria object. * - * @param mixed $criteria Criteria or ProductI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -498,7 +496,6 @@ class ProductI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductI18n object } - // Set the correct dbName $query = ProductI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php index e7bb92340..7c0557f71 100644 --- a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductImageI18n; use Thelia\Model\ProductImageI18nQuery; - /** * This class defines the structure of the 'product_image_i18n' table. * @@ -176,7 +175,7 @@ class ProductImageI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductImageI18n $obj A \Thelia\Model\ProductImageI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ProductImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ProductImageI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ProductImageI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ProductImageI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductImageI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductImageI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ProductImageI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ProductImageI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ProductImageI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ProductImageI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductImageI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductImageI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductImageI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ProductImageI18nTableMap extends TableMap /** * Deletes all rows from the product_image_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ProductImageI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductImageI18n or Criteria object. * - * @param mixed $criteria Criteria or ProductImageI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductImageI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ProductImageI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductImageI18n object } - // Set the correct dbName $query = ProductImageI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php index 18bb10b36..694c7ca5d 100644 --- a/core/lib/Thelia/Model/Map/ProductImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductImage; use Thelia\Model\ProductImageQuery; - /** * This class defines the structure of the 'product_image' table. * @@ -209,7 +208,7 @@ class ProductImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -229,13 +228,12 @@ class ProductImageTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -251,8 +249,8 @@ class ProductImageTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -269,8 +267,8 @@ class ProductImageTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductImage object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductImage object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -294,10 +292,10 @@ class ProductImageTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -330,10 +328,10 @@ class ProductImageTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class ProductImageTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class ProductImageTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductImage or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductImage object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductImage object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -419,8 +417,8 @@ class ProductImageTableMap extends TableMap /** * Deletes all rows from the product_image table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -430,11 +428,11 @@ class ProductImageTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductImage or Criteria object. * - * @param mixed $criteria Criteria or ProductImage object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductImage object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -452,7 +450,6 @@ class ProductImageTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductImageTableMap::ID.')'); } - // Set the correct dbName $query = ProductImageQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php index 180abda6d..00b4ba919 100644 --- a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductPrice; use Thelia\Model\ProductPriceQuery; - /** * This class defines the structure of the 'product_price' table. * @@ -196,7 +195,7 @@ class ProductPriceTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductPrice $obj A \Thelia\Model\ProductPrice object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -249,7 +248,7 @@ class ProductPriceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -269,13 +268,12 @@ class ProductPriceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -287,8 +285,8 @@ class ProductPriceTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -305,8 +303,8 @@ class ProductPriceTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductPrice object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductPrice object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -330,10 +328,10 @@ class ProductPriceTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -366,10 +364,10 @@ class ProductPriceTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -397,7 +395,7 @@ class ProductPriceTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -418,13 +416,13 @@ class ProductPriceTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductPrice or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductPrice object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductPrice object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -467,8 +465,8 @@ class ProductPriceTableMap extends TableMap /** * Deletes all rows from the product_price table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -478,11 +476,11 @@ class ProductPriceTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductPrice or Criteria object. * - * @param mixed $criteria Criteria or ProductPrice object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductPrice object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -496,7 +494,6 @@ class ProductPriceTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductPrice object } - // Set the correct dbName $query = ProductPriceQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php b/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php index 7f715fdab..dc7fec5c3 100644 --- a/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductSaleElements; use Thelia\Model\ProductSaleElementsQuery; - /** * This class defines the structure of the 'product_sale_elements' table. * @@ -233,7 +232,7 @@ class ProductSaleElementsTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -253,13 +252,12 @@ class ProductSaleElementsTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -275,8 +273,8 @@ class ProductSaleElementsTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -293,8 +291,8 @@ class ProductSaleElementsTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductSaleElements object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductSaleElements object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -318,10 +316,10 @@ class ProductSaleElementsTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -354,10 +352,10 @@ class ProductSaleElementsTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -393,7 +391,7 @@ class ProductSaleElementsTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -414,13 +412,13 @@ class ProductSaleElementsTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductSaleElements or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductSaleElements object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductSaleElements object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -453,8 +451,8 @@ class ProductSaleElementsTableMap extends TableMap /** * Deletes all rows from the product_sale_elements table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -464,11 +462,11 @@ class ProductSaleElementsTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductSaleElements or Criteria object. * - * @param mixed $criteria Criteria or ProductSaleElements object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductSaleElements object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -486,7 +484,6 @@ class ProductSaleElementsTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductSaleElementsTableMap::ID.')'); } - // Set the correct dbName $query = ProductSaleElementsQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index daba44213..abb6b01df 100644 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Product; use Thelia\Model\ProductQuery; - /** * This class defines the structure of the 'product' table. * @@ -263,7 +262,7 @@ class ProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -283,13 +282,12 @@ class ProductTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -305,8 +303,8 @@ class ProductTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -323,8 +321,8 @@ class ProductTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Product object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Product object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -348,10 +346,10 @@ class ProductTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -384,10 +382,10 @@ class ProductTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -423,7 +421,7 @@ class ProductTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -444,13 +442,13 @@ class ProductTableMap extends TableMap /** * Performs a DELETE on the database, given a Product or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Product object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Product object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -483,8 +481,8 @@ class ProductTableMap extends TableMap /** * Deletes all rows from the product table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -494,11 +492,11 @@ class ProductTableMap extends TableMap /** * Performs an INSERT on the database, given a Product or Criteria object. * - * @param mixed $criteria Criteria or Product object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Product object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -516,7 +514,6 @@ class ProductTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductTableMap::ID.')'); } - // Set the correct dbName $query = ProductQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php index e3e36c8be..e3129970d 100644 --- a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProductVersion; use Thelia\Model\ProductVersionQuery; - /** * This class defines the structure of the 'product_version' table. * @@ -206,7 +205,7 @@ class ProductVersionTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProductVersion $obj A \Thelia\Model\ProductVersion object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -259,7 +258,7 @@ class ProductVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -279,13 +278,12 @@ class ProductVersionTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -297,8 +295,8 @@ class ProductVersionTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -315,8 +313,8 @@ class ProductVersionTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProductVersion object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProductVersion object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -340,10 +338,10 @@ class ProductVersionTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -376,10 +374,10 @@ class ProductVersionTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -415,7 +413,7 @@ class ProductVersionTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -436,13 +434,13 @@ class ProductVersionTableMap extends TableMap /** * Performs a DELETE on the database, given a ProductVersion or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProductVersion object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProductVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -485,8 +483,8 @@ class ProductVersionTableMap extends TableMap /** * Deletes all rows from the product_version table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -496,11 +494,11 @@ class ProductVersionTableMap extends TableMap /** * Performs an INSERT on the database, given a ProductVersion or Criteria object. * - * @param mixed $criteria Criteria or ProductVersion object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProductVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -514,7 +512,6 @@ class ProductVersionTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProductVersion object } - // Set the correct dbName $query = ProductVersionQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProfileI18nTableMap.php b/core/lib/Thelia/Model/Map/ProfileI18nTableMap.php index 90d0a8a4f..47e783779 100644 --- a/core/lib/Thelia/Model/Map/ProfileI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProfileI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProfileI18n; use Thelia\Model\ProfileI18nQuery; - /** * This class defines the structure of the 'profile_i18n' table. * @@ -176,7 +175,7 @@ class ProfileI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProfileI18n $obj A \Thelia\Model\ProfileI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ProfileI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ProfileI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ProfileI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ProfileI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProfileI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProfileI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ProfileI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ProfileI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ProfileI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ProfileI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ProfileI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProfileI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProfileI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ProfileI18nTableMap extends TableMap /** * Deletes all rows from the profile_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ProfileI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ProfileI18n or Criteria object. * - * @param mixed $criteria Criteria or ProfileI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProfileI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ProfileI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProfileI18n object } - // Set the correct dbName $query = ProfileI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php b/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php index be69b51c8..077f2d94c 100644 --- a/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ProfileModuleTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProfileModule; use Thelia\Model\ProfileModuleQuery; - /** * This class defines the structure of the 'profile_module' table. * @@ -184,7 +183,7 @@ class ProfileModuleTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProfileModule $obj A \Thelia\Model\ProfileModule object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -237,7 +236,7 @@ class ProfileModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -257,13 +256,12 @@ class ProfileModuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -275,8 +273,8 @@ class ProfileModuleTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -293,8 +291,8 @@ class ProfileModuleTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProfileModule object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProfileModule object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -318,10 +316,10 @@ class ProfileModuleTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -354,10 +352,10 @@ class ProfileModuleTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -381,7 +379,7 @@ class ProfileModuleTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -402,13 +400,13 @@ class ProfileModuleTableMap extends TableMap /** * Performs a DELETE on the database, given a ProfileModule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProfileModule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProfileModule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -451,8 +449,8 @@ class ProfileModuleTableMap extends TableMap /** * Deletes all rows from the profile_module table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -462,11 +460,11 @@ class ProfileModuleTableMap extends TableMap /** * Performs an INSERT on the database, given a ProfileModule or Criteria object. * - * @param mixed $criteria Criteria or ProfileModule object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProfileModule object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -480,7 +478,6 @@ class ProfileModuleTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProfileModule object } - // Set the correct dbName $query = ProfileModuleQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProfileResourceTableMap.php b/core/lib/Thelia/Model/Map/ProfileResourceTableMap.php index de7648d54..2cd77bb4b 100644 --- a/core/lib/Thelia/Model/Map/ProfileResourceTableMap.php +++ b/core/lib/Thelia/Model/Map/ProfileResourceTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ProfileResource; use Thelia\Model\ProfileResourceQuery; - /** * This class defines the structure of the 'profile_resource' table. * @@ -185,7 +184,7 @@ class ProfileResourceTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ProfileResource $obj A \Thelia\Model\ProfileResource object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -238,7 +237,7 @@ class ProfileResourceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -258,13 +257,12 @@ class ProfileResourceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -276,8 +274,8 @@ class ProfileResourceTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -294,8 +292,8 @@ class ProfileResourceTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ProfileResource object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ProfileResource object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -319,10 +317,10 @@ class ProfileResourceTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -355,10 +353,10 @@ class ProfileResourceTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -382,7 +380,7 @@ class ProfileResourceTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -403,13 +401,13 @@ class ProfileResourceTableMap extends TableMap /** * Performs a DELETE on the database, given a ProfileResource or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ProfileResource object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ProfileResource object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -452,8 +450,8 @@ class ProfileResourceTableMap extends TableMap /** * Deletes all rows from the profile_resource table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -463,11 +461,11 @@ class ProfileResourceTableMap extends TableMap /** * Performs an INSERT on the database, given a ProfileResource or Criteria object. * - * @param mixed $criteria Criteria or ProfileResource object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ProfileResource object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -481,7 +479,6 @@ class ProfileResourceTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ProfileResource object } - // Set the correct dbName $query = ProfileResourceQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ProfileTableMap.php b/core/lib/Thelia/Model/Map/ProfileTableMap.php index 61190a033..449041c92 100644 --- a/core/lib/Thelia/Model/Map/ProfileTableMap.php +++ b/core/lib/Thelia/Model/Map/ProfileTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Profile; use Thelia\Model\ProfileQuery; - /** * This class defines the structure of the 'profile' table. * @@ -202,7 +201,7 @@ class ProfileTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -222,13 +221,12 @@ class ProfileTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -244,8 +242,8 @@ class ProfileTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -262,8 +260,8 @@ class ProfileTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Profile object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Profile object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -287,10 +285,10 @@ class ProfileTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -323,10 +321,10 @@ class ProfileTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -348,7 +346,7 @@ class ProfileTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -369,13 +367,13 @@ class ProfileTableMap extends TableMap /** * Performs a DELETE on the database, given a Profile or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Profile object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Profile object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -408,8 +406,8 @@ class ProfileTableMap extends TableMap /** * Deletes all rows from the profile table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -419,11 +417,11 @@ class ProfileTableMap extends TableMap /** * Performs an INSERT on the database, given a Profile or Criteria object. * - * @param mixed $criteria Criteria or Profile object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Profile object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -441,7 +439,6 @@ class ProfileTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProfileTableMap::ID.')'); } - // Set the correct dbName $query = ProfileQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php index f38018e8d..39769d634 100644 --- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\ResourceI18n; use Thelia\Model\ResourceI18nQuery; - /** * This class defines the structure of the 'resource_i18n' table. * @@ -176,7 +175,7 @@ class ResourceI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\ResourceI18n $obj A \Thelia\Model\ResourceI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -229,7 +228,7 @@ class ResourceI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -249,13 +248,12 @@ class ResourceI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -267,8 +265,8 @@ class ResourceI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -285,8 +283,8 @@ class ResourceI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (ResourceI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (ResourceI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -310,10 +308,10 @@ class ResourceI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -346,10 +344,10 @@ class ResourceI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -375,7 +373,7 @@ class ResourceI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -396,13 +394,13 @@ class ResourceI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a ResourceI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or ResourceI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or ResourceI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -445,8 +443,8 @@ class ResourceI18nTableMap extends TableMap /** * Deletes all rows from the resource_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -456,11 +454,11 @@ class ResourceI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a ResourceI18n or Criteria object. * - * @param mixed $criteria Criteria or ResourceI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or ResourceI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -474,7 +472,6 @@ class ResourceI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from ResourceI18n object } - // Set the correct dbName $query = ResourceI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php index bc10fcbf7..2d1abc0ca 100644 --- a/core/lib/Thelia/Model/Map/ResourceTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Resource; use Thelia\Model\ResourceQuery; - /** * This class defines the structure of the 'resource' table. * @@ -199,7 +198,7 @@ class ResourceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -219,13 +218,12 @@ class ResourceTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -241,8 +239,8 @@ class ResourceTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -259,8 +257,8 @@ class ResourceTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Resource object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Resource object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -284,10 +282,10 @@ class ResourceTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -320,10 +318,10 @@ class ResourceTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -345,7 +343,7 @@ class ResourceTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -366,13 +364,13 @@ class ResourceTableMap extends TableMap /** * Performs a DELETE on the database, given a Resource or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Resource object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Resource object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -405,8 +403,8 @@ class ResourceTableMap extends TableMap /** * Deletes all rows from the resource table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -416,11 +414,11 @@ class ResourceTableMap extends TableMap /** * Performs an INSERT on the database, given a Resource or Criteria object. * - * @param mixed $criteria Criteria or Resource object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Resource object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -438,7 +436,6 @@ class ResourceTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.ResourceTableMap::ID.')'); } - // Set the correct dbName $query = ResourceQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php b/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php index 613c2ad14..9035add9e 100644 --- a/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php +++ b/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\RewritingArgument; use Thelia\Model\RewritingArgumentQuery; - /** * This class defines the structure of the 'rewriting_argument' table. * @@ -183,7 +182,7 @@ class RewritingArgumentTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\RewritingArgument $obj A \Thelia\Model\RewritingArgument object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -236,7 +235,7 @@ class RewritingArgumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -256,13 +255,12 @@ class RewritingArgumentTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -274,8 +272,8 @@ class RewritingArgumentTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -292,8 +290,8 @@ class RewritingArgumentTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (RewritingArgument object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (RewritingArgument object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -317,10 +315,10 @@ class RewritingArgumentTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -353,10 +351,10 @@ class RewritingArgumentTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -380,7 +378,7 @@ class RewritingArgumentTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -401,13 +399,13 @@ class RewritingArgumentTableMap extends TableMap /** * Performs a DELETE on the database, given a RewritingArgument or Criteria object OR a primary key value. * - * @param mixed $values Criteria or RewritingArgument object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or RewritingArgument object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -451,8 +449,8 @@ class RewritingArgumentTableMap extends TableMap /** * Deletes all rows from the rewriting_argument table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -462,11 +460,11 @@ class RewritingArgumentTableMap extends TableMap /** * Performs an INSERT on the database, given a RewritingArgument or Criteria object. * - * @param mixed $criteria Criteria or RewritingArgument object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or RewritingArgument object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -480,7 +478,6 @@ class RewritingArgumentTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from RewritingArgument object } - // Set the correct dbName $query = RewritingArgumentQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php index aa7e1604b..b8eb03b83 100644 --- a/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php +++ b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\RewritingUrl; use Thelia\Model\RewritingUrlQuery; - /** * This class defines the structure of the 'rewriting_url' table. * @@ -212,7 +211,7 @@ class RewritingUrlTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -232,13 +231,12 @@ class RewritingUrlTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -254,8 +252,8 @@ class RewritingUrlTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -272,8 +270,8 @@ class RewritingUrlTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (RewritingUrl object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (RewritingUrl object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -297,10 +295,10 @@ class RewritingUrlTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -333,10 +331,10 @@ class RewritingUrlTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -366,7 +364,7 @@ class RewritingUrlTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -387,13 +385,13 @@ class RewritingUrlTableMap extends TableMap /** * Performs a DELETE on the database, given a RewritingUrl or Criteria object OR a primary key value. * - * @param mixed $values Criteria or RewritingUrl object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or RewritingUrl object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -426,8 +424,8 @@ class RewritingUrlTableMap extends TableMap /** * Deletes all rows from the rewriting_url table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -437,11 +435,11 @@ class RewritingUrlTableMap extends TableMap /** * Performs an INSERT on the database, given a RewritingUrl or Criteria object. * - * @param mixed $criteria Criteria or RewritingUrl object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or RewritingUrl object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -459,7 +457,6 @@ class RewritingUrlTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.RewritingUrlTableMap::ID.')'); } - // Set the correct dbName $query = RewritingUrlQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php index 222bfa833..700fa089e 100644 --- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\TaxI18n; use Thelia\Model\TaxI18nQuery; - /** * This class defines the structure of the 'tax_i18n' table. * @@ -164,7 +163,7 @@ class TaxI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\TaxI18n $obj A \Thelia\Model\TaxI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -217,7 +216,7 @@ class TaxI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -237,13 +236,12 @@ class TaxI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -255,8 +253,8 @@ class TaxI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -273,8 +271,8 @@ class TaxI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (TaxI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (TaxI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -298,10 +296,10 @@ class TaxI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -334,10 +332,10 @@ class TaxI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class TaxI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class TaxI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a TaxI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or TaxI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or TaxI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -429,8 +427,8 @@ class TaxI18nTableMap extends TableMap /** * Deletes all rows from the tax_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -440,11 +438,11 @@ class TaxI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a TaxI18n or Criteria object. * - * @param mixed $criteria Criteria or TaxI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or TaxI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -458,7 +456,6 @@ class TaxI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from TaxI18n object } - // Set the correct dbName $query = TaxI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php index 6fe5c8cd5..4c999f3f6 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\TaxRuleCountry; use Thelia\Model\TaxRuleCountryQuery; - /** * This class defines the structure of the 'tax_rule_country' table. * @@ -191,7 +190,7 @@ class TaxRuleCountryTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\TaxRuleCountry $obj A \Thelia\Model\TaxRuleCountry object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -244,7 +243,7 @@ class TaxRuleCountryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -264,13 +263,12 @@ class TaxRuleCountryTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -282,8 +280,8 @@ class TaxRuleCountryTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -300,8 +298,8 @@ class TaxRuleCountryTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (TaxRuleCountry object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (TaxRuleCountry object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -325,10 +323,10 @@ class TaxRuleCountryTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -361,10 +359,10 @@ class TaxRuleCountryTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -390,7 +388,7 @@ class TaxRuleCountryTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -411,13 +409,13 @@ class TaxRuleCountryTableMap extends TableMap /** * Performs a DELETE on the database, given a TaxRuleCountry or Criteria object OR a primary key value. * - * @param mixed $values Criteria or TaxRuleCountry object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or TaxRuleCountry object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -461,8 +459,8 @@ class TaxRuleCountryTableMap extends TableMap /** * Deletes all rows from the tax_rule_country table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -472,11 +470,11 @@ class TaxRuleCountryTableMap extends TableMap /** * Performs an INSERT on the database, given a TaxRuleCountry or Criteria object. * - * @param mixed $criteria Criteria or TaxRuleCountry object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or TaxRuleCountry object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -490,7 +488,6 @@ class TaxRuleCountryTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from TaxRuleCountry object } - // Set the correct dbName $query = TaxRuleCountryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php index 74cea24f3..524c5ac11 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\TaxRuleI18n; use Thelia\Model\TaxRuleI18nQuery; - /** * This class defines the structure of the 'tax_rule_i18n' table. * @@ -164,7 +163,7 @@ class TaxRuleI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\TaxRuleI18n $obj A \Thelia\Model\TaxRuleI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -217,7 +216,7 @@ class TaxRuleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -237,13 +236,12 @@ class TaxRuleI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -255,8 +253,8 @@ class TaxRuleI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -273,8 +271,8 @@ class TaxRuleI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (TaxRuleI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (TaxRuleI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -298,10 +296,10 @@ class TaxRuleI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -334,10 +332,10 @@ class TaxRuleI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -359,7 +357,7 @@ class TaxRuleI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -380,13 +378,13 @@ class TaxRuleI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a TaxRuleI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or TaxRuleI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or TaxRuleI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -429,8 +427,8 @@ class TaxRuleI18nTableMap extends TableMap /** * Deletes all rows from the tax_rule_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -440,11 +438,11 @@ class TaxRuleI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a TaxRuleI18n or Criteria object. * - * @param mixed $criteria Criteria or TaxRuleI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or TaxRuleI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -458,7 +456,6 @@ class TaxRuleI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from TaxRuleI18n object } - // Set the correct dbName $query = TaxRuleI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php index afc242df3..89b7afb04 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\TaxRule; use Thelia\Model\TaxRuleQuery; - /** * This class defines the structure of the 'tax_rule' table. * @@ -199,7 +198,7 @@ class TaxRuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -219,13 +218,12 @@ class TaxRuleTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -241,8 +239,8 @@ class TaxRuleTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -259,8 +257,8 @@ class TaxRuleTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (TaxRule object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (TaxRule object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -284,10 +282,10 @@ class TaxRuleTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -320,10 +318,10 @@ class TaxRuleTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -345,7 +343,7 @@ class TaxRuleTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -366,13 +364,13 @@ class TaxRuleTableMap extends TableMap /** * Performs a DELETE on the database, given a TaxRule or Criteria object OR a primary key value. * - * @param mixed $values Criteria or TaxRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or TaxRule object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -405,8 +403,8 @@ class TaxRuleTableMap extends TableMap /** * Deletes all rows from the tax_rule table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -416,11 +414,11 @@ class TaxRuleTableMap extends TableMap /** * Performs an INSERT on the database, given a TaxRule or Criteria object. * - * @param mixed $criteria Criteria or TaxRule object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or TaxRule object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -438,7 +436,6 @@ class TaxRuleTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.TaxRuleTableMap::ID.')'); } - // Set the correct dbName $query = TaxRuleQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php index 360291504..9411259ce 100644 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Tax; use Thelia\Model\TaxQuery; - /** * This class defines the structure of the 'tax' table. * @@ -204,7 +203,7 @@ class TaxTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -224,13 +223,12 @@ class TaxTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -246,8 +244,8 @@ class TaxTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -264,8 +262,8 @@ class TaxTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Tax object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Tax object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -289,10 +287,10 @@ class TaxTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -325,10 +323,10 @@ class TaxTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -352,7 +350,7 @@ class TaxTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -373,13 +371,13 @@ class TaxTableMap extends TableMap /** * Performs a DELETE on the database, given a Tax or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Tax object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Tax object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -412,8 +410,8 @@ class TaxTableMap extends TableMap /** * Deletes all rows from the tax table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -423,11 +421,11 @@ class TaxTableMap extends TableMap /** * Performs an INSERT on the database, given a Tax or Criteria object. * - * @param mixed $criteria Criteria or Tax object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Tax object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -445,7 +443,6 @@ class TaxTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.TaxTableMap::ID.')'); } - // Set the correct dbName $query = TaxQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TemplateI18nTableMap.php b/core/lib/Thelia/Model/Map/TemplateI18nTableMap.php index b47656ec0..04d444b7b 100644 --- a/core/lib/Thelia/Model/Map/TemplateI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TemplateI18nTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\TemplateI18n; use Thelia\Model\TemplateI18nQuery; - /** * This class defines the structure of the 'template_i18n' table. * @@ -158,7 +157,7 @@ class TemplateI18nTableMap extends TableMap * and findPk*() calls. * * @param \Thelia\Model\TemplateI18n $obj A \Thelia\Model\TemplateI18n object. - * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). */ public static function addInstanceToPool($obj, $key = null) { @@ -211,7 +210,7 @@ class TemplateI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -231,13 +230,12 @@ class TemplateI18nTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return $pks; } @@ -249,8 +247,8 @@ class TemplateI18nTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -267,8 +265,8 @@ class TemplateI18nTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (TemplateI18n object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (TemplateI18n object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -292,10 +290,10 @@ class TemplateI18nTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -328,10 +326,10 @@ class TemplateI18nTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -351,7 +349,7 @@ class TemplateI18nTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -372,13 +370,13 @@ class TemplateI18nTableMap extends TableMap /** * Performs a DELETE on the database, given a TemplateI18n or Criteria object OR a primary key value. * - * @param mixed $values Criteria or TemplateI18n object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or TemplateI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -421,8 +419,8 @@ class TemplateI18nTableMap extends TableMap /** * Deletes all rows from the template_i18n table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -432,11 +430,11 @@ class TemplateI18nTableMap extends TableMap /** * Performs an INSERT on the database, given a TemplateI18n or Criteria object. * - * @param mixed $criteria Criteria or TemplateI18n object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or TemplateI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -450,7 +448,6 @@ class TemplateI18nTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from TemplateI18n object } - // Set the correct dbName $query = TemplateI18nQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TemplateTableMap.php b/core/lib/Thelia/Model/Map/TemplateTableMap.php index 901007c03..a8ca8d607 100644 --- a/core/lib/Thelia/Model/Map/TemplateTableMap.php +++ b/core/lib/Thelia/Model/Map/TemplateTableMap.php @@ -14,7 +14,6 @@ use Propel\Runtime\Map\TableMapTrait; use Thelia\Model\Template; use Thelia\Model\TemplateQuery; - /** * This class defines the structure of the 'template' table. * @@ -195,7 +194,7 @@ class TemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM */ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -215,13 +214,12 @@ class TemplateTableMap extends TableMap * @param array $row resultset row. * @param int $offset The 0-based offset for reading from the resultset row. * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM * * @return mixed The primary key of the row */ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ $indexType == TableMap::TYPE_NUM ? 0 + $offset @@ -237,8 +235,8 @@ class TemplateTableMap extends TableMap * relative to a location on the PHP include_path. * (e.g. path.to.MyClass -> 'path/to/MyClass.php') * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName */ public static function getOMClass($withPrefix = true) { @@ -255,8 +253,8 @@ class TemplateTableMap extends TableMap * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. * * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (Template object, last column rank) + * rethrown wrapped into a PropelException. + * @return array (Template object, last column rank) */ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { @@ -280,10 +278,10 @@ class TemplateTableMap extends TableMap * The returned array will contain objects of the default type or * objects that inherit from the default. * - * @param DataFetcherInterface $dataFetcher + * @param DataFetcherInterface $dataFetcher * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function populateObjects(DataFetcherInterface $dataFetcher) { @@ -316,10 +314,10 @@ class TemplateTableMap extends TableMap * XML schema will not be added to the select list and only loaded * on demand. * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function addSelectColumns(Criteria $criteria, $alias = null) { @@ -339,7 +337,7 @@ class TemplateTableMap extends TableMap * This method is not needed for general use but a specific application could have a need. * @return TableMap * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * rethrown wrapped into a PropelException. */ public static function getTableMap() { @@ -360,13 +358,13 @@ class TemplateTableMap extends TableMap /** * Performs a DELETE on the database, given a Template or Criteria object OR a primary key value. * - * @param mixed $values Criteria or Template object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $values Criteria or Template object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doDelete($values, ConnectionInterface $con = null) { @@ -399,8 +397,8 @@ class TemplateTableMap extends TableMap /** * Deletes all rows from the template table. * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(ConnectionInterface $con = null) { @@ -410,11 +408,11 @@ class TemplateTableMap extends TableMap /** * Performs an INSERT on the database, given a Template or Criteria object. * - * @param mixed $criteria Criteria or Template object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. + * @param mixed $criteria Criteria or Template object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. */ public static function doInsert($criteria, ConnectionInterface $con = null) { @@ -432,7 +430,6 @@ class TemplateTableMap extends TableMap throw new PropelException('Cannot insert a value for auto-increment primary key ('.TemplateTableMap::ID.')'); } - // Set the correct dbName $query = TemplateQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php index 190ceff03..168136f3c 100644 --- a/core/lib/Thelia/Model/Message.php +++ b/core/lib/Thelia/Model/Message.php @@ -9,8 +9,8 @@ use Thelia\Core\Event\Message\MessageEvent; use Thelia\Core\Template\ParserInterface; use Thelia\Core\Template\TemplateHelper; -class Message extends BaseMessage { - +class Message extends BaseMessage +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; /** @@ -70,8 +70,8 @@ class Message extends BaseMessage { /** * Calculate the message body, given the HTML entered in the back-office, the message layout, and the message template */ - protected function getMessageBody($parser, $message, $layout, $template) { - + protected function getMessageBody($parser, $message, $layout, $template) + { $body = false; $mail_template_path = TemplateHelper::getInstance()->getActiveMailTemplate()->getAbsolutePath() . DS; @@ -107,8 +107,8 @@ class Message extends BaseMessage { /** * Get the HTML message body */ - public function getHtmlMessageBody(ParserInterface $parser) { - + public function getHtmlMessageBody(ParserInterface $parser) + { return $this->getMessageBody( $parser, $this->getHtmlMessage(), @@ -120,8 +120,8 @@ class Message extends BaseMessage { /** * Get the TEXT message body */ - public function getTextMessageBody(ParserInterface $parser) { - + public function getTextMessageBody(ParserInterface $parser) + { return $this->getMessageBody( $parser, $this->getTextMessage(), @@ -134,8 +134,8 @@ class Message extends BaseMessage { * Add a subject and a body (TEXT, HTML or both, depending on the message * configuration. */ - public function buildMessage($parser, \Swift_Message $messageInstance) { - + public function buildMessage($parser, \Swift_Message $messageInstance) + { $subject = $parser->fetch(sprintf("string:%s", $this->getSubject())); $htmlMessage = $this->getHtmlMessageBody($parser); $textMessage = $this->getTextMessageBody($parser); @@ -146,8 +146,7 @@ class Message extends BaseMessage { if (empty($htmlMessage)) { // Message body is the text message $messageInstance->setBody($textMessage, 'text/plain'); - } - else { + } else { // The main body is the HTML messahe $messageInstance->setBody($htmlMessage, 'text/html'); @@ -159,4 +158,4 @@ class Message extends BaseMessage { return $messageInstance; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/MessageI18n.php b/core/lib/Thelia/Model/MessageI18n.php index 07766d122..93e176a72 100644 --- a/core/lib/Thelia/Model/MessageI18n.php +++ b/core/lib/Thelia/Model/MessageI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\MessageI18n as BaseMessageI18n; -class MessageI18n extends BaseMessageI18n { - +class MessageI18n extends BaseMessageI18n +{ } diff --git a/core/lib/Thelia/Model/MessageI18nQuery.php b/core/lib/Thelia/Model/MessageI18nQuery.php index 0db29f6d9..aa3e2a08d 100644 --- a/core/lib/Thelia/Model/MessageI18nQuery.php +++ b/core/lib/Thelia/Model/MessageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\MessageI18nQuery as BaseMessageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'message_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\MessageI18nQuery as BaseMessageI18nQuery; * long as it does not already exist in the output directory. * */ -class MessageI18nQuery extends BaseMessageI18nQuery { - +class MessageI18nQuery extends BaseMessageI18nQuery +{ } // MessageI18nQuery diff --git a/core/lib/Thelia/Model/MessageQuery.php b/core/lib/Thelia/Model/MessageQuery.php index 491af6189..0b9be01fe 100644 --- a/core/lib/Thelia/Model/MessageQuery.php +++ b/core/lib/Thelia/Model/MessageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\MessageQuery as BaseMessageQuery; - /** * Skeleton subclass for performing query and update operations on the 'message' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\MessageQuery as BaseMessageQuery; * long as it does not already exist in the output directory. * */ -class MessageQuery extends BaseMessageQuery { - +class MessageQuery extends BaseMessageQuery +{ } // MessageQuery diff --git a/core/lib/Thelia/Model/MessageVersion.php b/core/lib/Thelia/Model/MessageVersion.php index 38a24b8ac..b96cd6c91 100644 --- a/core/lib/Thelia/Model/MessageVersion.php +++ b/core/lib/Thelia/Model/MessageVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\MessageVersion as BaseMessageVersion; -class MessageVersion extends BaseMessageVersion { - +class MessageVersion extends BaseMessageVersion +{ } diff --git a/core/lib/Thelia/Model/MessageVersionQuery.php b/core/lib/Thelia/Model/MessageVersionQuery.php index 6910813d5..69fafe0be 100644 --- a/core/lib/Thelia/Model/MessageVersionQuery.php +++ b/core/lib/Thelia/Model/MessageVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\MessageVersionQuery as BaseMessageVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'message_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\MessageVersionQuery as BaseMessageVersionQuery; * long as it does not already exist in the output directory. * */ -class MessageVersionQuery extends BaseMessageVersionQuery { - +class MessageVersionQuery extends BaseMessageVersionQuery +{ } // MessageVersionQuery diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php index 957ced4ab..65ea065d9 100644 --- a/core/lib/Thelia/Model/Module.php +++ b/core/lib/Thelia/Model/Module.php @@ -6,7 +6,6 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\Module as BaseModule; use Thelia\Model\Tools\ModelEventDispatcherTrait; - class Module extends BaseModule { use ModelEventDispatcherTrait; @@ -21,42 +20,48 @@ class Module extends BaseModule /** * @return the module's base directory path, relative to THELIA_MODULE_DIR */ - public function getBaseDir() { + public function getBaseDir() + { return ucfirst($this->getCode()); } /** * @return the module's base directory path, relative to THELIA_MODULE_DIR */ - public function getAbsoluteBaseDir() { + public function getAbsoluteBaseDir() + { return THELIA_MODULE_DIR . $this->getBaseDir(); } /** * @return the module's config directory path, relative to THELIA_MODULE_DIR */ - public function getConfigPath() { + public function getConfigPath() + { return $this->getBaseDir() . DS . "Config"; } /** * @return the module's config absolute directory path */ - public function getAbsoluteConfigPath() { + public function getAbsoluteConfigPath() + { return THELIA_MODULE_DIR . $this->getConfigPath(); } /** * @return the module's i18N directory path, relative to THELIA_MODULE_DIR */ - public function getI18nPath() { + public function getI18nPath() + { return $this->getBaseDir() . DS . "I18n"; } /** * @return the module's i18N absolute directory path */ - public function getAbsoluteI18nPath() { + public function getAbsoluteI18nPath() + { return THELIA_MODULE_DIR . $this->getI18nPath(); } @@ -65,14 +70,16 @@ class Module extends BaseModule * * @param int $templateSubdirName the name of the, probably one of TemplateDefinition::xxx_SUBDIR constants */ - public function getAbsoluteTemplateDirectoryPath($templateSubdirName) { + public function getAbsoluteTemplateDirectoryPath($templateSubdirName) + { return sprintf("%s%stemplates%s%s", $this->getAbsoluteBaseDir(), DS, DS, $templateSubdirName); } /** * Calculate next position relative to module type */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByType($this->getType()); } @@ -85,4 +92,4 @@ class Module extends BaseModule return true; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/ModuleI18n.php b/core/lib/Thelia/Model/ModuleI18n.php index f1de32b47..0a25ea9be 100644 --- a/core/lib/Thelia/Model/ModuleI18n.php +++ b/core/lib/Thelia/Model/ModuleI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ModuleI18n as BaseModuleI18n; -class ModuleI18n extends BaseModuleI18n { - +class ModuleI18n extends BaseModuleI18n +{ } diff --git a/core/lib/Thelia/Model/ModuleI18nQuery.php b/core/lib/Thelia/Model/ModuleI18nQuery.php index 6afa6fcca..6fe7034ee 100644 --- a/core/lib/Thelia/Model/ModuleI18nQuery.php +++ b/core/lib/Thelia/Model/ModuleI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ModuleI18nQuery as BaseModuleI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'module_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ModuleI18nQuery as BaseModuleI18nQuery; * long as it does not already exist in the output directory. * */ -class ModuleI18nQuery extends BaseModuleI18nQuery { - +class ModuleI18nQuery extends BaseModuleI18nQuery +{ } // ModuleI18nQuery diff --git a/core/lib/Thelia/Model/ModuleImageI18nQuery.php b/core/lib/Thelia/Model/ModuleImageI18nQuery.php index 85bbcc8d8..138df0638 100644 --- a/core/lib/Thelia/Model/ModuleImageI18nQuery.php +++ b/core/lib/Thelia/Model/ModuleImageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ModuleImageI18nQuery as BaseModuleImageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'module_image_i18n' table. * diff --git a/core/lib/Thelia/Model/ModuleImageQuery.php b/core/lib/Thelia/Model/ModuleImageQuery.php index b4ac7b2bb..f02ad9de3 100644 --- a/core/lib/Thelia/Model/ModuleImageQuery.php +++ b/core/lib/Thelia/Model/ModuleImageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ModuleImageQuery as BaseModuleImageQuery; - /** * Skeleton subclass for performing query and update operations on the 'module_image' table. * diff --git a/core/lib/Thelia/Model/ModuleQuery.php b/core/lib/Thelia/Model/ModuleQuery.php index aaf2092e6..dfe9b1b3c 100644 --- a/core/lib/Thelia/Model/ModuleQuery.php +++ b/core/lib/Thelia/Model/ModuleQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ModuleQuery as BaseModuleQuery; - /** * Skeleton subclass for performing query and update operations on the 'module' table. * @@ -15,15 +14,15 @@ use Thelia\Model\Base\ModuleQuery as BaseModuleQuery; * long as it does not already exist in the output directory. * */ -class ModuleQuery extends BaseModuleQuery { - +class ModuleQuery extends BaseModuleQuery +{ protected static $activated = null; /** * @return array|mixed|\PropelObjectCollection */ public static function getActivated() { - if(null === self::$activated) { + if (null === self::$activated) { self::$activated = self::create() ->filterByActivate(1) ->find(); @@ -37,5 +36,4 @@ class ModuleQuery extends BaseModuleQuery { self::$activated = null; } - } // ModuleQuery diff --git a/core/lib/Thelia/Model/NewsletterQuery.php b/core/lib/Thelia/Model/NewsletterQuery.php index 26b4d2614..dd0f6dd94 100644 --- a/core/lib/Thelia/Model/NewsletterQuery.php +++ b/core/lib/Thelia/Model/NewsletterQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\NewsletterQuery as BaseNewsletterQuery; - /** * Skeleton subclass for performing query and update operations on the 'newsletter' table. * diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 4add32a45..142f1e944 100644 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -11,7 +11,6 @@ use Thelia\Model\Base\Order as BaseOrder; use Thelia\Model\Base\OrderProductTaxQuery; use Thelia\Model\Map\OrderProductTaxTableMap; - class Order extends BaseOrder { use \Thelia\Model\Tools\ModelEventDispatcherTrait; @@ -42,6 +41,7 @@ class Order extends BaseOrder public function generateRef() { /* order addresses are unique */ + return uniqid('ORD', true); } @@ -59,10 +59,10 @@ class Order extends BaseOrder $tax = 0; /* browse all products */ - foreach($this->getOrderProducts() as $orderProduct) { + foreach ($this->getOrderProducts() as $orderProduct) { $taxAmountQuery = OrderProductTaxQuery::create(); - if($orderProduct->getWasInPromo() == 1) { + if ($orderProduct->getWasInPromo() == 1) { $taxAmountQuery->withColumn('SUM(' . OrderProductTaxTableMap::PROMO_AMOUNT . ')', 'total_tax'); } else { $taxAmountQuery->withColumn('SUM(' . OrderProductTaxTableMap::AMOUNT . ')', 'total_tax'); @@ -77,17 +77,17 @@ class Order extends BaseOrder $total = $amount + $tax; // @todo : manage discount : free postage ? - if(true === $includeDiscount) { + if (true === $includeDiscount) { $total -= $this->getDiscount(); - if($total<0) { + if ($total<0) { $total = 0; } else { $total = round($total, 2); } } - if(false !== $includePostage) { + if (false !== $includePostage) { $total += $this->getPostage(); } diff --git a/core/lib/Thelia/Model/OrderAddress.php b/core/lib/Thelia/Model/OrderAddress.php index bb024546b..75565a715 100644 --- a/core/lib/Thelia/Model/OrderAddress.php +++ b/core/lib/Thelia/Model/OrderAddress.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderAddress as BaseOrderAddress; -class OrderAddress extends BaseOrderAddress { - +class OrderAddress extends BaseOrderAddress +{ } diff --git a/core/lib/Thelia/Model/OrderAddressQuery.php b/core/lib/Thelia/Model/OrderAddressQuery.php index 007697b13..a9e514a7f 100644 --- a/core/lib/Thelia/Model/OrderAddressQuery.php +++ b/core/lib/Thelia/Model/OrderAddressQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderAddressQuery as BaseOrderAddressQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_address' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\OrderAddressQuery as BaseOrderAddressQuery; * long as it does not already exist in the output directory. * */ -class OrderAddressQuery extends BaseOrderAddressQuery { - +class OrderAddressQuery extends BaseOrderAddressQuery +{ } // OrderAddressQuery diff --git a/core/lib/Thelia/Model/OrderCouponQuery.php b/core/lib/Thelia/Model/OrderCouponQuery.php index a730fcb07..49b43923f 100644 --- a/core/lib/Thelia/Model/OrderCouponQuery.php +++ b/core/lib/Thelia/Model/OrderCouponQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderCouponQuery as BaseOrderCouponQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_coupon' table. * diff --git a/core/lib/Thelia/Model/OrderFeature.php b/core/lib/Thelia/Model/OrderFeature.php index 775de960f..0e4d8cc6e 100644 --- a/core/lib/Thelia/Model/OrderFeature.php +++ b/core/lib/Thelia/Model/OrderFeature.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderFeature as BaseOrderFeature; -class OrderFeature extends BaseOrderFeature { - +class OrderFeature extends BaseOrderFeature +{ } diff --git a/core/lib/Thelia/Model/OrderFeatureQuery.php b/core/lib/Thelia/Model/OrderFeatureQuery.php index ff76fbbd3..20bfbe6e0 100644 --- a/core/lib/Thelia/Model/OrderFeatureQuery.php +++ b/core/lib/Thelia/Model/OrderFeatureQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderFeatureQuery as BaseOrderFeatureQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_feature' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\OrderFeatureQuery as BaseOrderFeatureQuery; * long as it does not already exist in the output directory. * */ -class OrderFeatureQuery extends BaseOrderFeatureQuery { - +class OrderFeatureQuery extends BaseOrderFeatureQuery +{ } // OrderFeatureQuery diff --git a/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php b/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php index f2d6a6ddc..cd4090162 100644 --- a/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php +++ b/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderProductAttributeCombinationQuery as BaseOrderProductAttributeCombinationQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_product_attribute_combination' table. * diff --git a/core/lib/Thelia/Model/OrderProductQuery.php b/core/lib/Thelia/Model/OrderProductQuery.php index de2c22404..cce22dc58 100644 --- a/core/lib/Thelia/Model/OrderProductQuery.php +++ b/core/lib/Thelia/Model/OrderProductQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderProductQuery as BaseOrderProductQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_product' table. * diff --git a/core/lib/Thelia/Model/OrderProductTaxQuery.php b/core/lib/Thelia/Model/OrderProductTaxQuery.php index f4bbaaa3d..78deabee3 100644 --- a/core/lib/Thelia/Model/OrderProductTaxQuery.php +++ b/core/lib/Thelia/Model/OrderProductTaxQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderProductTaxQuery as BaseOrderProductTaxQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_product_tax' table. * diff --git a/core/lib/Thelia/Model/OrderQuery.php b/core/lib/Thelia/Model/OrderQuery.php index ac52218a9..0dc387406 100644 --- a/core/lib/Thelia/Model/OrderQuery.php +++ b/core/lib/Thelia/Model/OrderQuery.php @@ -5,7 +5,6 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Join; - use Propel\Runtime\Propel; use Thelia\Model\Base\OrderQuery as BaseOrderQuery; @@ -30,7 +29,7 @@ class OrderQuery extends BaseOrderQuery $numberOfDay = cal_days_in_month(CAL_GREGORIAN, $month, $year); $stats = array(); - for($day=1; $day<=$numberOfDay; $day++) { + for ($day=1; $day<=$numberOfDay; $day++) { $dayAmount = self::getSaleStats( new \DateTime(sprintf('%s-%s-%s', $year, $month, $day)), new \DateTime(sprintf('%s-%s-%s', $year, $month, $day)), @@ -47,11 +46,11 @@ class OrderQuery extends BaseOrderQuery $numberOfDay = cal_days_in_month(CAL_GREGORIAN, $month, $year); $stats = array(); - for($day=1; $day<=$numberOfDay; $day++) { + for ($day=1; $day<=$numberOfDay; $day++) { $dayOrdersQuery = self::create() ->filterByCreatedAt(sprintf("%s-%s-%s 00:00:00", $year, $month, $day), Criteria::GREATER_EQUAL) ->filterByCreatedAt(sprintf("%s-%s-%s 23:59:59", $year, $month, $day), Criteria::LESS_EQUAL); - if(null !== $status) { + if (null !== $status) { $dayOrdersQuery->filterByStatusId($status, Criteria::IN); } $dayOrders = $dayOrdersQuery->count(); @@ -66,7 +65,7 @@ class OrderQuery extends BaseOrderQuery $numberOfDay = cal_days_in_month(CAL_GREGORIAN, $month, $year); $stats = array(); - for($day=1; $day<=$numberOfDay; $day++) { + for ($day=1; $day<=$numberOfDay; $day++) { $dayOrdersQuery = self::create('matching_order') ->filterByCreatedAt(sprintf("%s-%s-%s 00:00:00", $year, $month, $day), Criteria::GREATER_EQUAL) ->filterByCreatedAt(sprintf("%s-%s-%s 23:59:59", $year, $month, $day), Criteria::LESS_EQUAL); @@ -111,7 +110,7 @@ class OrderQuery extends BaseOrderQuery ; - if($includeShipping) { + if ($includeShipping) { $query->withColumn("SUM((`order_product`.QUANTITY * IF(`order_product`.WAS_IN_PROMO,`order_product`.PROMO_PRICE+`order_product_tax`.PROMO_AMOUNT,`order_product`.PRICE+`order_product_tax`.AMOUNT)) + `order`.postage )", 'TOTAL'); } else { $query->withColumn("SUM((`order_product`.QUANTITY * IF(`order_product`.WAS_IN_PROMO,`order_product`.PROMO_PRICE+`order_product_tax`.PROMO_AMOUNT,`order_product`.PRICE+`order_product_tax`.AMOUNT)))", 'TOTAL'); diff --git a/core/lib/Thelia/Model/OrderStatusI18n.php b/core/lib/Thelia/Model/OrderStatusI18n.php index e80c3806f..80bffa483 100644 --- a/core/lib/Thelia/Model/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/OrderStatusI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderStatusI18n as BaseOrderStatusI18n; -class OrderStatusI18n extends BaseOrderStatusI18n { - +class OrderStatusI18n extends BaseOrderStatusI18n +{ } diff --git a/core/lib/Thelia/Model/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/OrderStatusI18nQuery.php index 3ddc4c28f..0d50ce9b0 100644 --- a/core/lib/Thelia/Model/OrderStatusI18nQuery.php +++ b/core/lib/Thelia/Model/OrderStatusI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderStatusI18nQuery as BaseOrderStatusI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_status_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\OrderStatusI18nQuery as BaseOrderStatusI18nQuery; * long as it does not already exist in the output directory. * */ -class OrderStatusI18nQuery extends BaseOrderStatusI18nQuery { - +class OrderStatusI18nQuery extends BaseOrderStatusI18nQuery +{ } // OrderStatusI18nQuery diff --git a/core/lib/Thelia/Model/OrderStatusQuery.php b/core/lib/Thelia/Model/OrderStatusQuery.php index f241d0a0d..c4ce4e325 100644 --- a/core/lib/Thelia/Model/OrderStatusQuery.php +++ b/core/lib/Thelia/Model/OrderStatusQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\OrderStatusQuery as BaseOrderStatusQuery; - /** * Skeleton subclass for performing query and update operations on the 'order_status' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\OrderStatusQuery as BaseOrderStatusQuery; * long as it does not already exist in the output directory. * */ -class OrderStatusQuery extends BaseOrderStatusQuery { - +class OrderStatusQuery extends BaseOrderStatusQuery +{ } // OrderStatusQuery diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index d636c64a4..a8d342f0e 100644 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -13,7 +13,6 @@ use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Propel; use Thelia\Model\Map\ProductTableMap; - class Product extends BaseProduct { use \Thelia\Model\Tools\ModelEventDispatcherTrait; @@ -25,7 +24,8 @@ class Product extends BaseProduct /** * {@inheritDoc} */ - protected function getRewrittenUrlViewName() { + protected function getRewrittenUrlViewName() + { return 'product'; } @@ -33,8 +33,7 @@ class Product extends BaseProduct { try { $amount = $this->getVirtualColumn($virtualColumnName); - } - catch(PropelException $e) { + } catch (PropelException $e) { throw new PropelException("Virtual column `$virtualColumnName` does not exist in Product::getRealLowestPrice"); } @@ -44,12 +43,14 @@ class Product extends BaseProduct public function getTaxedPrice(Country $country, $price) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this, $country)->getTaxedPrice($price), 2); } public function getTaxedPromoPrice(Country $country, $price) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this, $country)->getTaxedPrice($price), 2); } @@ -58,14 +59,16 @@ class Product extends BaseProduct * * @return ProductSaleElements */ - public function getDefaultSaleElements() { + public function getDefaultSaleElements() + { return ProductSaleElementsQuery::create()->filterByProductId($this->id)->filterByIsDefault(true)->find(); } /** * Return PSE count fir this product. */ - public function countSaleElements() { + public function countSaleElements() + { return ProductSaleElementsQuery::create()->filterByProductId($this->id)->filterByIsDefault(true)->count(); } @@ -109,8 +112,8 @@ class Product extends BaseProduct return $this; } - public function updateDefaultCategory($defaultCategoryId) { - + public function updateDefaultCategory($defaultCategoryId) + { // Allow uncategorized products (NULL instead of 0, to bypass delete cascade constraint) if ($defaultCategoryId <= 0) $defaultCategoryId = NULL; @@ -141,15 +144,15 @@ class Product extends BaseProduct /** * Create a new product, along with the default category ID * - * @param int $defaultCategoryId the default category ID of this product - * @param float $basePrice the product base price - * @param int $priceCurrencyId the price currency Id - * @param int $taxRuleId the product tax rule ID - * @param float $baseWeight base weight in Kg + * @param int $defaultCategoryId the default category ID of this product + * @param float $basePrice the product base price + * @param int $priceCurrencyId the price currency Id + * @param int $taxRuleId the product tax rule ID + * @param float $baseWeight base weight in Kg */ - public function create($defaultCategoryId, $basePrice, $priceCurrencyId, $taxRuleId, $baseWeight) { - + public function create($defaultCategoryId, $basePrice, $priceCurrencyId, $taxRuleId, $baseWeight) + { $con = Propel::getWriteConnection(ProductTableMap::DATABASE_NAME); $con->beginTransaction(); @@ -175,8 +178,7 @@ class Product extends BaseProduct $con->commit(); $this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this)); - } - catch(\Exception $ex) { + } catch (\Exception $ex) { $con->rollback(); @@ -187,8 +189,8 @@ class Product extends BaseProduct /** * Create a basic product sale element attached to this product. */ - public function createProductSaleElement(ConnectionInterface $con, $weight, $basePrice, $salePrice, $currencyId, $isDefault, $isPromo = false, $isNew = false, $quantity = 0, $eanCode = '', $ref = false) { - + public function createProductSaleElement(ConnectionInterface $con, $weight, $basePrice, $salePrice, $currencyId, $isDefault, $isPromo = false, $isNew = false, $quantity = 0, $eanCode = '', $ref = false) + { // Create an empty product sale element $sale_elements = new ProductSaleElements(); @@ -234,7 +236,6 @@ class Product extends BaseProduct if ($produits != null) $query->filterById($produits, Criteria::IN); } - public function preUpdate(ConnectionInterface $con = null) { $this->dispatchEvent(TheliaEvents::BEFORE_UPDATEPRODUCT, new ProductEvent($this)); diff --git a/core/lib/Thelia/Model/ProductAssociatedContent.php b/core/lib/Thelia/Model/ProductAssociatedContent.php index 12be080fc..ba99ac44a 100644 --- a/core/lib/Thelia/Model/ProductAssociatedContent.php +++ b/core/lib/Thelia/Model/ProductAssociatedContent.php @@ -7,8 +7,8 @@ use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\Product\ProductAssociatedContentEvent; use Thelia\Core\Event\TheliaEvents; -class ProductAssociatedContent extends BaseProductAssociatedContent { - +class ProductAssociatedContent extends BaseProductAssociatedContent +{ use \Thelia\Model\Tools\ModelEventDispatcherTrait; use \Thelia\Model\Tools\PositionManagementTrait; @@ -16,7 +16,8 @@ class ProductAssociatedContent extends BaseProductAssociatedContent { /** * Calculate next position relative to our product */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByProductId($this->getProductId()); } diff --git a/core/lib/Thelia/Model/ProductAssociatedContentQuery.php b/core/lib/Thelia/Model/ProductAssociatedContentQuery.php index 855151788..3522c8ef9 100644 --- a/core/lib/Thelia/Model/ProductAssociatedContentQuery.php +++ b/core/lib/Thelia/Model/ProductAssociatedContentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductAssociatedContentQuery as BaseProductAssociatedContentQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_associated_content' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ProductAssociatedContentQuery as BaseProductAssociatedCont * long as it does not already exist in the output directory. * */ -class ProductAssociatedContentQuery extends BaseProductAssociatedContentQuery { - +class ProductAssociatedContentQuery extends BaseProductAssociatedContentQuery +{ } // ProductAssociatedContentQuery diff --git a/core/lib/Thelia/Model/ProductCategory.php b/core/lib/Thelia/Model/ProductCategory.php index f9be5dac8..e3e2c5103 100644 --- a/core/lib/Thelia/Model/ProductCategory.php +++ b/core/lib/Thelia/Model/ProductCategory.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductCategory as BaseProductCategory; -class ProductCategory extends BaseProductCategory { - +class ProductCategory extends BaseProductCategory +{ } diff --git a/core/lib/Thelia/Model/ProductCategoryQuery.php b/core/lib/Thelia/Model/ProductCategoryQuery.php index 2afd789fc..7a1b8857f 100644 --- a/core/lib/Thelia/Model/ProductCategoryQuery.php +++ b/core/lib/Thelia/Model/ProductCategoryQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductCategoryQuery as BaseProductCategoryQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_category' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ProductCategoryQuery as BaseProductCategoryQuery; * long as it does not already exist in the output directory. * */ -class ProductCategoryQuery extends BaseProductCategoryQuery { - +class ProductCategoryQuery extends BaseProductCategoryQuery +{ } // ProductCategoryQuery diff --git a/core/lib/Thelia/Model/ProductDocument.php b/core/lib/Thelia/Model/ProductDocument.php index 295f0d929..3e72a0d2b 100644 --- a/core/lib/Thelia/Model/ProductDocument.php +++ b/core/lib/Thelia/Model/ProductDocument.php @@ -13,7 +13,8 @@ class ProductDocument extends BaseProductDocument /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByProduct($this->getProduct()); } @@ -58,6 +59,7 @@ class ProductDocument extends BaseProductDocument "product_id" => $this->getProductId(), ) ); + return true; } diff --git a/core/lib/Thelia/Model/ProductDocumentI18nQuery.php b/core/lib/Thelia/Model/ProductDocumentI18nQuery.php index 3d6fafd03..228ba1bc6 100644 --- a/core/lib/Thelia/Model/ProductDocumentI18nQuery.php +++ b/core/lib/Thelia/Model/ProductDocumentI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductDocumentI18nQuery as BaseProductDocumentI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_document_i18n' table. * diff --git a/core/lib/Thelia/Model/ProductDocumentQuery.php b/core/lib/Thelia/Model/ProductDocumentQuery.php index e98f301c1..908f48c12 100644 --- a/core/lib/Thelia/Model/ProductDocumentQuery.php +++ b/core/lib/Thelia/Model/ProductDocumentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductDocumentQuery as BaseProductDocumentQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_document' table. * diff --git a/core/lib/Thelia/Model/ProductI18n.php b/core/lib/Thelia/Model/ProductI18n.php index 6ec3ac4a3..8eb983029 100644 --- a/core/lib/Thelia/Model/ProductI18n.php +++ b/core/lib/Thelia/Model/ProductI18n.php @@ -5,8 +5,8 @@ namespace Thelia\Model; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\ProductI18n as BaseProductI18n; -class ProductI18n extends BaseProductI18n { - +class ProductI18n extends BaseProductI18n +{ public function postInsert(ConnectionInterface $con = null) { $product = $this->getProduct(); diff --git a/core/lib/Thelia/Model/ProductI18nQuery.php b/core/lib/Thelia/Model/ProductI18nQuery.php index b11c1554a..3589f1f19 100644 --- a/core/lib/Thelia/Model/ProductI18nQuery.php +++ b/core/lib/Thelia/Model/ProductI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductI18nQuery as BaseProductI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ProductI18nQuery as BaseProductI18nQuery; * long as it does not already exist in the output directory. * */ -class ProductI18nQuery extends BaseProductI18nQuery { - +class ProductI18nQuery extends BaseProductI18nQuery +{ } // ProductI18nQuery diff --git a/core/lib/Thelia/Model/ProductImage.php b/core/lib/Thelia/Model/ProductImage.php index 0215b3f21..24cfee695 100644 --- a/core/lib/Thelia/Model/ProductImage.php +++ b/core/lib/Thelia/Model/ProductImage.php @@ -13,7 +13,8 @@ class ProductImage extends BaseProductImage /** * Calculate next position relative to our parent */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { $query->filterByProduct($this->getProduct()); } @@ -58,6 +59,7 @@ class ProductImage extends BaseProductImage "product_id" => $this->getProductId(), ) ); + return true; } } diff --git a/core/lib/Thelia/Model/ProductImageI18nQuery.php b/core/lib/Thelia/Model/ProductImageI18nQuery.php index 95b345ba0..4490b05d9 100644 --- a/core/lib/Thelia/Model/ProductImageI18nQuery.php +++ b/core/lib/Thelia/Model/ProductImageI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductImageI18nQuery as BaseProductImageI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_image_i18n' table. * diff --git a/core/lib/Thelia/Model/ProductImageQuery.php b/core/lib/Thelia/Model/ProductImageQuery.php index 8236b98a9..1b449a87a 100644 --- a/core/lib/Thelia/Model/ProductImageQuery.php +++ b/core/lib/Thelia/Model/ProductImageQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductImageQuery as BaseProductImageQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_image' table. * diff --git a/core/lib/Thelia/Model/ProductPriceQuery.php b/core/lib/Thelia/Model/ProductPriceQuery.php index c5110b372..82c30b1db 100644 --- a/core/lib/Thelia/Model/ProductPriceQuery.php +++ b/core/lib/Thelia/Model/ProductPriceQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductPriceQuery as BaseProductPriceQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_price' table. * diff --git a/core/lib/Thelia/Model/ProductQuery.php b/core/lib/Thelia/Model/ProductQuery.php index 31759715e..b55ba4f45 100644 --- a/core/lib/Thelia/Model/ProductQuery.php +++ b/core/lib/Thelia/Model/ProductQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductQuery as BaseProductQuery; - /** * Skeleton subclass for performing query and update operations on the 'product' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ProductQuery as BaseProductQuery; * long as it does not already exist in the output directory. * */ -class ProductQuery extends BaseProductQuery { - +class ProductQuery extends BaseProductQuery +{ } // ProductQuery diff --git a/core/lib/Thelia/Model/ProductSaleElements.php b/core/lib/Thelia/Model/ProductSaleElements.php index 6a95c37f3..ec485d7a7 100644 --- a/core/lib/Thelia/Model/ProductSaleElements.php +++ b/core/lib/Thelia/Model/ProductSaleElements.php @@ -11,7 +11,7 @@ class ProductSaleElements extends BaseProductSaleElements { try { $amount = $this->getVirtualColumn($virtualColumnName); - } catch(PropelException $e) { + } catch (PropelException $e) { throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPrice"); } @@ -22,7 +22,7 @@ class ProductSaleElements extends BaseProductSaleElements { try { $amount = $this->getVirtualColumn($virtualColumnName); - } catch(PropelException $e) { + } catch (PropelException $e) { throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPromoPrice"); } @@ -32,12 +32,14 @@ class ProductSaleElements extends BaseProductSaleElements public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()), 2); } public function getTaxedPromoPrice(Country $country) { $taxCalculator = new Calculator(); + return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()), 2); } } diff --git a/core/lib/Thelia/Model/ProductSaleElementsQuery.php b/core/lib/Thelia/Model/ProductSaleElementsQuery.php index 9a3b55d6e..31f0cfc54 100644 --- a/core/lib/Thelia/Model/ProductSaleElementsQuery.php +++ b/core/lib/Thelia/Model/ProductSaleElementsQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductSaleElementsQuery as BaseProductSaleElementsQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_sale_elements' table. * diff --git a/core/lib/Thelia/Model/ProductVersion.php b/core/lib/Thelia/Model/ProductVersion.php index 66736a34d..aaa119147 100644 --- a/core/lib/Thelia/Model/ProductVersion.php +++ b/core/lib/Thelia/Model/ProductVersion.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductVersion as BaseProductVersion; -class ProductVersion extends BaseProductVersion { - +class ProductVersion extends BaseProductVersion +{ } diff --git a/core/lib/Thelia/Model/ProductVersionQuery.php b/core/lib/Thelia/Model/ProductVersionQuery.php index d010d279e..994146d95 100644 --- a/core/lib/Thelia/Model/ProductVersionQuery.php +++ b/core/lib/Thelia/Model/ProductVersionQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductVersionQuery as BaseProductVersionQuery; - /** * Skeleton subclass for performing query and update operations on the 'product_version' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ProductVersionQuery as BaseProductVersionQuery; * long as it does not already exist in the output directory. * */ -class ProductVersionQuery extends BaseProductVersionQuery { - +class ProductVersionQuery extends BaseProductVersionQuery +{ } // ProductVersionQuery diff --git a/core/lib/Thelia/Model/Profile.php b/core/lib/Thelia/Model/Profile.php index b140146f3..ca7a2d1f5 100644 --- a/core/lib/Thelia/Model/Profile.php +++ b/core/lib/Thelia/Model/Profile.php @@ -7,4 +7,4 @@ use Thelia\Model\Tools\ModelEventDispatcherTrait; class Profile extends BaseProfile { use ModelEventDispatcherTrait; -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/ProfileI18nQuery.php b/core/lib/Thelia/Model/ProfileI18nQuery.php index 54bd22cd9..7078eaead 100644 --- a/core/lib/Thelia/Model/ProfileI18nQuery.php +++ b/core/lib/Thelia/Model/ProfileI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProfileI18nQuery as BaseProfileI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'profile_i18n' table. * diff --git a/core/lib/Thelia/Model/ProfileModuleQuery.php b/core/lib/Thelia/Model/ProfileModuleQuery.php index 9cd6df6b2..e6b6ed48b 100644 --- a/core/lib/Thelia/Model/ProfileModuleQuery.php +++ b/core/lib/Thelia/Model/ProfileModuleQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProfileModuleQuery as BaseProfileModuleQuery; - /** * Skeleton subclass for performing query and update operations on the 'profile_module' table. * diff --git a/core/lib/Thelia/Model/ProfileQuery.php b/core/lib/Thelia/Model/ProfileQuery.php index f5e9616c5..113b9ee65 100644 --- a/core/lib/Thelia/Model/ProfileQuery.php +++ b/core/lib/Thelia/Model/ProfileQuery.php @@ -5,7 +5,6 @@ namespace Thelia\Model; use Thelia\Core\Security\Resource\AdminResources; use Thelia\Model\Base\ProfileQuery as BaseProfileQuery; - /** * Skeleton subclass for performing query and update operations on the 'profile' table. * @@ -23,9 +22,10 @@ class ProfileQuery extends BaseProfileQuery $profileList = array( 0 => AdminResources::SUPERADMINISTRATOR, ); - foreach(ProfileQuery::create()->find() as $profile) { + foreach (ProfileQuery::create()->find() as $profile) { $profileList[$profile->getId()] = $profile->getCode(); } + return $profileList; } } // ProfileQuery diff --git a/core/lib/Thelia/Model/ProfileResourceQuery.php b/core/lib/Thelia/Model/ProfileResourceQuery.php index 2f69cfb4f..2b2531a11 100644 --- a/core/lib/Thelia/Model/ProfileResourceQuery.php +++ b/core/lib/Thelia/Model/ProfileResourceQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ProfileResourceQuery as BaseProfileResourceQuery; - /** * Skeleton subclass for performing query and update operations on the 'profile_resource' table. * diff --git a/core/lib/Thelia/Model/Resource.php b/core/lib/Thelia/Model/Resource.php index 7629648fa..c8cb94034 100644 --- a/core/lib/Thelia/Model/Resource.php +++ b/core/lib/Thelia/Model/Resource.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\Resource as BaseResource; -class Resource extends BaseResource { - +class Resource extends BaseResource +{ } diff --git a/core/lib/Thelia/Model/ResourceI18n.php b/core/lib/Thelia/Model/ResourceI18n.php index e5acc120b..16e2a297c 100644 --- a/core/lib/Thelia/Model/ResourceI18n.php +++ b/core/lib/Thelia/Model/ResourceI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ResourceI18n as BaseResourceI18n; -class ResourceI18n extends BaseResourceI18n { - +class ResourceI18n extends BaseResourceI18n +{ } diff --git a/core/lib/Thelia/Model/ResourceI18nQuery.php b/core/lib/Thelia/Model/ResourceI18nQuery.php index 3f51c7c4c..e202ed187 100644 --- a/core/lib/Thelia/Model/ResourceI18nQuery.php +++ b/core/lib/Thelia/Model/ResourceI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ResourceI18nQuery as BaseResourceI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'resource_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ResourceI18nQuery as BaseResourceI18nQuery; * long as it does not already exist in the output directory. * */ -class ResourceI18nQuery extends BaseResourceI18nQuery { - +class ResourceI18nQuery extends BaseResourceI18nQuery +{ } // ResourceI18nQuery diff --git a/core/lib/Thelia/Model/ResourceQuery.php b/core/lib/Thelia/Model/ResourceQuery.php index 5ab0294b7..21fc1a244 100644 --- a/core/lib/Thelia/Model/ResourceQuery.php +++ b/core/lib/Thelia/Model/ResourceQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\ResourceQuery as BaseResourceQuery; - /** * Skeleton subclass for performing query and update operations on the 'resource' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\ResourceQuery as BaseResourceQuery; * long as it does not already exist in the output directory. * */ -class ResourceQuery extends BaseResourceQuery { - +class ResourceQuery extends BaseResourceQuery +{ } // ResourceQuery diff --git a/core/lib/Thelia/Model/RewritingArgument.php b/core/lib/Thelia/Model/RewritingArgument.php index 79ab92a54..601668006 100644 --- a/core/lib/Thelia/Model/RewritingArgument.php +++ b/core/lib/Thelia/Model/RewritingArgument.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\RewritingArgument as BaseRewritingArgument; -class RewritingArgument extends BaseRewritingArgument { - +class RewritingArgument extends BaseRewritingArgument +{ } diff --git a/core/lib/Thelia/Model/RewritingArgumentQuery.php b/core/lib/Thelia/Model/RewritingArgumentQuery.php index 2ac1c3d12..94404cd05 100644 --- a/core/lib/Thelia/Model/RewritingArgumentQuery.php +++ b/core/lib/Thelia/Model/RewritingArgumentQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\RewritingArgumentQuery as BaseRewritingArgumentQuery; - /** * Skeleton subclass for performing query and update operations on the 'rewriting_argument' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\RewritingArgumentQuery as BaseRewritingArgumentQuery; * long as it does not already exist in the output directory. * */ -class RewritingArgumentQuery extends BaseRewritingArgumentQuery { - +class RewritingArgumentQuery extends BaseRewritingArgumentQuery +{ } // RewritingArgumentQuery diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php index a8fc84d28..aa8b70c2f 100644 --- a/core/lib/Thelia/Model/RewritingUrl.php +++ b/core/lib/Thelia/Model/RewritingUrl.php @@ -6,12 +6,11 @@ use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl; - -class RewritingUrl extends BaseRewritingUrl { - +class RewritingUrl extends BaseRewritingUrl +{ public function postInsert(ConnectionInterface $con = null) { - if(null !== $this->getRedirected()) { + if (null !== $this->getRedirected()) { //check if rewriting url alredy exists and put redirect to the new one RewritingUrlQuery::create() ->filterByView($this->getView()) diff --git a/core/lib/Thelia/Model/RewritingUrlQuery.php b/core/lib/Thelia/Model/RewritingUrlQuery.php index d1ab8fcdf..bbfc58eee 100644 --- a/core/lib/Thelia/Model/RewritingUrlQuery.php +++ b/core/lib/Thelia/Model/RewritingUrlQuery.php @@ -84,10 +84,10 @@ class RewritingUrlQuery extends BaseRewritingUrlQuery ->orderByUpdatedAt(Criteria::DESC); $otherParametersCount = count($viewOtherParameters); - if($otherParametersCount > 0) { + if ($otherParametersCount > 0) { $parameterConditions = array(); - foreach($viewOtherParameters as $parameter => $value) { + foreach ($viewOtherParameters as $parameter => $value) { $conditionName = 'other_parameter_condition_' . count($parameterConditions); $urlQuery->condition('parameter_condition', '`ra`.PARAMETER= ?', $parameter, \PDO::PARAM_STR) ->condition('value_condition', '`ra`.VALUE = ?', $value, \PDO::PARAM_STR) diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php index f9bbd4f68..69c3a3f23 100644 --- a/core/lib/Thelia/Model/Tax.php +++ b/core/lib/Thelia/Model/Tax.php @@ -14,23 +14,25 @@ class Tax extends BaseTax /** * Provides a form-and-javascript-safe version of the type, which is a fully qualified classname, with \ */ - public static function escapeTypeName($name) { + public static function escapeTypeName($name) + { return str_replace('\\', '-', $name); } - public static function unescapeTypeName($name) { + public static function unescapeTypeName($name) + { return str_replace('-', '\\', $name); } public function calculateTax($amount) { - if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + if (false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); } $rate = $this->getRate(); - if($rate === null) { + if ($rate === null) { return 0; } @@ -41,7 +43,7 @@ class Tax extends BaseTax { try { $taxRuleCountryPosition = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION); - } catch(PropelException $e) { + } catch (PropelException $e) { throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION . "` does not exist in Tax::getTaxRuleCountryPosition"); } @@ -53,13 +55,13 @@ class Tax extends BaseTax $class = $this->getType(); /* test type */ - if(!class_exists($class)) { + if (!class_exists($class)) { throw new TaxEngineException('Recorded type `' . $class . '` does not exists', TaxEngineException::BAD_RECORDED_TYPE); } $instance = new $class; - if(!$instance instanceof BaseTaxType) { + if (!$instance instanceof BaseTaxType) { throw new TaxEngineException('Recorded type `' . $class . '` does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE); } @@ -75,7 +77,7 @@ class Tax extends BaseTax { $requirements = json_decode(base64_decode(parent::getSerializedRequirements()), true); - if(json_last_error() != JSON_ERROR_NONE || !is_array($requirements)) { + if (json_last_error() != JSON_ERROR_NONE || !is_array($requirements)) { throw new TaxEngineException('BAD RECORDED REQUIREMENTS', TaxEngineException::BAD_RECORDED_REQUIREMENTS); } diff --git a/core/lib/Thelia/Model/TaxI18n.php b/core/lib/Thelia/Model/TaxI18n.php index 27c82228b..1b1424f81 100644 --- a/core/lib/Thelia/Model/TaxI18n.php +++ b/core/lib/Thelia/Model/TaxI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxI18n as BaseTaxI18n; -class TaxI18n extends BaseTaxI18n { - +class TaxI18n extends BaseTaxI18n +{ } diff --git a/core/lib/Thelia/Model/TaxI18nQuery.php b/core/lib/Thelia/Model/TaxI18nQuery.php index db7dc57ed..200323c75 100644 --- a/core/lib/Thelia/Model/TaxI18nQuery.php +++ b/core/lib/Thelia/Model/TaxI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxI18nQuery as BaseTaxI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'tax_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\TaxI18nQuery as BaseTaxI18nQuery; * long as it does not already exist in the output directory. * */ -class TaxI18nQuery extends BaseTaxI18nQuery { - +class TaxI18nQuery extends BaseTaxI18nQuery +{ } // TaxI18nQuery diff --git a/core/lib/Thelia/Model/TaxQuery.php b/core/lib/Thelia/Model/TaxQuery.php index 020930d48..34e308473 100644 --- a/core/lib/Thelia/Model/TaxQuery.php +++ b/core/lib/Thelia/Model/TaxQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxQuery as BaseTaxQuery; - /** * Skeleton subclass for performing query and update operations on the 'tax' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\TaxQuery as BaseTaxQuery; * long as it does not already exist in the output directory. * */ -class TaxQuery extends BaseTaxQuery { - +class TaxQuery extends BaseTaxQuery +{ } // TaxQuery diff --git a/core/lib/Thelia/Model/TaxRule.php b/core/lib/Thelia/Model/TaxRule.php index 7758acdf2..f9bc52d2e 100644 --- a/core/lib/Thelia/Model/TaxRule.php +++ b/core/lib/Thelia/Model/TaxRule.php @@ -28,7 +28,7 @@ class TaxRule extends BaseTaxRule $promoTaxCollection = new OrderProductTaxCollection(); $taxCalculator->loadTaxRule($this, $country, $product)->getTaxedPrice($untaxedPromoAmount, $promoTaxCollection, $askedLocale); - foreach($taxCollection as $index => $tax) { + foreach ($taxCollection as $index => $tax) { $tax->setPromoAmount($promoTaxCollection->getKey($index)->getAmount()); } diff --git a/core/lib/Thelia/Model/TaxRuleCountry.php b/core/lib/Thelia/Model/TaxRuleCountry.php index 583501e8a..f90582ee8 100644 --- a/core/lib/Thelia/Model/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/TaxRuleCountry.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxRuleCountry as BaseTaxRuleCountry; -class TaxRuleCountry extends BaseTaxRuleCountry { - +class TaxRuleCountry extends BaseTaxRuleCountry +{ } diff --git a/core/lib/Thelia/Model/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/TaxRuleCountryQuery.php index 11bef84e8..a0226f64f 100644 --- a/core/lib/Thelia/Model/TaxRuleCountryQuery.php +++ b/core/lib/Thelia/Model/TaxRuleCountryQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxRuleCountryQuery as BaseTaxRuleCountryQuery; - /** * Skeleton subclass for performing query and update operations on the 'tax_rule_country' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\TaxRuleCountryQuery as BaseTaxRuleCountryQuery; * long as it does not already exist in the output directory. * */ -class TaxRuleCountryQuery extends BaseTaxRuleCountryQuery { - +class TaxRuleCountryQuery extends BaseTaxRuleCountryQuery +{ } // TaxRuleCountryQuery diff --git a/core/lib/Thelia/Model/TaxRuleI18n.php b/core/lib/Thelia/Model/TaxRuleI18n.php index bde2452cd..71d32b838 100644 --- a/core/lib/Thelia/Model/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/TaxRuleI18n.php @@ -4,6 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxRuleI18n as BaseTaxRuleI18n; -class TaxRuleI18n extends BaseTaxRuleI18n { - +class TaxRuleI18n extends BaseTaxRuleI18n +{ } diff --git a/core/lib/Thelia/Model/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/TaxRuleI18nQuery.php index e0f5e370d..b215470e0 100644 --- a/core/lib/Thelia/Model/TaxRuleI18nQuery.php +++ b/core/lib/Thelia/Model/TaxRuleI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TaxRuleI18nQuery as BaseTaxRuleI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'tax_rule_i18n' table. * @@ -15,6 +14,6 @@ use Thelia\Model\Base\TaxRuleI18nQuery as BaseTaxRuleI18nQuery; * long as it does not already exist in the output directory. * */ -class TaxRuleI18nQuery extends BaseTaxRuleI18nQuery { - +class TaxRuleI18nQuery extends BaseTaxRuleI18nQuery +{ } // TaxRuleI18nQuery diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 064ec467a..c3a47773e 100644 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -6,7 +6,6 @@ use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; use Thelia\Model\Map\TaxRuleCountryTableMap; - /** * Skeleton subclass for performing query and update operations on the 'tax_rule' table. * diff --git a/core/lib/Thelia/Model/TemplateI18nQuery.php b/core/lib/Thelia/Model/TemplateI18nQuery.php index 434081203..2a4d4defc 100644 --- a/core/lib/Thelia/Model/TemplateI18nQuery.php +++ b/core/lib/Thelia/Model/TemplateI18nQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TemplateI18nQuery as BaseTemplateI18nQuery; - /** * Skeleton subclass for performing query and update operations on the 'template_i18n' table. * diff --git a/core/lib/Thelia/Model/TemplateQuery.php b/core/lib/Thelia/Model/TemplateQuery.php index e7b9fd900..e14616191 100644 --- a/core/lib/Thelia/Model/TemplateQuery.php +++ b/core/lib/Thelia/Model/TemplateQuery.php @@ -4,7 +4,6 @@ namespace Thelia\Model; use Thelia\Model\Base\TemplateQuery as BaseTemplateQuery; - /** * Skeleton subclass for performing query and update operations on the 'template' table. * diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php index c7426ef71..8b4b57a2b 100644 --- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php +++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php @@ -26,7 +26,7 @@ class ModelCriteriaTools */ public static function getFrontEndI18n(ModelCriteria &$search, $requestedLocale, $columns, $foreignTable, $foreignKey, $forceReturn = false) { - if($foreignTable === null) { + if ($foreignTable === null) { $foreignTable = $search->getTableMap()->getName(); $aliasPrefix = ''; } else { @@ -38,8 +38,8 @@ class ModelCriteriaTools $requestedLocaleI18nAlias = $aliasPrefix . 'requested_locale_i18n'; $defaultLocaleI18nAlias = $aliasPrefix . 'default_locale_i18n'; - if($defaultLangWithoutTranslation == 0) { - + if ($defaultLangWithoutTranslation == 0) { + $requestedLocaleJoin = new Join(); $requestedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $requestedLocaleI18nAlias); $requestedLocaleJoin->setJoinType($forceReturn === false ? Criteria::INNER_JOIN : Criteria::LEFT_JOIN); @@ -49,7 +49,7 @@ class ModelCriteriaTools $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); - foreach($columns as $column) { + foreach ($columns as $column) { $search->withColumn('`' . $requestedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column); } } else { @@ -71,11 +71,11 @@ class ModelCriteriaTools $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); - if($forceReturn === false) { + if ($forceReturn === false) { $search->where('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.ID)')->_or()->where('NOT ISNULL(`' . $defaultLocaleI18nAlias . '`.ID)'); } - foreach($columns as $column) { + foreach ($columns as $column) { $search->withColumn('CASE WHEN NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.ID) THEN `' . $requestedLocaleI18nAlias . '`.`' . $column . '` ELSE `' . $defaultLocaleI18nAlias . '`.`' . $column . '` END', $aliasPrefix . 'i18n_' . $column); } } @@ -83,7 +83,7 @@ class ModelCriteriaTools public static function getBackEndI18n(ModelCriteria &$search, $requestedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') { - if($foreignTable === null) { + if ($foreignTable === null) { $foreignTable = $search->getTableMap()->getName(); $aliasPrefix = ''; } else { @@ -101,7 +101,7 @@ class ModelCriteriaTools $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); - foreach($columns as $column) { + foreach ($columns as $column) { $search->withColumn('`' . $requestedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column); } } @@ -117,8 +117,7 @@ class ModelCriteriaTools } $locale = $localeSearch->getLocale(); - } - else { + } else { // Use the currently defined locale $locale = $currentLocale; } diff --git a/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php b/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php index e96e2f84c..759d032d4 100644 --- a/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php +++ b/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php @@ -29,8 +29,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** * A trait to provide event dispatching mechanism to Model objects */ -trait ModelEventDispatcherTrait { - +trait ModelEventDispatcherTrait +{ /** * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */ @@ -59,4 +59,4 @@ trait ModelEventDispatcherTrait { $this->dispatcher->dispatch($eventName, $event); } } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php index ea9f23dd4..e96ae6f11 100644 --- a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php +++ b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php @@ -27,19 +27,21 @@ use Propel\Runtime\ActiveQuery\PropelQuery; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Propel; -trait PositionManagementTrait { - +trait PositionManagementTrait +{ /** * Create an instancer of this object query */ - private function createQuery() { + private function createQuery() + { return PropelQuery::from(__CLASS__); } /** * Return the database name from this object's table map. */ - private function getDatabaseNameFromMap() { + private function getDatabaseNameFromMap() + { $class = new \ReflectionClass(self::TABLE_MAP); return $class->getConstant('DATABASE_NAME'); @@ -49,15 +51,16 @@ trait PositionManagementTrait { * Implementors may add some search criteria (e.g., parent id) to the queries * used to change/get position by overloading this method. */ - protected function addCriteriaToPositionQuery($query) { + protected function addCriteriaToPositionQuery($query) + { // Add required criteria here... } /** * Get the position of the next inserted object */ - public function getNextPosition() { - + public function getNextPosition() + { $query = $this->createQuery() ->orderByPosition(Criteria::DESC) ->limit(1); @@ -72,14 +75,16 @@ trait PositionManagementTrait { /** * Move up a object */ - public function movePositionUp() { + public function movePositionUp() + { $this->movePositionUpOrDown(true); } /** * Move down a object */ - public function movePositionDown() { + public function movePositionDown() + { $this->movePositionUpOrDown(false); } @@ -102,8 +107,7 @@ trait PositionManagementTrait { if ($up === true) { // Find the object immediately before me $search->filterByPosition(array('max' => $my_position-1))->orderByPosition(Criteria::DESC); - } - else { + } else { // Find the object immediately after me $search->filterByPosition(array('min' => $my_position+1))->orderByPosition(Criteria::ASC); } @@ -126,8 +130,7 @@ trait PositionManagementTrait { $result->setDispatcher($this->getDispatcher())->setPosition($my_position)->save($cnx); $cnx->commit(); - } - catch (Exception $e) { + } catch (Exception $e) { $cnx->rollback(); } } @@ -136,7 +139,8 @@ trait PositionManagementTrait { /** * Simply return the database name, from the constant in the MAP class. */ - protected function getDatabaseName() { + protected function getDatabaseName() + { // Find DATABASE_NAME constant $mapClassName = self::TABLE_MAP; @@ -192,8 +196,7 @@ trait PositionManagementTrait { ; $cnx->commit(); - } - catch (Exception $e) { + } catch (Exception $e) { $cnx->rollback(); } } @@ -207,7 +210,7 @@ trait PositionManagementTrait { $data = array(); $whereCriteria = array(); - foreach($fields as $field => $value) { + foreach ($fields as $field => $value) { $whereCriteria[] = $field . '=:' . $field; $data[':' . $field] = $value; } @@ -221,4 +224,4 @@ trait PositionManagementTrait { $statement->execute($data); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index fbe64378c..72371201a 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -35,12 +35,12 @@ use Thelia\Model\ConfigQuery; /** * A trait for managing Rewritten URLs from model classes */ -trait UrlRewritingTrait { - +trait UrlRewritingTrait +{ /** * @returns string the view name of the rewritten object (e.g., 'category', 'product') */ - protected abstract function getRewrittenUrlViewName(); + abstract protected function getRewrittenUrlViewName(); /** * Get the object URL for the given locale, rewritten if rewriting is enabled. @@ -49,9 +49,10 @@ trait UrlRewritingTrait { */ public function getUrl($locale = null) { - if(null === $locale) { + if (null === $locale) { $locale = $this->getLocale(); } + return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString(); } @@ -73,15 +74,13 @@ trait UrlRewritingTrait { $this->dispatchEvent(TheliaEvents::GENERATE_REWRITTENURL, $generateEvent); - - if($generateEvent->isRewritten()) - { + if ($generateEvent->isRewritten()) { return $generateEvent->getUrl(); } $title = $this->getTitle(); - if(null == $title) { + if (null == $title) { throw new \RuntimeException('Impossible to create an url if title is null'); } // Replace all weird characters with dashes @@ -94,9 +93,9 @@ trait UrlRewritingTrait { // TODO : // check if URL url already exists, and add a numeric suffix, or the like - try{ + try { $i=0; - while(URL::getInstance()->resolve($urlFilePart)) { + while (URL::getInstance()->resolve($urlFilePart)) { $i++; $urlFilePart = sprintf("%s-%d.html",$cleanString, $i); } @@ -117,7 +116,7 @@ trait UrlRewritingTrait { /** * return the rewritten URL for the given locale * - * @param string $locale a valid locale (e.g. en_US) + * @param string $locale a valid locale (e.g. en_US) * @return null */ public function getRewrittenUrl($locale) @@ -130,7 +129,7 @@ trait UrlRewritingTrait { ->findOne() ; - if($rewritingUrl) { + if ($rewritingUrl) { $url = $rewritingUrl->getUrl(); } else { $url = null; @@ -142,7 +141,8 @@ trait UrlRewritingTrait { /** * Mark the current URL as obseolete */ - public function markRewritenUrlObsolete() { + public function markRewritenUrlObsolete() + { RewritingUrlQuery::create() ->filterByView($this->getRewrittenUrlViewName()) ->filterByViewId($this->getId()) @@ -154,7 +154,7 @@ trait UrlRewritingTrait { /** * Set the rewritten URL for the given locale * - * @param string $locale a valid locale (e.g. en_US) + * @param string $locale a valid locale (e.g. en_US) * @param $url * @return $this * @throws UrlRewritingException @@ -163,8 +163,9 @@ trait UrlRewritingTrait { public function setRewrittenUrl($locale, $url) { $currentUrl = $this->getRewrittenUrl($locale); - if($currentUrl == $url || null === $url) { + if ($currentUrl == $url || null === $url) { /* no url update */ + return $this; } @@ -172,12 +173,12 @@ trait UrlRewritingTrait { $resolver = new RewritingResolver($url); /* we can reassign old url */ - if(null === $resolver->redirectedToUrl) { + if (null === $resolver->redirectedToUrl) { /* else ... */ - if($resolver->view == $this->getRewrittenUrlViewName() && $resolver->viewId == $this->getId()) { + if ($resolver->view == $this->getRewrittenUrlViewName() && $resolver->viewId == $this->getId()) { /* it's an url related to the current object */ - if($resolver->locale != $locale) { + if ($resolver->locale != $locale) { /* it is an url related to this product for another locale */ throw new UrlRewritingException('URL_ALREADY_EXISTS', UrlRewritingException::URL_ALREADY_EXISTS); } @@ -193,15 +194,15 @@ trait UrlRewritingTrait { throw new UrlRewritingException('URL_ALREADY_EXISTS', UrlRewritingException::URL_ALREADY_EXISTS); } } - } catch(UrlRewritingException $e) { + } catch (UrlRewritingException $e) { /* It's all good if URL is not found */ - if($e->getCode() !== UrlRewritingException::URL_NOT_FOUND) { + if ($e->getCode() !== UrlRewritingException::URL_NOT_FOUND) { throw $e; } } /* set the new URL */ - if(isset($resolver)) { + if (isset($resolver)) { /* erase the old one */ $rewritingUrl = RewritingUrlQuery::create()->findOneByUrl($url); $rewritingUrl->setView($this->getRewrittenUrlViewName()) @@ -231,4 +232,4 @@ trait UrlRewritingTrait { return $this; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php b/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php index 5c4ac2022..9bc497078 100644 --- a/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php +++ b/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php @@ -101,7 +101,7 @@ class OrderProductTaxCollection implements \Iterator * Checks if current position is valid * @link http://php.net/manual/en/iterator.valid.php * @return boolean The return value will be casted to boolean and then evaluated. - * Returns true on success or false on failure. + * Returns true on success or false on failure. */ public function valid() { diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php index 330019f99..c3f02bcb8 100644 --- a/core/lib/Thelia/Tools/FileManager.php +++ b/core/lib/Thelia/Tools/FileManager.php @@ -22,7 +22,6 @@ /**********************************************************************************/ namespace Thelia\Tools; - use Symfony\Component\HttpFoundation\File\UploadedFile; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent; diff --git a/core/lib/Thelia/Tools/MoneyFormat.php b/core/lib/Thelia/Tools/MoneyFormat.php index 94239907c..bf5200831 100644 --- a/core/lib/Thelia/Tools/MoneyFormat.php +++ b/core/lib/Thelia/Tools/MoneyFormat.php @@ -52,6 +52,7 @@ class MoneyFormat extends NumberFormat // FIXME: should be a parameter related to i18n configuration $number = $number . ' ' . $symbol; } + return $number; } } diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index c26c7b4a6..d2ac188c6 100644 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -30,7 +30,6 @@ use Thelia\Rewriting\RewritingRetriever; use Thelia\Core\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; - class URL { protected $resolver = null; diff --git a/core/lib/Thelia/Type/TypeCollection.php b/core/lib/Thelia/Type/TypeCollection.php index 767f71564..2ee5c9c66 100644 --- a/core/lib/Thelia/Type/TypeCollection.php +++ b/core/lib/Thelia/Type/TypeCollection.php @@ -100,7 +100,7 @@ class TypeCollection implements \Iterator * Checks if current position is valid * @link http://php.net/manual/en/iterator.valid.php * @return boolean The return value will be casted to boolean and then evaluated. - * Returns true on success or false on failure. + * Returns true on success or false on failure. */ public function valid() {