From 2d790499b52c0124f29b0324e263b56302f1b598 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 3 Sep 2022 08:26:05 +0100 Subject: [PATCH] Fixed whitespace for docblocks (#2542) --- .../core/Mage/Admin/Helper/Rules/Fallback.php | 2 +- .../Mage/Admin/Model/Acl/Role/Generic.php | 2 +- .../core/Mage/Admin/Model/Acl/Role/Group.php | 2 +- .../data/admin_setup/data-install-1.6.0.0.php | 2 +- .../Admin/sql/admin_setup/install-1.6.0.0.php | 5 +- .../Mage/AdminNotification/Model/Feed.php | 8 +-- .../Mage/AdminNotification/Model/Inbox.php | 12 ++-- .../AdminNotification/Model/Mysql4/Inbox.php | 12 ++-- .../Model/Resource/Inbox.php | 12 ++-- .../install-1.6.0.0.php | 16 ++--- .../core/Mage/Adminhtml/Block/Abstract.php | 2 - .../Mage/Adminhtml/Block/Api/Editroles.php | 10 ++- .../Mage/Adminhtml/Block/Api/Edituser.php | 10 ++- .../Mage/Adminhtml/Block/Api/User/Edit.php | 4 +- .../Adminhtml/Block/Api/User/Edit/Form.php | 4 +- .../Mage/Adminhtml/Block/Api/User/Grid.php | 4 +- .../Mage/Adminhtml/Block/Backup/Dialogs.php | 2 +- .../core/Mage/Adminhtml/Block/Backup/Grid.php | 3 +- .../core/Mage/Adminhtml/Block/Cache/Grid.php | 7 ++- .../Adminhtml/Block/Catalog/Category/Edit.php | 2 +- .../Block/Catalog/Category/Edit/Form.php | 2 +- .../Block/Catalog/Category/Helper/Image.php | 2 +- .../Category/Helper/Sortby/Default.php | 2 +- .../Block/Catalog/Category/Tab/Design.php | 9 ++- .../Block/Catalog/Category/Tab/General.php | 4 +- .../Mage/Adminhtml/Block/Catalog/Form.php | 2 +- .../Form/Renderer/Config/DateFieldsOrder.php | 3 +- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Block/Catalog/Product/Attribute.php | 2 - .../Block/Catalog/Product/Attribute/Edit.php | 4 +- .../Catalog/Product/Attribute/Edit/Form.php | 5 +- .../Product/Attribute/Edit/Tab/Front.php | 3 +- .../Block/Catalog/Product/Attribute/Grid.php | 2 +- .../Catalog/Product/Attribute/Set/Grid.php | 5 +- .../Attribute/Set/Main/Formattribute.php | 3 +- .../Product/Attribute/Set/Main/Formgroup.php | 3 +- .../Product/Attribute/Set/Main/Formset.php | 3 +- .../Product/Attribute/Set/Main/Tree/Group.php | 3 +- .../Attribute/Set/Toolbar/Main/Filter.php | 3 +- .../Block/Catalog/Product/Composite/Error.php | 2 +- .../Catalog/Product/Composite/Fieldset.php | 2 +- .../Product/Composite/Fieldset/Grouped.php | 2 +- .../Adminhtml/Block/Catalog/Product/Edit.php | 2 +- .../Edit/Tab/Options/Type/Abstract.php | 1 - .../Product/Edit/Tab/Options/Type/Date.php | 4 +- .../Product/Edit/Tab/Options/Type/File.php | 3 +- .../Catalog/Product/Edit/Tab/Price/Group.php | 3 +- .../Product/Edit/Tab/Super/Config/Grid.php | 5 +- .../Catalog/Product/Edit/Tab/Super/Group.php | 2 +- .../Catalog/Product/Edit/Tabs/Grouped.php | 2 +- .../Adminhtml/Block/Catalog/Product/Grid.php | 3 +- .../Catalog/Product/Helper/Form/Apply.php | 1 - .../Catalog/Product/Helper/Form/Gallery.php | 3 +- .../Product/Helper/Form/Gallery/Content.php | 1 - .../Catalog/Product/Helper/Form/Image.php | 2 +- .../Product/Helper/Form/Msrp/Enabled.php | 2 +- .../Adminhtml/Block/Catalog/Search/Edit.php | 5 +- .../Block/Catalog/Search/Edit/Form.php | 3 +- .../Adminhtml/Block/Catalog/Search/Grid.php | 4 +- .../Block/Checkout/Agreement/Edit.php | 9 +-- .../Block/Checkout/Agreement/Edit/Form.php | 3 +- .../Block/Checkout/Agreement/Grid.php | 6 +- .../Mage/Adminhtml/Block/Checkout/Formkey.php | 6 +- .../core/Mage/Adminhtml/Block/Cms/Block.php | 1 - .../Mage/Adminhtml/Block/Cms/Block/Edit.php | 3 +- .../Adminhtml/Block/Cms/Block/Edit/Form.php | 4 +- .../Mage/Adminhtml/Block/Cms/Block/Grid.php | 3 +- .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 2 +- .../Adminhtml/Block/Cms/Page/Edit/Form.php | 4 +- .../Block/Cms/Page/Edit/Tab/Design.php | 8 ++- .../Mage/Adminhtml/Block/Cms/Page/Grid.php | 2 +- .../Cms/Wysiwyg/Images/Content/Files.php | 2 +- .../core/Mage/Adminhtml/Block/Customer.php | 1 - .../Mage/Adminhtml/Block/Customer/Edit.php | 2 +- .../Adminhtml/Block/Customer/Edit/Form.php | 8 ++- .../Edit/Renderer/Attribute/Group.php | 2 +- .../Customer/Edit/Tab/Newsletter/Grid.php | 4 +- .../Tab/Newsletter/Grid/Renderer/Action.php | 2 - .../Wishlist/Grid/Renderer/Description.php | 4 +- .../Block/Customer/Form/Element/File.php | 2 +- .../Block/Customer/Form/Element/Image.php | 6 +- .../Mage/Adminhtml/Block/Customer/Grid.php | 2 +- .../Block/Customer/Grid/Filter/Country.php | 2 - .../Mage/Adminhtml/Block/Customer/Group.php | 3 +- .../Adminhtml/Block/Customer/Group/Edit.php | 3 +- .../Block/Customer/Group/Edit/Form.php | 2 +- .../Adminhtml/Block/Customer/Group/Grid.php | 4 +- .../Block/Customer/Online/Filter.php | 3 +- .../Adminhtml/Block/Customer/Online/Grid.php | 2 +- .../Adminhtml/Block/Dashboard/Diagrams.php | 3 +- .../Mage/Adminhtml/Block/Dashboard/Graph.php | 3 +- .../Mage/Adminhtml/Block/Dashboard/Grid.php | 5 +- .../Mage/Adminhtml/Block/Dashboard/Grids.php | 3 +- .../Adminhtml/Block/Dashboard/Orders/Grid.php | 4 +- app/code/core/Mage/Adminhtml/Block/Denied.php | 7 ++- .../core/Mage/Adminhtml/Block/Html/Date.php | 6 +- .../Mage/Adminhtml/Block/Media/Editor.php | 2 +- .../Block/Newsletter/Problem/Grid.php | 2 +- .../Adminhtml/Block/Newsletter/Queue/Edit.php | 3 +- .../Block/Newsletter/Queue/Edit/Form.php | 3 +- .../Adminhtml/Block/Newsletter/Queue/Grid.php | 4 +- .../Block/Newsletter/Queue/Preview/Form.php | 3 +- .../Block/Newsletter/Subscriber/Grid.php | 4 +- .../Block/Newsletter/Template/Edit.php | 2 +- .../Block/Newsletter/Template/Edit/Form.php | 2 +- .../Block/Newsletter/Template/Grid.php | 3 +- .../Newsletter/Template/Preview/Form.php | 3 +- .../Adminhtml/Block/Notification/Grid.php | 2 +- .../Adminhtml/Block/Notification/Inbox.php | 3 +- .../core/Mage/Adminhtml/Block/Page/Footer.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Head.php | 2 +- .../core/Mage/Adminhtml/Block/Page/Header.php | 3 +- .../Block/Permissions/Block/Edit.php | 2 +- .../Block/Permissions/Block/Edit/Form.php | 3 +- .../Block/Permissions/Block/Grid.php | 2 +- .../Adminhtml/Block/Permissions/Editroles.php | 7 ++- .../Adminhtml/Block/Permissions/Edituser.php | 10 ++- .../Adminhtml/Block/Permissions/User/Edit.php | 4 +- .../Block/Permissions/User/Edit/Form.php | 4 +- .../Adminhtml/Block/Permissions/User/Grid.php | 4 +- .../Block/Permissions/Variable/Edit.php | 2 +- .../Block/Permissions/Variable/Edit/Form.php | 2 +- .../Block/Permissions/Variable/Grid.php | 5 +- .../Mage/Adminhtml/Block/Poll/Answer/Edit.php | 5 +- .../Adminhtml/Block/Poll/Answer/Edit/Form.php | 3 +- .../core/Mage/Adminhtml/Block/Poll/Edit.php | 3 +- .../Mage/Adminhtml/Block/Poll/Edit/Form.php | 12 ++-- .../Block/Poll/Edit/Tab/Answers/Form.php | 3 +- .../Block/Poll/Edit/Tab/Answers/Grid.php | 4 +- .../Adminhtml/Block/Poll/Edit/Tab/Form.php | 3 +- .../core/Mage/Adminhtml/Block/Poll/Grid.php | 4 +- .../Adminhtml/Block/Promo/Catalog/Edit.php | 8 ++- .../Block/Promo/Catalog/Edit/Form.php | 5 +- .../Adminhtml/Block/Promo/Catalog/Grid.php | 3 +- .../Mage/Adminhtml/Block/Promo/Quote/Edit.php | 8 ++- .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 5 +- .../Promo/Quote/Edit/Tab/Coupons/Form.php | 2 +- .../Promo/Quote/Edit/Tab/Coupons/Grid.php | 5 +- .../Quote/Edit/Tab/Main/Renderer/Checkbox.php | 1 - .../Mage/Adminhtml/Block/Promo/Quote/Grid.php | 2 +- .../Block/Promo/Widget/Chooser/Daterange.php | 6 +- .../core/Mage/Adminhtml/Block/Rating/Edit.php | 3 +- .../Mage/Adminhtml/Block/Rating/Edit/Form.php | 12 ++-- .../Adminhtml/Block/Rating/Edit/Tab/Form.php | 4 +- .../core/Mage/Adminhtml/Block/Rating/Grid.php | 4 +- .../Block/Report/Customer/Accounts/Grid.php | 3 +- .../Block/Report/Customer/Orders/Grid.php | 4 +- .../Block/Report/Customer/Totals/Grid.php | 4 +- .../Adminhtml/Block/Report/Filter/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Report/Grid.php | 2 +- .../Block/Report/Product/Downloads.php | 3 +- .../Block/Report/Product/Downloads/Grid.php | 2 +- .../Adminhtml/Block/Report/Product/Grid.php | 3 +- .../Block/Report/Product/Lowstock/Grid.php | 4 +- .../Block/Report/Product/Ordered/Grid.php | 3 +- .../Block/Report/Product/Sold/Grid.php | 2 +- .../Block/Report/Product/Viewed/Grid.php | 2 +- .../Block/Report/Refresh/Statistics/Grid.php | 2 +- .../Block/Report/Review/Customer/Grid.php | 3 +- .../Adminhtml/Block/Report/Review/Detail.php | 3 +- .../Block/Report/Review/Detail/Grid.php | 2 +- .../Block/Report/Review/Product/Grid.php | 3 +- .../Block/Report/Sales/Bestsellers/Grid.php | 2 +- .../Block/Report/Sales/Coupons/Grid.php | 2 +- .../Sales/Grid/Column/Renderer/Date.php | 3 +- .../Block/Report/Sales/Invoiced/Grid.php | 2 +- .../Block/Report/Sales/Refunded/Grid.php | 2 +- .../Block/Report/Sales/Sales/Grid.php | 2 +- .../Block/Report/Sales/Shipping/Grid.php | 2 +- .../Adminhtml/Block/Report/Sales/Tax/Grid.php | 2 +- .../Adminhtml/Block/Report/Search/Grid.php | 2 +- .../Block/Report/Shopcart/Abandoned/Grid.php | 3 +- .../Block/Report/Shopcart/Customer/Grid.php | 2 +- .../Block/Report/Shopcart/Product/Grid.php | 3 +- .../Block/Report/Tag/Customer/Detail.php | 3 +- .../Block/Report/Tag/Customer/Detail/Grid.php | 3 +- .../Block/Report/Tag/Customer/Grid.php | 4 +- .../Block/Report/Tag/Popular/Detail.php | 3 +- .../Block/Report/Tag/Popular/Detail/Grid.php | 4 +- .../Block/Report/Tag/Popular/Grid.php | 4 +- .../Block/Report/Tag/Product/Detail.php | 3 +- .../Block/Report/Tag/Product/Detail/Grid.php | 4 +- .../Block/Report/Tag/Product/Grid.php | 4 +- .../Adminhtml/Block/Report/Wishlist/Grid.php | 4 +- .../Mage/Adminhtml/Block/Review/Add/Form.php | 3 +- .../core/Mage/Adminhtml/Block/Review/Edit.php | 3 +- .../Mage/Adminhtml/Block/Review/Edit/Form.php | 3 +- .../core/Mage/Adminhtml/Block/Review/Grid.php | 3 +- .../Adminhtml/Block/Review/Product/Grid.php | 2 +- .../Block/Review/Rating/Detailed.php | 3 +- .../Mage/Adminhtml/Block/Sales/Creditmemo.php | 2 - .../Adminhtml/Block/Sales/Creditmemo/Grid.php | 8 +-- .../Adminhtml/Block/Sales/Invoice/Grid.php | 8 +-- .../Adminhtml/Block/Sales/Items/Abstract.php | 1 - .../Block/Sales/Items/Column/Default.php | 3 +- .../Block/Sales/Items/Column/Name/Grouped.php | 2 +- .../Sales/Items/Renderer/Configurable.php | 1 - .../Block/Sales/Items/Renderer/Default.php | 2 +- .../Block/Sales/Order/Address/Form.php | 2 +- .../Order/Create/Billing/Method/Form.php | 3 +- .../Block/Sales/Order/Create/Coupons.php | 1 - .../Block/Sales/Order/Create/Coupons/Form.php | 5 +- .../Block/Sales/Order/Create/Customer.php | 2 - .../Sales/Order/Create/Customer/Grid.php | 8 +-- .../Block/Sales/Order/Create/Data.php | 1 - .../Block/Sales/Order/Create/Form.php | 3 +- .../Block/Sales/Order/Create/Giftmessage.php | 2 +- .../Sales/Order/Create/Giftmessage/Form.php | 2 +- .../Block/Sales/Order/Create/Header.php | 6 +- .../Block/Sales/Order/Create/Items/Grid.php | 2 +- .../Sales/Order/Create/Newsletter/Form.php | 5 +- .../Block/Sales/Order/Create/Search/Grid.php | 2 +- .../Search/Grid/Renderer/Giftmessage.php | 5 +- .../Order/Create/Shipping/Method/Form.php | 2 +- .../Sales/Order/Create/Sidebar/Abstract.php | 1 - .../Sales/Order/Create/Sidebar/Compared.php | 2 - .../Sales/Order/Create/Totals/Default.php | 6 +- .../Sales/Order/Create/Totals/Discount.php | 7 ++- .../Sales/Order/Create/Totals/Grandtotal.php | 7 ++- .../Sales/Order/Creditmemo/Create/Form.php | 3 +- .../Sales/Order/Creditmemo/View/Form.php | 2 +- .../Mage/Adminhtml/Block/Sales/Order/Grid.php | 4 +- .../Block/Sales/Order/Invoice/Create/Form.php | 2 +- .../Block/Sales/Order/Invoice/View/Form.php | 2 +- .../Sales/Order/Shipment/Create/Form.php | 3 +- .../Sales/Order/Shipment/Packaging/Grid.php | 5 +- .../Sales/Order/Shipment/Tracking/Info.php | 2 +- .../Block/Sales/Order/Shipment/View/Form.php | 2 +- .../Block/Sales/Order/Status/Assign/Form.php | 6 +- .../Block/Sales/Order/Status/Edit.php | 7 ++- .../Block/Sales/Order/Status/Edit/Form.php | 6 +- .../Block/Sales/Order/Status/Grid.php | 3 +- .../Block/Sales/Order/Status/New/Form.php | 6 +- .../Adminhtml/Block/Sales/Order/View/Form.php | 3 +- .../Block/Sales/Order/View/Giftmessage.php | 2 +- .../Block/Sales/Order/View/History.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Info.php | 2 +- .../Order/View/Items/Renderer/Default.php | 3 +- .../Block/Sales/Order/View/Tab/History.php | 2 +- .../Block/Sales/Order/View/Tab/Info.php | 2 +- .../Adminhtml/Block/Sales/Shipment/Grid.php | 8 +-- .../Block/Sales/Transactions/Child/Grid.php | 2 +- .../Block/Sales/Transactions/Detail.php | 2 +- .../Block/Sales/Transactions/Detail/Grid.php | 2 +- .../Block/Sales/Transactions/Grid.php | 2 +- .../Block/Shipping/Carrier/Tablerate/Grid.php | 2 +- .../Mage/Adminhtml/Block/Sitemap/Edit.php | 3 +- .../Adminhtml/Block/Sitemap/Edit/Form.php | 4 +- .../Mage/Adminhtml/Block/Sitemap/Grid.php | 5 +- .../Store/Switcher/Form/Renderer/Fieldset.php | 5 +- .../Form/Renderer/Fieldset/Element.php | 5 +- .../Adminhtml/Block/System/Account/Edit.php | 3 +- .../Block/System/Account/Edit/Form.php | 3 +- .../Adminhtml/Block/System/Cache/Edit.php | 2 +- .../Adminhtml/Block/System/Cache/Form.php | 2 +- .../Adminhtml/Block/System/Config/Dwstree.php | 2 +- .../Adminhtml/Block/System/Config/Edit.php | 2 +- .../Adminhtml/Block/System/Config/Form.php | 4 +- .../Block/System/Config/Form/Field.php | 3 +- .../System/Config/Form/Field/Datetime.php | 2 +- .../Block/System/Config/Form/Field/Export.php | 2 +- .../Block/System/Config/Form/Field/File.php | 2 +- .../System/Config/Form/Field/Heading.php | 6 +- .../Block/System/Config/Form/Field/Image.php | 5 +- .../Block/System/Config/Form/Field/Import.php | 4 +- .../Form/Field/Select/Allowspecific.php | 2 - .../Config/Form/Field/Select/Flatcatalog.php | 3 +- .../Config/Form/Field/Select/Flatproduct.php | 3 +- .../Block/System/Config/Form/Fieldset.php | 3 +- .../Form/Fieldset/Modules/DisableOutput.php | 7 ++- .../Adminhtml/Block/System/Convert/Gui.php | 3 +- .../Block/System/Convert/Gui/Edit.php | 2 +- .../Block/System/Convert/Gui/Edit/Form.php | 3 +- .../Block/System/Convert/Gui/Grid.php | 4 +- .../Block/System/Convert/Profile/Edit.php | 2 +- .../System/Convert/Profile/Edit/Form.php | 3 +- .../System/Convert/Profile/Edit/Tab/Edit.php | 2 +- .../Convert/Profile/Edit/Tab/History.php | 2 +- .../Block/System/Convert/Profile/Grid.php | 4 +- .../Mage/Adminhtml/Block/System/Currency.php | 1 - .../Block/System/Currency/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/System/Design.php | 7 ++- .../Adminhtml/Block/System/Design/Edit.php | 7 ++- .../Block/System/Design/Edit/Tab/General.php | 3 +- .../Adminhtml/Block/System/Design/Grid.php | 4 +- .../Block/System/Email/Template/Edit.php | 4 +- .../Block/System/Email/Template/Edit/Form.php | 3 +- .../Block/System/Email/Template/Grid.php | 4 +- .../Adminhtml/Block/System/Store/Delete.php | 4 +- .../Block/System/Store/Delete/Form.php | 4 +- .../Block/System/Store/Delete/Group.php | 3 +- .../Adminhtml/Block/System/Store/Edit.php | 7 +-- .../Block/System/Store/Edit/Form.php | 3 +- .../Adminhtml/Block/System/Store/Grid.php | 4 +- .../Block/System/Store/Grid/Render/Group.php | 3 +- .../Adminhtml/Block/System/Variable/Edit.php | 9 +-- .../Block/System/Variable/Edit/Form.php | 3 +- .../Adminhtml/Block/System/Variable/Grid.php | 3 +- .../Adminhtml/Block/Tag/Assigned/Grid.php | 2 +- .../Mage/Adminhtml/Block/Tag/Customer.php | 2 - .../Adminhtml/Block/Tag/Customer/Grid.php | 3 +- .../core/Mage/Adminhtml/Block/Tag/Edit.php | 3 +- .../Mage/Adminhtml/Block/Tag/Edit/Form.php | 4 +- .../Mage/Adminhtml/Block/Tag/Product/Grid.php | 2 +- .../Mage/Adminhtml/Block/Tag/Tag/Edit.php | 7 +-- .../Adminhtml/Block/Tag/Tag/Edit/Form.php | 6 +- .../Mage/Adminhtml/Block/Tag/Tag/Grid.php | 5 +- .../Mage/Adminhtml/Block/Tax/Class/Edit.php | 3 +- .../Adminhtml/Block/Tax/Class/Edit/Form.php | 3 +- .../Mage/Adminhtml/Block/Tax/Class/Grid.php | 4 +- .../Mage/Adminhtml/Block/Tax/Rate/Form.php | 5 +- .../Mage/Adminhtml/Block/Tax/Rate/Grid.php | 10 ++- .../Adminhtml/Block/Tax/Rate/ImportExport.php | 8 ++- .../Block/Tax/Rate/Title/Fieldset.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rule/Edit.php | 7 +-- .../Adminhtml/Block/Tax/Rule/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Tax/Rule/Grid.php | 6 +- .../Mage/Adminhtml/Block/Urlrewrite/Edit.php | 2 +- .../Adminhtml/Block/Urlrewrite/Edit/Form.php | 2 +- .../Mage/Adminhtml/Block/Urlrewrite/Grid.php | 4 +- .../Block/Urlrewrite/Product/Grid.php | 2 +- .../Mage/Adminhtml/Block/Widget/Container.php | 1 - .../core/Mage/Adminhtml/Block/Widget/Form.php | 4 +- .../Adminhtml/Block/Widget/Form/Container.php | 1 - .../Adminhtml/Block/Widget/Form/Element.php | 2 +- .../Block/Widget/Form/Element/Dependence.php | 6 +- .../Block/Widget/Form/Element/Gallery.php | 4 +- .../Block/Widget/Form/Renderer/Element.php | 2 +- .../Block/Widget/Form/Renderer/Fieldset.php | 2 +- .../Widget/Form/Renderer/Fieldset/Element.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 2 +- .../Widget/Grid/Column/Filter/Abstract.php | 2 - .../Block/Widget/Grid/Column/Filter/Date.php | 4 +- .../Widget/Grid/Column/Filter/Datetime.php | 4 +- .../Widget/Grid/Column/Renderer/Abstract.php | 1 - .../Widget/Grid/Column/Renderer/Action.php | 1 - .../Widget/Grid/Column/Renderer/Concat.php | 2 - .../Widget/Grid/Column/Renderer/Date.php | 3 +- .../Widget/Grid/Column/Renderer/Datetime.php | 3 +- .../Widget/Grid/Column/Renderer/Input.php | 2 +- .../Adminhtml/Block/Widget/Grid/Container.php | 1 - .../Block/Widget/Grid/Massaction/Abstract.php | 1 - .../Massaction/Item/Additional/Default.php | 2 +- .../Adminhtml/Block/Widget/View/Container.php | 1 - app/code/core/Mage/Adminhtml/Exception.php | 3 +- .../Admin/Password/Link/Expirationperiod.php | 2 +- .../System/Config/Backend/Currency/Cron.php | 2 - .../Config/Backend/Currency/Default.php | 2 +- .../Password/Link/Expirationperiod.php | 2 +- .../Model/System/Config/Backend/Datashare.php | 2 +- .../Config/Backend/Design/Exception.php | 7 ++- .../Model/System/Config/Backend/Encrypted.php | 4 +- .../Model/System/Config/Backend/File.php | 2 +- .../Model/System/Config/Backend/Filename.php | 8 ++- .../System/Config/Backend/Gatewayurl.php | 2 +- .../Model/System/Config/Backend/Image.php | 4 +- .../System/Config/Backend/Image/Favicon.php | 2 +- .../System/Config/Backend/Sitemap/Cron.php | 2 - .../Config/Backend/Storage/Media/Database.php | 7 ++- .../Model/System/Config/Clone/Media/Image.php | 4 +- .../Config/Source/Catalog/GridPerPage.php | 2 +- .../Config/Source/Cms/Wysiwyg/Enabled.php | 8 +-- .../System/Config/Source/Country/Full.php | 7 ++- .../System/Config/Source/Cron/Frequency.php | 9 ++- .../Config/Source/Customer/Forgotpassword.php | 3 +- .../System/Config/Source/Customer/Group.php | 7 ++- .../System/Config/Source/Dev/Dbautoup.php | 9 ++- .../System/Config/Source/Email/Identity.php | 8 ++- .../System/Config/Source/Enabledisable.php | 7 ++- .../Model/System/Config/Source/Frequency.php | 7 ++- .../Config/Source/Notification/Frequency.php | 2 +- .../Config/Source/Security/Domainpolicy.php | 7 ++- .../Config/Source/Shipping/Flatrate.php | 7 ++- .../Config/Source/Storage/Media/Database.php | 7 ++- .../System/Config/Source/Tax/Catalog.php | 1 - .../Catalog/Product/AttributeController.php | 1 - .../Catalog/Product/DatafeedsController.php | 7 ++- .../Catalog/Product/GalleryController.php | 2 +- .../Catalog/Product/GroupController.php | 5 +- .../Cms/Wysiwyg/ImagesController.php | 2 +- .../controllers/Customer/GroupController.php | 2 +- .../Adminhtml/controllers/IndexController.php | 2 +- .../controllers/Media/EditorController.php | 2 +- .../Sales/Order/EditController.php | 5 +- .../Order/View/GiftmessageController.php | 2 +- .../System/Convert/GuiController.php | 2 +- .../controllers/System/DesignController.php | 7 ++- app/code/core/Mage/Api/Exception.php | 6 +- .../core/Mage/Api/Model/Acl/Role/Generic.php | 9 ++- .../core/Mage/Api/Model/Acl/Role/Group.php | 9 ++- .../core/Mage/Api/Model/Resource/Abstract.php | 1 - .../core/Mage/Api/Model/Server/Handler.php | 7 +-- .../core/Mage/Api/Model/Server/V2/Handler.php | 6 +- .../Mage/Api/Model/Server/Wsi/Handler.php | 6 +- .../Mage/Api/Model/Wsdl/Config/Element.php | 9 +-- .../Mage/Api/controllers/IndexController.php | 6 +- .../Api/sql/api_setup/install-1.6.0.0.php | 16 ++--- .../Api2/Block/Adminhtml/Attribute/Edit.php | 6 +- .../Block/Adminhtml/Attribute/Edit/Form.php | 6 +- .../Api2/Block/Adminhtml/Attribute/Grid.php | 6 +- .../Mage/Api2/Block/Adminhtml/Roles/Grid.php | 6 +- .../Api2/Block/Adminhtml/Roles/Tab/Info.php | 7 ++- app/code/core/Mage/Api2/Exception.php | 6 +- app/code/core/Mage/Api2/Model/Acl.php | 2 - app/code/core/Mage/Api2/Model/Acl/Filter.php | 6 +- app/code/core/Mage/Api2/Model/Acl/Global.php | 6 +- .../core/Mage/Api2/Model/Auth/User/Guest.php | 6 +- app/code/core/Mage/Api2/Model/Dispatcher.php | 6 +- .../Api2/Model/Resource/Validator/Eav.php | 6 +- .../Api2/Model/Resource/Validator/Fields.php | 6 +- .../Api2/sql/api2_setup/install-1.0.0.0.php | 11 ++-- .../Authorizenet/Block/Directpost/Form.php | 6 +- .../Authorizenet/Block/Directpost/Iframe.php | 8 +-- .../Mage/Authorizenet/Model/Directpost.php | 6 +- app/code/core/Mage/Backup/Exception.php | 14 +++-- app/code/core/Mage/Backup/Model/Db.php | 13 ++-- app/code/core/Mage/Backup/Model/Mysql4/Db.php | 12 ++-- .../core/Mage/Backup/Model/Resource/Db.php | 12 ++-- .../Product/Edit/Tab/Attributes/Extend.php | 12 ++-- .../Edit/Tab/Bundle/Option/Search/Grid.php | 12 ++-- .../Bundle/Model/CatalogIndex/Data/Bundle.php | 1 - .../Mage/Bundle/Model/Mysql4/Price/Index.php | 12 ++-- .../core/Mage/Bundle/Model/Price/Index.php | 14 ++--- .../Bundle/Model/Resource/Price/Index.php | 12 ++-- .../Bundle/Product/EditController.php | 12 ++-- .../controllers/Product/EditController.php | 13 ++-- .../bundle_setup/data-install-1.6.0.0.php | 8 +-- .../sql/bundle_setup/install-1.6.0.0.php | 9 ++- .../core/Mage/Captcha/Model/Config/Font.php | 2 +- .../Captcha/Model/Config/Form/Frontend.php | 2 +- .../Catalog/Block/Layer/Filter/Decimal.php | 16 ++--- .../Mage/Catalog/Block/Product/Gallery.php | 8 +-- .../Catalog/Block/Product/View/Additional.php | 1 - .../Block/Product/View/Description.php | 6 +- .../Block/Product/View/Options/Type/Date.php | 6 +- .../Product/View/Options/Type/Default.php | 7 +-- .../Block/Product/View/Options/Type/File.php | 6 +- .../Block/Product/View/Type/Grouped.php | 8 +-- .../Catalog/Block/Seo/Sitemap/Abstract.php | 1 - .../Catalog/Block/Seo/Sitemap/Category.php | 1 - app/code/core/Mage/Catalog/Exception.php | 12 ++-- .../Mage/Catalog/Helper/Category/Flat.php | 6 +- app/code/core/Mage/Catalog/Helper/Image.php | 10 +-- .../core/Mage/Catalog/Helper/Product/Flat.php | 6 +- .../Mage/Catalog/Model/Api2/Product/Image.php | 6 +- .../Api2/Product/Image/Validator/Image.php | 6 +- .../Attribute/Backend/Customlayoutupdate.php | 1 - .../Category/Attribute/Backend/Image.php | 9 +-- .../Catalog/Model/Category/Indexer/Flat.php | 12 ++-- app/code/core/Mage/Catalog/Model/Design.php | 6 +- .../Product/Attribute/Frontend/Image.php | 20 +++--- app/code/core/Mage/Catalog/Model/Factory.php | 14 ++--- app/code/core/Mage/Catalog/Model/Index.php | 7 +-- .../Catalog/Model/Layer/Filter/Decimal.php | 12 ++-- .../Catalog/Model/Product/Attribute/Api.php | 3 - .../Product/Attribute/Backend/Groupprice.php | 6 +- .../Product/Attribute/Frontend/Image.php | 9 ++- .../Catalog/Model/Product/Attribute/Group.php | 12 ++-- .../Product/Attribute/Source/Inputtype.php | 10 +-- .../Attribute/Source/Msrp/Type/Enabled.php | 6 +- .../Mage/Catalog/Model/Product/Flat/Flag.php | 6 +- .../Catalog/Model/Product/Flat/Indexer.php | 14 ++--- .../core/Mage/Catalog/Model/Product/Image.php | 12 ++-- .../Catalog/Model/Product/Indexer/Eav.php | 14 ++--- .../Catalog/Model/Product/Indexer/Flat.php | 12 +++- .../Mage/Catalog/Model/Product/Option/Api.php | 1 - .../Model/Product/Option/Type/Date.php | 6 +- .../Model/Product/Option/Type/Default.php | 6 +- .../Model/Product/Option/Type/File.php | 6 +- .../Catalog/Model/Product/Type/Grouped.php | 8 +-- .../Category/Attribute/Frontend/Image.php | 14 ++--- .../Catalog/Model/Resource/Category/Flat.php | 12 ++-- .../Category/Attribute/Frontend/Image.php | 12 ++-- .../Resource/Eav/Mysql4/Category/Flat.php | 12 ++-- .../Eav/Mysql4/Layer/Filter/Decimal.php | 12 ++-- .../Product/Attribute/Backend/Image.php | 12 ++-- .../Product/Attribute/Frontend/Image.php | 12 ++-- .../Resource/Eav/Mysql4/Product/Flat.php | 12 ++-- .../Eav/Mysql4/Product/Flat/Indexer.php | 12 ++-- .../Eav/Mysql4/Product/Indexer/Eav.php | 12 ++-- .../Mysql4/Product/Indexer/Eav/Decimal.php | 12 ++-- .../Mysql4/Product/Indexer/Price/Default.php | 12 ++-- .../Mysql4/Product/Indexer/Price/Grouped.php | 12 ++-- .../Model/Resource/Layer/Filter/Decimal.php | 12 ++-- .../Product/Attribute/Backend/Groupprice.php | 12 ++-- .../Product/Attribute/Backend/Image.php | 8 +-- .../Product/Attribute/Frontend/Image.php | 13 ++-- .../Catalog/Model/Resource/Product/Flat.php | 12 ++-- .../Model/Resource/Product/Flat/Indexer.php | 12 ++-- .../Model/Resource/Product/Indexer/Eav.php | 12 ++-- .../Resource/Product/Indexer/Eav/Decimal.php | 12 ++-- .../Product/Indexer/Price/Default.php | 12 ++-- .../Product/Indexer/Price/Grouped.php | 12 ++-- .../Config/Backend/Catalog/Category/Flat.php | 10 ++- .../Config/Backend/Catalog/Product/Flat.php | 10 ++- .../Mage/Catalog/Model/Template/Filter.php | 14 ++--- .../Catalog/controllers/IndexController.php | 14 +++-- .../catalog_setup/data-install-1.6.0.0.php | 6 +- .../data-upgrade-1.6.0.0.12-1.6.0.0.13.php | 6 +- .../data-upgrade-1.6.0.0.13-1.6.0.0.14.php | 7 ++- ...-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php | 8 +-- .../data-upgrade-1.6.0.0.4-1.6.0.0.5.php | 6 +- .../data-upgrade-1.6.0.0.8-1.6.0.0.9.php | 6 +- .../sql/catalog_setup/install-1.6.0.0.php | 9 ++- .../CatalogIndex/Model/Catalog/Index/Flag.php | 11 +++- .../Model/Catalog/Index/Kill/Flag.php | 11 +++- .../Mage/CatalogIndex/Model/Data/Grouped.php | 10 +-- .../core/Mage/CatalogIndex/Model/Indexer.php | 14 ++--- .../Mage/CatalogIndex/Model/Indexer/Eav.php | 14 ++--- .../Model/Mysql4/Data/Grouped.php | 12 ++-- .../CatalogIndex/Model/Mysql4/Indexer.php | 12 ++-- .../CatalogIndex/Model/Mysql4/Indexer/Eav.php | 12 ++-- .../Model/Resource/Data/Grouped.php | 12 ++-- .../CatalogIndex/Model/Resource/Indexer.php | 12 ++-- .../Model/Resource/Indexer/Eav.php | 12 ++-- .../catalogindex_setup/install-1.6.0.0.php | 13 ++-- .../Block/Stockqty/Default.php | 8 +-- .../Block/Stockqty/Type/Grouped.php | 8 +-- .../Model/Mysql4/Indexer/Stock/Default.php | 12 ++-- .../Model/Mysql4/Indexer/Stock/Grouped.php | 12 ++-- .../Model/Resource/Indexer/Stock/Default.php | 12 ++-- .../Model/Resource/Indexer/Stock/Grouped.php | 12 ++-- .../install-1.6.0.0.php | 9 ++- app/code/core/Mage/CatalogRule/Model/Flag.php | 12 ++-- .../sql/catalogrule_setup/install-1.6.0.0.php | 8 +-- .../CatalogSearch/Block/Advanced/Form.php | 8 +-- .../Mage/CatalogSearch/Model/Fulltext.php | 14 ++--- .../CatalogSearch/Model/Indexer/Fulltext.php | 12 ++-- .../CatalogSearch/Model/Mysql4/Fulltext.php | 12 ++-- .../Model/Mysql4/Fulltext/Engine.php | 12 ++-- .../Model/Mysql4/Indexer/Fulltext.php | 13 ++-- .../CatalogSearch/Model/Resource/Fulltext.php | 12 ++-- .../Model/Resource/Fulltext/Engine.php | 12 ++-- .../Model/Resource/Indexer/Fulltext.php | 12 ++-- .../catalogsearch_setup/install-1.6.0.0.php | 9 ++- .../Block/Adminhtml/Validation/Form.php | 9 ++- .../Adminhtml/Centinel/IndexController.php | 12 ++-- .../Centinel/controllers/IndexController.php | 9 ++- .../Block/Cart/Item/Renderer/Grouped.php | 12 ++-- .../Block/Multishipping/Payment/Info.php | 8 +-- .../Mage/Checkout/Block/Onepage/Failure.php | 11 +++- .../Checkout/Block/Onepage/Payment/Info.php | 8 +-- .../Checkout/Block/Onepage/Review/Info.php | 12 ++-- .../Mage/Checkout/Block/Total/Default.php | 10 +-- app/code/core/Mage/Checkout/Exception.php | 12 ++-- .../Checkout/controllers/IndexController.php | 11 +++- .../sql/checkout_setup/install-1.6.0.0.php | 7 ++- .../core/Mage/Cms/Helper/Wysiwyg/Images.php | 10 ++- .../Cms/Model/Adminhtml/Template/Filter.php | 12 ++-- .../core/Mage/Cms/Model/Template/Filter.php | 12 ++-- .../Mage/Cms/controllers/IndexController.php | 6 +- .../data/cms_setup/data-install-1.6.0.0.php | 6 +- .../data-upgrade-1.6.0.0.0-1.6.0.0.1.php | 6 +- .../data-upgrade-1.6.0.0.1-1.6.0.0.2.php | 7 ++- .../Cms/sql/cms_setup/install-1.6.0.0.php | 7 +-- .../Catalog/Product/Type/Configurable.php | 1 - .../Contacts/controllers/IndexController.php | 8 +-- .../sql/contacts_setup/install-1.6.0.0.php | 7 +-- app/code/core/Mage/Core/Block/Flush.php | 10 +-- app/code/core/Mage/Core/Block/Html/Date.php | 8 +-- .../core/Mage/Core/Block/Template/Facade.php | 6 +- .../core/Mage/Core/Block/Text/Tag/Debug.php | 10 +-- .../Mage/Core/Controller/Request/Http.php | 10 +-- .../Mage/Core/Controller/Response/Http.php | 13 ++-- .../Mage/Core/Controller/Varien/Exception.php | 9 ++- .../Mage/Core/Controller/Varien/Front.php | 10 ++- .../Core/Controller/Varien/Router/Default.php | 11 +++- app/code/core/Mage/Core/Exception.php | 7 ++- .../Core/Helper/File/Storage/Database.php | 12 ++-- app/code/core/Mage/Core/Helper/Hint.php | 12 ++-- app/code/core/Mage/Core/Helper/Http.php | 14 ++--- app/code/core/Mage/Core/Model/App.php | 1 - .../core/Mage/Core/Model/App/Emulation.php | 12 ++-- .../core/Mage/Core/Model/Config/Element.php | 7 ++- app/code/core/Mage/Core/Model/Date.php | 10 +-- app/code/core/Mage/Core/Model/Design.php | 14 ++--- .../core/Mage/Core/Model/Design/Fallback.php | 6 +- .../Mage/Core/Model/Design/Source/Design.php | 11 +++- .../core/Mage/Core/Model/Domainpolicy.php | 8 +-- app/code/core/Mage/Core/Model/Email.php | 10 ++- app/code/core/Mage/Core/Model/Email/Info.php | 12 ++-- .../Mage/Core/Model/Email/Template/Filter.php | 6 +- app/code/core/Mage/Core/Model/Encryption.php | 8 +-- app/code/core/Mage/Core/Model/Factory.php | 14 ++--- .../Mage/Core/Model/File/Storage/Database.php | 14 ++--- .../Model/File/Storage/Directory/Database.php | 12 ++-- .../Mage/Core/Model/File/Storage/File.php | 15 +++-- .../Mage/Core/Model/File/Storage/Flag.php | 12 ++-- .../Mage/Core/Model/File/Validator/Image.php | 6 +- app/code/core/Mage/Core/Model/Flag.php | 14 ++--- .../core/Mage/Core/Model/Input/Filter.php | 10 +-- .../core/Mage/Core/Model/Layout/Element.php | 11 +++- app/code/core/Mage/Core/Model/Log/Adapter.php | 1 - .../core/Mage/Core/Model/Message/Error.php | 11 +++- .../core/Mage/Core/Model/Mysql4/Design.php | 12 ++-- .../Model/Mysql4/File/Storage/Database.php | 12 ++-- .../File/Storage/Directory/Database.php | 12 ++-- .../Core/Model/Mysql4/File/Storage/File.php | 12 ++-- app/code/core/Mage/Core/Model/Mysql4/Flag.php | 12 ++-- .../Mage/Core/Model/Mysql4/Store/Group.php | 12 ++-- .../core/Mage/Core/Model/Resource/Design.php | 12 ++-- .../Model/Resource/File/Storage/Database.php | 12 ++-- .../File/Storage/Directory/Database.php | 12 ++-- .../Core/Model/Resource/File/Storage/File.php | 13 ++-- .../core/Mage/Core/Model/Resource/Flag.php | 12 ++-- .../Mage/Core/Model/Resource/Store/Group.php | 12 ++-- .../core/Mage/Core/Model/Resource/Type/Db.php | 14 +++-- .../Mage/Core/Model/Session/Exception.php | 7 +-- .../core/Mage/Core/Model/Store/Exception.php | 9 ++- app/code/core/Mage/Core/Model/Store/Group.php | 14 ++--- .../core/Mage/Core/Model/Translate/Expr.php | 10 +-- .../core/Mage/Core/Model/Translate/Inline.php | 8 +-- .../Mage/Core/controllers/IndexController.php | 12 ++-- app/code/core/Mage/Core/functions.php | 6 +- .../Core/sql/core_setup/install-1.6.0.0.php | 7 +-- app/code/core/Mage/Cron/Exception.php | 8 +-- .../Cron/sql/cron_setup/install-1.6.0.0.php | 8 +-- .../Block/Account/Dashboard/Hello.php | 11 +++- .../Customer/Block/Account/Dashboard/Info.php | 9 ++- .../Customer/Block/Account/Forgotpassword.php | 14 ++--- .../core/Mage/Customer/Block/Address/Edit.php | 8 +-- .../Block/Address/Renderer/Default.php | 8 +-- .../core/Mage/Customer/Block/Form/Edit.php | 9 ++- .../core/Mage/Customer/Block/Widget/Dob.php | 10 ++- .../Mage/Customer/Block/Widget/Gender.php | 8 +-- app/code/core/Mage/Customer/Exception.php | 12 ++-- .../Customer/Model/Attribute/Data/Date.php | 12 ++-- .../Customer/Model/Attribute/Data/File.php | 12 ++-- .../Customer/Model/Attribute/Data/Hidden.php | 12 ++-- .../Customer/Model/Attribute/Data/Image.php | 12 ++-- .../Model/Customer/Attribute/Source/Group.php | 8 +-- .../core/Mage/Customer/Model/Entity/Group.php | 12 ++-- .../core/Mage/Customer/Model/Flowpassword.php | 14 ++--- app/code/core/Mage/Customer/Model/Form.php | 12 ++-- app/code/core/Mage/Customer/Model/Group.php | 14 ++--- .../Customer/Model/Resource/Flowpassword.php | 12 ++-- .../Mage/Customer/Model/Resource/Group.php | 12 ++-- .../data-upgrade-1.6.2.0.2-1.6.2.0.3.php | 6 +- .../data-upgrade-1.6.2.0.4-1.6.2.0.5.php | 7 +-- .../sql/customer_setup/install-1.6.0.0.php | 6 +- .../core/Mage/Dataflow/Model/Batch/Export.php | 14 ++--- .../core/Mage/Dataflow/Model/Batch/Import.php | 14 ++--- app/code/core/Mage/Dataflow/Model/Convert.php | 2 - .../Model/Convert/Action/Abstract.php | 1 - .../Model/Convert/Adapter/Abstract.php | 1 - .../Dataflow/Model/Convert/Adapter/Http.php | 10 ++- .../Model/Convert/Adapter/Http/Curl.php | 1 - .../Model/Convert/Adapter/Zend/Cache.php | 2 - .../Model/Convert/Adapter/Zend/Db.php | 10 ++- .../Model/Convert/Container/Collection.php | 2 - .../Model/Convert/Container/Generic.php | 9 ++- .../Mage/Dataflow/Model/Convert/Exception.php | 10 ++- .../Dataflow/Model/Convert/Iterator/Http.php | 9 ++- .../Model/Convert/Parser/Xml/Excel.php | 8 +-- .../Model/Convert/Profile/Abstract.php | 1 - .../Model/Convert/Profile/Collection.php | 2 - .../Model/Convert/Validator/Dryrun.php | 10 ++- app/code/core/Mage/Dataflow/Model/Import.php | 16 +++-- .../Dataflow/Model/Mysql4/Batch/Export.php | 12 ++-- .../Dataflow/Model/Mysql4/Batch/Import.php | 12 ++-- .../Mage/Dataflow/Model/Mysql4/Import.php | 12 ++-- .../Dataflow/Model/Mysql4/Profile/History.php | 12 ++-- .../Mage/Dataflow/Model/Profile/History.php | 14 ++--- .../Dataflow/Model/Resource/Batch/Export.php | 12 ++-- .../Dataflow/Model/Resource/Batch/Import.php | 12 ++-- .../Mage/Dataflow/Model/Resource/Import.php | 12 ++-- .../Model/Resource/Profile/History.php | 13 ++-- .../Dataflow/Model/Session/Adapter/Http.php | 63 +++++++------------ .../Dataflow/Model/Session/Parser/Csv.php | 1 - .../dataflow_setup/data-install-1.6.0.0.php | 9 ++- .../sql/dataflow_setup/install-1.6.0.0.php | 9 ++- app/code/core/Mage/Directory/Exception.php | 12 ++-- .../Mage/Directory/Model/Country/Format.php | 15 +++-- .../Mage/Directory/Model/Currency/Filter.php | 10 +-- .../Model/Currency/Import/Fixerio.php | 6 +- .../Directory/Model/Mysql4/Country/Format.php | 12 ++-- .../Model/Resource/Country/Format.php | 12 ++-- .../directory_setup/data-install-1.6.0.0.php | 6 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 10 ++- .../data-upgrade-1.6.0.2-1.6.0.3.php | 6 +- .../sql/directory_setup/install-1.6.0.0.php | 9 ++- .../Composite/Fieldset/Downloadable.php | 6 +- .../Catalog/Product/Edit/Tab/Downloadable.php | 12 ++-- .../Sales/Order/Email/Items/Downloadable.php | 6 +- .../Order/Email/Items/Order/Downloadable.php | 6 +- .../Order/Item/Renderer/Downloadable.php | 12 ++-- .../Mage/Downloadable/Helper/Download.php | 12 ++-- .../core/Mage/Downloadable/Helper/File.php | 12 ++-- .../Model/CatalogIndex/Data/Downloadable.php | 13 ++-- .../Adminhtml/Downloadable/FileController.php | 12 ++-- .../Downloadable/Product/EditController.php | 16 ++--- .../controllers/CustomerController.php | 1 - .../controllers/DownloadController.php | 13 ++-- .../controllers/FileController.php | 12 ++-- .../controllers/Product/EditController.php | 12 ++-- .../data-install-1.6.0.0.php | 7 ++- .../downloadable_setup/install-1.6.0.0.php | 9 ++- .../Attribute/Edit/Options/Abstract.php | 1 - .../Adminhtml/Attribute/Grid/Abstract.php | 1 - app/code/core/Mage/Eav/Exception.php | 2 +- .../System/Config/Source/Inputtype.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Date.php | 2 +- .../Eav/Model/Attribute/Data/Datetime.php | 2 +- .../Mage/Eav/Model/Attribute/Data/File.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Hidden.php | 2 +- .../Mage/Eav/Model/Attribute/Data/Image.php | 2 +- .../Mage/Eav/Model/Convert/Adapter/Entity.php | 2 +- .../Mage/Eav/Model/Convert/Adapter/Grid.php | 2 +- app/code/core/Mage/Eav/Model/Entity.php | 2 +- .../Entity/Attribute/Backend/Datetime.php | 2 +- .../Entity/Attribute/Backend/Default.php | 3 +- .../Entity/Attribute/Backend/Increment.php | 2 +- .../Entity/Attribute/Backend/Time/Created.php | 1 - .../Eav/Model/Entity/Attribute/Exception.php | 2 +- .../Entity/Attribute/Frontend/Abstract.php | 1 - .../Entity/Attribute/Frontend/Datetime.php | 2 +- .../Entity/Attribute/Frontend/Default.php | 3 +- .../Mage/Eav/Model/Entity/Attribute/Group.php | 10 +-- app/code/core/Mage/Eav/Model/Form.php | 2 +- app/code/core/Mage/Eav/Model/Form/Element.php | 2 +- .../core/Mage/Eav/Model/Form/Fieldset.php | 2 +- .../Model/Mysql4/Entity/Attribute/Group.php | 2 +- .../Mage/Eav/Model/Mysql4/Form/Element.php | 2 +- .../Mage/Eav/Model/Mysql4/Form/Fieldset.php | 2 +- .../Model/Resource/Entity/Attribute/Group.php | 2 +- .../Mage/Eav/Model/Resource/Form/Element.php | 2 +- .../Mage/Eav/Model/Resource/Form/Fieldset.php | 2 +- .../Eav/sql/eav_setup/install-1.6.0.0.php | 5 +- .../Adminhtml/Sales/Order/Create/Form.php | 6 +- .../Sales/Order/Create/Giftoptions.php | 6 +- .../Block/Adminhtml/Sales/Order/View/Form.php | 6 +- .../Sales/Order/View/Giftoptions.php | 6 +- .../Mage/GiftMessage/Block/Message/Form.php | 10 +-- .../Mage/GiftMessage/Block/Message/Helper.php | 8 +-- .../Mage/GiftMessage/Block/Message/Inline.php | 8 +-- .../controllers/IndexController.php | 10 +-- .../sql/giftmessage_setup/install-1.6.0.0.php | 7 +-- .../core/Mage/GoogleAnalytics/Block/Ga.php | 6 +- .../googleanalytics_setup/install-1.6.0.0.php | 9 ++- .../Block/Adminhtml/Export/Edit.php | 15 ++--- .../Block/Adminhtml/Export/Edit/Form.php | 12 ++-- .../Block/Adminhtml/Export/Filter.php | 12 ++-- .../Block/Adminhtml/Import/Edit.php | 12 ++-- .../Block/Adminhtml/Import/Edit/Form.php | 12 ++-- .../core/Mage/ImportExport/Model/Export.php | 12 ++-- .../Export/Entity/Product/Type/Grouped.php | 12 ++-- .../core/Mage/ImportExport/Model/Import.php | 12 ++-- .../Import/Entity/Product/Type/Grouped.php | 12 ++-- .../Model/Source/Export/Entity.php | 12 ++-- .../Model/Source/Export/Format.php | 12 ++-- .../Model/Source/Import/Entity.php | 12 ++-- .../Adminhtml/ExportController.php | 12 ++-- .../Adminhtml/ImportController.php | 12 ++-- .../importexport_setup/install-1.6.0.0.php | 6 +- .../Index/Block/Adminhtml/Process/Edit.php | 12 ++-- .../Block/Adminhtml/Process/Edit/Form.php | 11 +++- .../Index/Block/Adminhtml/Process/Grid.php | 11 +++- app/code/core/Mage/Index/Exception.php | 9 +-- app/code/core/Mage/Index/Model/Event.php | 14 ++--- app/code/core/Mage/Index/Model/Indexer.php | 10 ++- .../core/Mage/Index/Model/Lock/Storage/Db.php | 12 ++-- .../core/Mage/Index/Model/Mysql4/Event.php | 12 ++-- .../core/Mage/Index/Model/Resource/Event.php | 12 ++-- .../Index/sql/index_setup/install-1.6.0.0.php | 9 ++- app/code/core/Mage/Install/Block/End.php | 10 +-- .../Install/Controller/Router/Install.php | 11 +++- app/code/core/Mage/Install/Model/Config.php | 2 - .../Mage/Install/Model/Installer/Console.php | 2 - .../Mage/Install/Model/Installer/Data.php | 1 - .../core/Mage/Install/Model/Installer/Db.php | 8 +-- .../core/Mage/Install/Model/Installer/Env.php | 8 +-- .../Install/Model/Installer/Filesystem.php | 8 +-- .../Install/controllers/IndexController.php | 10 ++- .../data/log_setup/data-install-1.6.0.0.php | 2 +- .../Log/sql/log_setup/install-1.6.0.0.php | 3 +- app/code/core/Mage/Media/Model/File/Image.php | 8 +-- app/code/core/Mage/Media/Model/Image.php | 14 ++--- .../Model/Resource/Subscriber/Collection.php | 1 - .../Mage/Newsletter/Model/Template/Filter.php | 12 ++-- .../data-upgrade-1.6.0.0-1.6.0.1.php | 6 +- .../data-upgrade-1.6.0.1-1.6.0.2.php | 7 +-- .../sql/newsletter_setup/install-1.6.0.0.php | 16 ++--- .../Adminhtml/Oauth/Admin/Token/Grid.php | 6 +- .../Adminhtml/Oauth/AuthorizedTokens/Grid.php | 6 +- .../Block/Adminhtml/Oauth/Consumer/Edit.php | 6 +- .../Adminhtml/Oauth/Consumer/Edit/Form.php | 6 +- .../Block/Adminhtml/Oauth/Consumer/Grid.php | 6 +- app/code/core/Mage/Oauth/Exception.php | 14 ++--- .../Oauth/controllers/InitiateController.php | 14 ++--- .../Oauth/sql/oauth_setup/install-1.0.0.0.php | 11 ++-- app/code/core/Mage/Page/Block/Html.php | 8 +-- app/code/core/Mage/Page/Block/Html/Footer.php | 9 ++- app/code/core/Mage/Page/Block/Html/Head.php | 6 +- app/code/core/Mage/Page/Block/Html/Header.php | 6 +- .../Mage/Page/Block/Template/Container.php | 1 - .../Mage/Page/Block/Template/Links/Block.php | 1 - app/code/core/Mage/Page/Helper/Html.php | 13 ++-- app/code/core/Mage/PageCache/Helper/Data.php | 12 ++-- app/code/core/Mage/Paygate/Helper/Data.php | 10 ++- .../Mage/Paygate/Model/Authorizenet/Debug.php | 14 ++--- .../Model/Mysql4/Authorizenet/Debug.php | 12 ++-- .../Model/Resource/Authorizenet/Debug.php | 16 ++--- .../sql/paygate_setup/install-1.6.0.0.php | 6 +- app/code/core/Mage/Payment/Block/Form.php | 10 ++- .../Mage/Payment/Block/Form/Banktransfer.php | 1 - .../Payment/Block/Form/Cashondelivery.php | 1 - app/code/core/Mage/Payment/Block/Info.php | 10 ++- .../core/Mage/Payment/Block/Info/Checkmo.php | 1 - app/code/core/Mage/Payment/Exception.php | 8 +-- app/code/core/Mage/Payment/Helper/Data.php | 8 ++- app/code/core/Mage/Payment/Model/Info.php | 8 +-- .../Mage/Payment/Model/Info/Exception.php | 7 +-- .../Payment/Model/Method/Cashondelivery.php | 1 - .../core/Mage/Payment/Model/Method/Free.php | 6 +- .../Block/Adminhtml/Settlement/Details.php | 12 ++-- .../Adminhtml/Settlement/Details/Form.php | 12 ++-- .../Adminhtml/Settlement/Report/Grid.php | 12 ++-- .../Adminhtml/System/Config/Field/Hidden.php | 6 +- .../System/Config/Fieldset/Deprecated.php | 12 ++-- .../System/Config/Fieldset/Expanded.php | 12 ++-- .../System/Config/Fieldset/Global.php | 11 ++-- .../System/Config/Fieldset/Group.php | 12 ++-- .../Adminhtml/System/Config/Fieldset/Hint.php | 10 +-- .../System/Config/Payflowlink/Info.php | 6 +- app/code/core/Mage/Paypal/Block/Bml/Form.php | 10 ++- .../core/Mage/Paypal/Block/Express/Form.php | 10 ++- .../Paypal/Block/Express/Review/Details.php | 8 +-- .../Mage/Paypal/Block/Hosted/Pro/Form.php | 7 +-- .../Mage/Paypal/Block/Hosted/Pro/Iframe.php | 9 +-- .../Mage/Paypal/Block/Hosted/Pro/Info.php | 6 +- app/code/core/Mage/Paypal/Block/Iframe.php | 8 +-- .../Paypal/Block/Payflow/Advanced/Form.php | 7 +-- .../Paypal/Block/Payflow/Advanced/Iframe.php | 7 +-- .../Paypal/Block/Payflow/Advanced/Info.php | 7 +-- .../Mage/Paypal/Block/Payflow/Link/Form.php | 7 +-- .../Mage/Paypal/Block/Payflow/Link/Iframe.php | 6 +- .../Mage/Paypal/Block/Payflow/Link/Info.php | 6 +- .../core/Mage/Paypal/Block/Payment/Info.php | 10 ++- .../core/Mage/Paypal/Block/Standard/Form.php | 10 ++- app/code/core/Mage/Paypal/Exception.php | 12 ++-- app/code/core/Mage/Paypal/Helper/Data.php | 10 ++- app/code/core/Mage/Paypal/Helper/Hss.php | 10 ++- app/code/core/Mage/Paypal/Model/Direct.php | 10 +-- app/code/core/Mage/Paypal/Model/Express.php | 11 ++-- app/code/core/Mage/Paypal/Model/Hostedpro.php | 13 ++-- app/code/core/Mage/Paypal/Model/Info.php | 10 ++- .../Mage/Paypal/Model/Method/Agreement.php | 1 - .../System/Config/Source/FetchingSchedule.php | 10 ++- .../Config/Source/PaymentActions/Express.php | 12 ++-- .../Paypal/controllers/ExpressController.php | 10 +-- .../controllers/HostedproController.php | 6 +- .../paypal_setup/data-install-1.6.0.5.php | 6 +- .../data-upgrade-1.6.0.2-1.6.0.3.php | 6 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 6 +- .../data-upgrade-1.6.0.5-1.6.0.6.php | 6 +- .../sql/paypal_setup/install-1.6.0.0.php | 10 +-- .../core/Mage/PaypalUk/Block/Bml/Form.php | 10 ++- .../core/Mage/PaypalUk/Block/Express/Form.php | 12 ++-- app/code/core/Mage/PaypalUk/Helper/Data.php | 11 ++-- app/code/core/Mage/PaypalUk/Model/Direct.php | 10 ++- app/code/core/Mage/PaypalUk/Model/Express.php | 10 +-- .../controllers/ExpressController.php | 11 ++-- .../sql/paypaluk_setup/install-1.6.0.0.php | 8 +-- app/code/core/Mage/Persistent/Helper/Data.php | 6 +- .../controllers/IndexController.php | 6 +- .../sql/persistent_setup/install-1.0.0.0.php | 6 +- app/code/core/Mage/Poll/Helper/Data.php | 11 ++-- .../data/poll_setup/data-install-1.6.0.0.php | 7 +-- .../Poll/sql/poll_setup/install-1.6.0.0.php | 8 +-- .../core/Mage/ProductAlert/Helper/Data.php | 8 +-- .../core/Mage/ProductAlert/Model/Email.php | 6 +- .../productalert_setup/install-1.6.0.0.php | 17 ++--- .../Mage/Rating/Block/Entity/Detailed.php | 8 +-- app/code/core/Mage/Rating/Helper/Data.php | 11 ++-- .../Rating/Model/Mysql4/Rating/Entity.php | 12 ++-- .../core/Mage/Rating/Model/Rating/Entity.php | 15 +++-- .../Rating/Model/Resource/Rating/Entity.php | 12 ++-- .../rating_setup/data-install-1.6.0.0.php | 14 +---- .../sql/rating_setup/install-1.6.0.0.php | 16 ++--- app/code/core/Mage/Reports/Exception.php | 12 ++-- app/code/core/Mage/Reports/Helper/Data.php | 10 +-- app/code/core/Mage/Reports/Model/Event.php | 6 +- app/code/core/Mage/Reports/Model/Flag.php | 6 +- .../core/Mage/Reports/Model/Mysql4/Event.php | 12 ++-- .../Model/Resource/Accounts/Collection.php | 1 - .../Mage/Reports/Model/Resource/Event.php | 12 ++-- .../Model/Resource/Quote/Collection.php | 1 - .../reports_setup/data-install-1.6.0.0.php | 10 ++- .../sql/reports_setup/install-1.6.0.0.php | 10 ++- app/code/core/Mage/Review/Block/Form.php | 8 +-- app/code/core/Mage/Review/Block/Helper.php | 6 +- app/code/core/Mage/Review/Helper/Data.php | 8 ++- .../review_setup/data-install-1.6.0.0.php | 14 +---- .../core/Mage/Rss/Block/Order/Details.php | 12 +++- app/code/core/Mage/Rss/Helper/Catalog.php | 2 - app/code/core/Mage/Rss/Helper/Data.php | 6 +- .../Mage/Rss/controllers/IndexController.php | 11 ++-- .../data/rss_setup/data-install-1.6.0.0.php | 7 +-- app/code/core/Mage/Rule/Block/Editable.php | 13 ++-- app/code/core/Mage/Rule/Helper/Data.php | 11 ++-- app/code/core/Mage/Rule/Model/Environment.php | 10 ++- .../Rule/Model/Resource/Rule/Collection.php | 1 - .../Adminhtml/Billing/Agreement/Grid.php | 10 +-- .../Adminhtml/Billing/Agreement/View/Form.php | 10 +-- .../Billing/Agreement/View/Tab/Info.php | 10 +-- .../Adminhtml/Recurring/Profile/Edit/Form.php | 10 ++- .../Adminhtml/Recurring/Profile/Grid.php | 10 +-- .../Recurring/Profile/View/Getawayinfo.php | 8 +-- .../Adminhtml/Recurring/Profile/View/Info.php | 8 +-- .../Recurring/Profile/View/Tab/Info.php | 11 +++- .../Block/Adminhtml/Report/Filter/Form.php | 6 +- .../core/Mage/Sales/Block/Order/Details.php | 10 ++- .../Sales/Block/Order/Email/Items/Default.php | 6 +- .../Block/Order/Email/Items/Order/Default.php | 6 +- .../Block/Order/Email/Items/Order/Grouped.php | 6 +- .../core/Mage/Sales/Block/Order/History.php | 9 ++- app/code/core/Mage/Sales/Block/Order/Info.php | 12 ++-- .../Block/Order/Item/Renderer/Default.php | 12 ++-- .../Block/Order/Item/Renderer/Grouped.php | 12 ++-- .../Mage/Sales/Block/Widget/Guest/Form.php | 9 ++- app/code/core/Mage/Sales/Exception.php | 12 ++-- app/code/core/Mage/Sales/Helper/Data.php | 12 ++-- app/code/core/Mage/Sales/Helper/Guest.php | 10 +-- .../Model/Entity/Order/Address/Collection.php | 1 - .../Model/Entity/Order/Status/History.php | 10 ++- .../Order/Status/History/Collection.php | 1 - .../Quote/Address/Attribute/Frontend.php | 11 +++- .../Address/Attribute/Frontend/Discount.php | 11 +++- .../Address/Attribute/Frontend/Grand.php | 11 +++- .../Sales/Model/Entity/Sale/Collection.php | 1 - .../Model/Mysql4/Order/Status/History.php | 12 ++-- .../Quote/Address/Attribute/Frontend.php | 12 ++-- .../Address/Attribute/Frontend/Discount.php | 12 ++-- .../Address/Attribute/Frontend/Grand.php | 12 ++-- .../Mage/Sales/Model/Order/Creditmemo/Api.php | 1 - .../Model/Order/Creditmemo/Total/Discount.php | 11 +++- .../Model/Order/Creditmemo/Total/Grand.php | 11 +++- .../Model/Order/Invoice/Total/Discount.php | 11 +++- .../Sales/Model/Order/Invoice/Total/Grand.php | 11 +++- .../Order/Pdf/Items/Creditmemo/Default.php | 6 +- .../Order/Pdf/Items/Creditmemo/Grouped.php | 9 +-- .../Model/Order/Pdf/Items/Invoice/Default.php | 6 +- .../Model/Order/Pdf/Items/Invoice/Grouped.php | 9 +-- .../Order/Pdf/Items/Shipment/Default.php | 6 +- .../Sales/Model/Order/Pdf/Total/Default.php | 7 ++- .../Mage/Sales/Model/Order/Status/History.php | 14 ++--- .../Model/Quote/Address/Total/Discount.php | 10 ++- .../Sales/Model/Quote/Address/Total/Grand.php | 12 ++-- .../Total/Nominal/Recurring/Initial.php | 10 ++- .../Model/Resource/Order/Status/History.php | 15 ++--- .../Quote/Address/Attribute/Frontend.php | 12 ++-- .../Address/Attribute/Frontend/Discount.php | 12 ++-- .../Address/Attribute/Frontend/Grand.php | 12 ++-- .../Sales/Model/Resource/Sale/Collection.php | 1 - .../Sales/controllers/DownloadController.php | 8 +-- .../Sales/controllers/GuestController.php | 11 ++-- .../data/sales_setup/data-install-1.6.0.0.php | 6 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 6 +- app/code/core/Mage/SalesRule/Exception.php | 12 ++-- app/code/core/Mage/SalesRule/Helper/Data.php | 10 +-- .../Mage/SalesRule/Model/Quote/Discount.php | 12 ++-- .../SalesRule/Model/Quote/Freeshipping.php | 10 ++- .../Model/Quote/Nominal/Discount.php | 10 ++- .../Model/Rule/Condition/Product/Found.php | 10 ++- .../System/Config/Source/Coupon/Format.php | 12 ++-- app/code/core/Mage/Sendfriend/Helper/Data.php | 12 ++-- app/code/core/Mage/Shipping/Exception.php | 12 ++-- app/code/core/Mage/Shipping/Helper/Data.php | 10 +-- .../Mage/Shipping/Model/Carrier/Flatrate.php | 9 ++- .../Shipping/Model/Carrier/Freeshipping.php | 9 ++- app/code/core/Mage/Shipping/Model/Info.php | 10 ++- .../Shipping/Model/Rate/Result/Abstract.php | 1 - .../Mage/Shipping/Model/Rate/Result/Error.php | 10 ++- .../Shipping/Model/Source/HandlingAction.php | 12 +++- .../Shipping/Model/Source/HandlingType.php | 12 +++- .../Shipping/Model/Tracking/Result/Error.php | 11 +++- app/code/core/Mage/Sitemap/Helper/Data.php | 14 ++--- app/code/core/Mage/Tag/Helper/Data.php | 10 +-- .../Mage/Tag/controllers/IndexController.php | 9 ++- .../core/Mage/Tax/Block/Checkout/Discount.php | 11 ++-- .../Mage/Tax/Block/Checkout/Grandtotal.php | 11 ++-- app/code/core/Mage/Tax/Exception.php | 12 ++-- app/code/core/Mage/Tax/Helper/Data.php | 10 +-- .../Mage/Tax/Model/Config/Price/Include.php | 12 +++- .../Mage/Tax/Model/Sales/Pdf/Grandtotal.php | 11 +++- .../Tax/Model/Sales/Total/Quote/Discount.php | 10 ++- .../data/tax_setup/data-install-1.6.0.0.php | 8 ++- app/code/core/Mage/Uploader/Helper/Data.php | 13 ++-- app/code/core/Mage/Uploader/Helper/File.php | 16 ++--- app/code/core/Mage/Usa/Helper/Data.php | 10 +-- .../Usa/Model/Shipping/Carrier/Abstract.php | 1 - .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 9 ++- .../Dhl/International/Source/Method/Doc.php | 6 +- .../International/Source/Method/Freedoc.php | 6 +- .../Source/Method/Freenondoc.php | 6 +- .../Carrier/Dhl/Source/Dutypaymenttype.php | 11 +++- .../Carrier/Dhl/Source/Freemethod.php | 11 +++- .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 7 +-- .../Shipping/Carrier/Fedex/Source/Dropoff.php | 6 +- .../Carrier/Fedex/Source/Freemethod.php | 6 +- .../Carrier/Ups/Backend/Freemethod.php | 7 +-- .../Shipping/Carrier/Ups/Source/DestType.php | 11 +++- .../Carrier/Ups/Source/Freemethod.php | 11 +++- .../Carrier/Usps/Source/Freemethod.php | 11 +++- app/code/core/Mage/Weee/Helper/Data.php | 15 ++--- .../Mage/Weee/Model/Config/Source/Display.php | 13 ++-- .../Widget/Block/Adminhtml/Widget/Form.php | 7 +-- .../Block/Adminhtml/Widget/Instance/Edit.php | 16 ++--- .../Adminhtml/Widget/Instance/Edit/Form.php | 12 ++-- .../Block/Adminhtml/Widget/Instance/Grid.php | 12 ++-- app/code/core/Mage/Widget/Helper/Data.php | 8 +-- .../Mage/Widget/Model/Template/Filter.php | 12 ++-- .../core/Mage/Widget/Model/Widget/Config.php | 1 - .../Customer/Wishlist/Item/Column/Image.php | 12 ++-- app/code/core/Mage/Wishlist/Helper/Data.php | 8 +-- .../Wishlist/controllers/IndexController.php | 12 ++-- 1016 files changed, 3544 insertions(+), 3557 deletions(-) diff --git a/app/code/core/Mage/Admin/Helper/Rules/Fallback.php b/app/code/core/Mage/Admin/Helper/Rules/Fallback.php index c7133e1588c..3be93f305fb 100644 --- a/app/code/core/Mage/Admin/Helper/Rules/Fallback.php +++ b/app/code/core/Mage/Admin/Helper/Rules/Fallback.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php index ca126aa088c..3e374160145 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php index 64825c5af2f..9f3a844f21f 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php index 15d46da7bef..9c2585b755f 100644 --- a/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php index 4749be7169b..f2c581a8c8d 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php @@ -15,12 +15,11 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index 7eade78b071..f1f35fc2e28 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_AdminNotification + * @category Mage + * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_AdminNotification - * @author Magento Core Team + * @author Magento Core Team */ class Mage_AdminNotification_Model_Feed extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index c0c156c5aaf..129bb067a73 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_AdminNotification + * @category Mage + * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * AdminNotification Inbox model * - * @category Mage - * @package Mage_AdminNotification - * @author Magento Core Team + * @category Mage + * @package Mage_AdminNotification + * @author Magento Core Team * * @method Mage_AdminNotification_Model_Resource_Inbox _getResource() * @method Mage_AdminNotification_Model_Resource_Inbox getResource() diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php index fd13675956d..085f65e8b45 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_AdminNotification + * @category Mage + * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * AdminNotification Inbox model * - * @category Mage - * @package Mage_AdminNotification - * @author Magento Core Team + * @category Mage + * @package Mage_AdminNotification + * @author Magento Core Team * @deprecated */ class Mage_AdminNotification_Model_Mysql4_Inbox extends Mage_AdminNotification_Model_Resource_Inbox diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php index d5f03d456c3..0f7404f7235 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_AdminNotification + * @category Mage + * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * AdminNotification Inbox model * - * @category Mage - * @package Mage_AdminNotification - * @author Magento Core Team + * @category Mage + * @package Mage_AdminNotification + * @author Magento Core Team */ class Mage_AdminNotification_Model_Resource_Inbox extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php index ea900da470a..69678c2d8ea 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php @@ -12,22 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_AdminNotification + * @category Mage + * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * AdminNotification install - * - * @category Mage - * @package Mage_AdminNotification - * @author Magento Core Team - */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** * Create table 'adminnotification/inbox' diff --git a/app/code/core/Mage/Adminhtml/Block/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Abstract.php index 422dd57303e..e9c0fb11357 100644 --- a/app/code/core/Mage/Adminhtml/Block/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Abstract.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Abstract extends Mage_Core_Block_Template { - /** * @return string */ @@ -35,5 +34,4 @@ protected function _getUrlModelClass() { return 'adminhtml/url'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index 384db6ef6b1..3fcc7646469 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -15,10 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs { +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ +class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs +{ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php index d7f742f54b9..9bd6b2d2b0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php @@ -15,10 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs { +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ +class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs +{ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php index f3633f888bd..d191ef27887 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Api_User_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'user_id'; @@ -51,5 +50,4 @@ public function getHeaderText() return Mage::helper('adminhtml')->__('New User'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php index f3d59619a76..e737ffdf5a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Api_User_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']); @@ -35,5 +34,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php index 68102d93758..95607f9db3f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Api_User_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -96,5 +95,4 @@ public function getGridUrl() //$uid = $this->getRequest()->getParam('user_id'); return $this->getUrl('*/*/roleGrid', []); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php index 92a89b40d7b..ef2b2331057 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php index 9e85319f5b5..b7d83e50964 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid { - protected function _construct() { $this->setSaveParametersInSession(true); diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 508e5b0f922..1ba7fa42779 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Cache_Grid extends Mage_Adminhtml_Block_Widget_Grid { protected $_invalidatedTypes = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php index 7b8a07e24f0..b21ebf097d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index b1d7c0aa089..e3f07978add 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php index e5d66e9c9c1..920c6f199f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php index c3439394945..25df86d298f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php index c48a16b453f..cf414ffa7af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php @@ -15,7 +15,13 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form { @@ -48,5 +54,4 @@ public function _prepareLayout() $this->setForm($form); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index 8928c761b5c..6c39e95141c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Catalog_Category_Tab_General extends Mage_Adminhtml_Block_Catalog_Form { - protected $_category; public function __construct() @@ -117,6 +116,5 @@ protected function _getParentCategoryOptions($node=null, &$options= []) } return $options; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php index 95fb0be186c..df690565fd0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php index 9b4ddcf6ffa..4ec0a1c1bb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ class Mage_Adminhtml_Block_Catalog_Form_Renderer_Config_DateFieldsOrder extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $_options = [ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php index 91cf729c9f8..5ee04785134 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php index ee8ba65d7a6..359a8e4ce7b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'catalog_product_attribute'; @@ -35,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('catalog')->__('Add New Attribute'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php index c66c22bd86f..a761bced887 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'attribute_id'; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php index d5aaa6e0dcc..4e8c17534b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']); @@ -36,5 +34,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index f98c8e725a0..22bb21aeb8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Front extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php index c2b4dbe25d6..3927b7a80e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index 47040be1fbc..8c81934cc69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -15,12 +15,10 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team @@ -78,5 +76,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getAttributeSetId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php index 80cf0fc7ecd..fa2e899f4dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index 7fd62eee212..bda15649358 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php index 7b57ee0baaa..2883c9402a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formset extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php index 4a703ee28d5..e6e581fd6f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Tree_Group extends Mage_Adminhtml_Block_Template { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php index 20f30ff0ea8..648b5d51292 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main_Filter extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php index c8879de9e47..6c1a9c44738 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php index 030c2c29852..7a1f742237b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php index 14d04fd9913..551da87631b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php index 69ce61b7b10..bf1e2c5ee0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 5d9733df2b3..053c66aa65e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -58,5 +58,4 @@ public function getPriceTypeSelectHtml() } return $this->getChildHtml('option_price_type'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php index 5f44a371a31..240459960eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Date extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract { @@ -34,5 +33,4 @@ public function __construct() parent::__construct(); $this->setTemplate('catalog/product/edit/options/type/date.phtml'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php index b61f709433d..f53ffd3ff9b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_File extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php index 433a873fe02..07d1d229c77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,5 +95,4 @@ protected function _prepareLayout() public function getIsPercent() { return $this->getData('is_percent') ? $this->getData('is_percent') : 0; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 74922959a6b..14e4608f669 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +36,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Ma */ protected $_configAttributeCodes = null; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index a1851e523bc..e3a80b54985 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php index 2642546a2ea..875eb064d39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php index 79392182c55..1c304dc0273 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index 5aff52c5eda..646d364e964 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -61,5 +61,4 @@ public function setReadonly($readonly, $useDisabled = false) $this->setData('disabled', $useDisabled); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index 67064081d8d..b0cb0f93fbd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Gallery extends Varien_Data_Form_Element_Abstract { - public function getElementHtml() { //$html.= $this->getAfterElementHtml(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index 00763de5101..bf646e3995c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -186,5 +186,4 @@ public function getImageTypesJson() { return Mage::helper('core')->jsonEncode($this->getImageTypes()); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php index ca317d275b1..2a009af145e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php index b3dbdaef3d0..246d9892f72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php index b589d123e46..b09081eee1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Search_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'id'; @@ -49,5 +47,4 @@ public function getHeaderText() return Mage::helper('catalog')->__('New Search'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index ab3c189e973..986446dd20b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Search_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php index 7ea089cf56f..7f04fbbe101 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php @@ -15,12 +15,10 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @category Mage * @package Mage_Adminhtml diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php index 7173be0c776..29a661a6508 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,13 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Checkout_Agreement_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Init class - * - */ public function __construct() { $this->_objectId = 'id'; @@ -44,8 +39,6 @@ public function __construct() } /** - * Get Header text - * * @return string */ public function getHeaderText() diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index 41bd465c68f..735bdcaffc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Checkout_Agreement_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index 537e699ffc6..52c8224ae23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -15,12 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Adminhtml_Block_Checkout_Agreement_Grid * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method Mage_Checkout_Model_Resource_Agreement_Collection getCollection() */ class Mage_Adminhtml_Block_Checkout_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php index 5aa85c48e9c..283bc0ff9f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php @@ -15,11 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Adminhtml_Block_Checkout_Formkey + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Checkout_Formkey extends Mage_Adminhtml_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php index 52dc66cc42a..36241e8619a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php @@ -34,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('cms')->__('Add New Block'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 4ffcc307458..6b741b9b884 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -72,5 +72,4 @@ public function getHeaderText() return Mage::helper('cms')->__('New Block'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index ac63d8ac404..feabde483d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Cms_Block_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Init form */ @@ -134,5 +133,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index de01a227880..9d641e2cd1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -131,5 +131,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['block_id' => $row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index f6c8db350f3..e96dff5aaae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php index 36d0cafbe0a..114836cb255 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Cms_Page_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']); @@ -35,5 +34,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php index 7550bfe1830..ebaf0ec30d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php @@ -15,7 +15,13 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design extends Mage_Adminhtml_Block_Widget_Form diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index eb041c30ad4..8a3985d4491 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php index 056b895057f..85683763293 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer.php b/app/code/core/Mage/Adminhtml/Block/Customer.php index 3f1524fa874..a057ac795b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer.php @@ -34,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('customer')->__('Add New Customer'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php index 9992ecc9343..46c11a813a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php index 0479bce8080..8122922741b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,9 +26,13 @@ * @author Magento Core Team */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Customer_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form([ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php index ece9a8ddb7e..07f0e7fcd18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php index b6995305e6d..aa6d73ef562 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -116,5 +115,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php index 5f3eeeb28fd..4371777b10a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { $actions = []; @@ -63,5 +62,4 @@ protected function _actionsToHtml(array $actions) } return implode(' | ', $html); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index 7948dab2d1d..818e32e18c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +27,8 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_Wishlist_Grid_Renderer_Description extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { return nl2br(htmlspecialchars($row->getData($this->getColumn()->getIndex()))); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php index 6d357bfed2a..a821978c599 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php index f4a0a348d2a..50ec6de44fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Adminhtml_Block_Customer_Form_Element_Image extends Mage_Adminhtml_Bl { /** * Return Delete CheckBox Label - * * @return string */ protected function _getDeleteCheckboxLabel() @@ -39,7 +38,6 @@ protected function _getDeleteCheckboxLabel() /** * Return Delete CheckBox SPAN Class name - * * @return string */ protected function _getDeleteCheckboxSpanClass() @@ -49,7 +47,6 @@ protected function _getDeleteCheckboxSpanClass() /** * Return File preview link HTML - * * @return string */ protected function _getPreviewHtml() @@ -82,7 +79,6 @@ protected function _getPreviewHtml() /** * Return Image URL - * * @return string */ protected function _getPreviewUrl() diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php index 54491e260d9..885633c3d42 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php index a39387fc1d0..d3f2362e353 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php @@ -27,12 +27,10 @@ */ class Mage_Adminhtml_Block_Customer_Grid_Filter_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected function _getOptions() { $options = Mage::getResourceModel('directory/country_collection')->load()->toOptionArray(); array_unshift($options, ['value'=>'', 'label'=>Mage::helper('customer')->__('All countries')]); return $options; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php index c4f9f9c96d4..004cbd872b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Group extends Mage_Adminhtml_Block_Widget_Grid_Container//Mage_Adminhtml_Block_Template { - /** * Modify header & button labels * diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php index 9e0f0d85f36..c211da00efe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Group_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php index 1777394d8b9..831008b5387 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index f899875514c..2e6f9c0b500 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Group_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -80,5 +79,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php index 4a971ffc29b..400c7bdbfc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Customer_Online_Filter extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index 7b7ad0e021a..1d8f247ac6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php index 4db67b36614..9ae19869a08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Diagrams extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 367e733b07d..bd8b2021681 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Graph extends Mage_Adminhtml_Block_Dashboard_Abstract { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php index 32c58ade1e6..8ece2f14920 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,15 +25,12 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** * Setting default for every grid on dashboard * */ - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php index 8f2f60a5090..847cd6521b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Grids extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index 40d2eefe242..89b57ef2fc7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Orders_Grid extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Denied.php b/app/code/core/Mage/Adminhtml/Block/Denied.php index 64d6a1238a9..44454a428a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Denied.php +++ b/app/code/core/Mage/Adminhtml/Block/Denied.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Denied extends Mage_Adminhtml_Block_Template { public function hasAvailaleResources() diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php index a2c7cdb090c..1420735c95b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Adminhtml_Block_Html_Date extends Mage_Core_Block_Html_Date { - /** * @return string */ @@ -35,5 +34,4 @@ protected function _getUrlModelClass() { return 'adminhtml/url'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index 18512bcedbf..d33f30a03ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php index a529bb60040..36acde9abcf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index 3f2c3f431ce..ee185dce373 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Newsletter_Queue_Edit extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php index 707a481129a..a2b8c2b01bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Newsletter_Queue_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php index 575c4d0d0cd..bc09f4692d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Queue_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -119,6 +118,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php index 57d0df9198d..55d3af6b2dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Queue_Preview_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Preparing from for revision page * diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index 0d8e1d86ec1..3051e3fc2b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,8 +28,6 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid extends Mage_Adminhtml_Block_Widget_Grid { /** - * Constructor - * * Set main configuration of grid */ public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index 15f4a3a5128..af9e989ff18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php index fe8c346c190..79825e38fa2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 1f5dac9a823..37fbe16b4c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -110,6 +110,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php index a668a742b22..bbb527cd361 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Template_Preview_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Preparing from for revision page * diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 39c8c57f9d3..4692caa2a98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php index 6b0a0c9b659..3e90b751307 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Notification_Inbox extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 14564a14338..26a3b1c578e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index 457de2534ec..ad06fbb5f40 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Header.php b/app/code/core/Mage/Adminhtml/Block/Page/Header.php index 772c4daed20..f5a387f3cd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Header.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,5 +57,4 @@ public function displayNoscriptNotice() { return Mage::getStoreConfig('web/browser_capabilities/javascript'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php index 82e12093cdc..9ce612ff214 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php index ad9f75d2200..09f0e03d0ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * @return Mage_Adminhtml_Block_Widget_Form * @throws Exception diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php index 2a72aa39e0a..268f02522b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php index 22d8b336e06..a7faae9f543 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Permissions_Editroles extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php index 158ab6713e6..0f296be1ab2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php @@ -15,10 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Adminhtml_Block_Permissions_Edituser extends Mage_Adminhtml_Block_Widget_Tabs { +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ +class Mage_Adminhtml_Block_Permissions_Edituser extends Mage_Adminhtml_Block_Widget_Tabs +{ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php index 068a3559147..6af36b10722 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_User_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'user_id'; @@ -51,5 +50,4 @@ public function getHeaderText() return Mage::helper('adminhtml')->__('New User'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php index 4319c6def58..6de39f67e05 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_User_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']); @@ -35,5 +34,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php index 4b80fe384a6..86e1df76ab2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_User_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -96,5 +95,4 @@ public function getGridUrl() //$uid = $this->getRequest()->getParam('user_id'); return $this->getUrl('*/*/roleGrid', []); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php index 52db832ff34..bcf9cc56e50 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php index 170d17e5842..3e88055d5b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php index 8338a60ccef..e179eb6073f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Variable_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php index be3d2a5e31c..a55295f6d48 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Answer_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { parent::__construct(); @@ -51,5 +49,4 @@ public function getHeaderText() { return Mage::helper('poll')->__("Edit Answer '%s'", $this->escapeHtml(Mage::registry('answer_data')->getAnswerTitle())); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php index 56c07fc28ab..1d02bf32b1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Answer_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php index 5c9031d72c6..9ce540a7120 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php index 0d487f2e41d..741c90dc7cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,17 +25,15 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() { $form = new Varien_Data_Form([ - 'id' => 'edit_form', - 'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]), - 'method' => 'post', - ] - ); + 'id' => 'edit_form', + 'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]), + 'method' => 'post', + ]); $form->setUseContainer(true); $this->setForm($form); diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php index 82a14b516b5..4df32b1e65c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php index 4d17a409d50..e52f9e19a04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -96,5 +95,4 @@ public function getGridUrl() { return $this->getUrl('*/poll_answer/grid', ['id' => $this->getRequest()->getParam('id')]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php index 7126a327f3b..9d0855ebbda 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Edit_Tab_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php index a6a78ba6ba6..457aa6a5f68 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php @@ -15,12 +15,10 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php index 02fc497faca..e8a56966842 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php @@ -15,13 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog rule edit form block + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Block_Promo_Catalog_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { /** @@ -65,5 +68,4 @@ public function getHeaderText() return Mage::helper('catalogrule')->__('New Rule'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php index 7d0bcc4576d..fbcb692bf5a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php @@ -15,20 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * description * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Catalog_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); @@ -43,5 +41,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php index 95d2290a0f0..44c307287e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -134,5 +134,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id' => $row->getRuleId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php index b7f766193f3..a5996fca248 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php @@ -15,16 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart rule edit form block + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Block_Promo_Quote_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** * Initialize form * Add standard buttons diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php index c820425265b..32b8905a22e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php @@ -15,20 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * description * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Quote_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); @@ -43,5 +41,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php index e6f977bab26..3bc24d08027 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php index 0c7228a0e52..05c378c8a46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tab_Coupons_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php index 5c993c4d96a..9123c5d59f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php @@ -49,5 +49,4 @@ public function render(Varien_Data_Form_Element_Abstract $element) return $html; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php index 93018959805..4798ec045ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php index 7aec1d976aa..b9c12220edf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php @@ -15,12 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Date range promo widget chooser * Currently works without localized format + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Widget_Chooser_Daterange extends Mage_Adminhtml_Block_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index 300b1c86c92..723ce425ea5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Rating_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php index 667e55e5cc7..bc69143628b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,17 +25,15 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Rating_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() { $form = new Varien_Data_Form([ - 'id' => 'edit_form', - 'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]), - 'method' => 'post', - ] - ); + 'id' => 'edit_form', + 'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]), + 'method' => 'post', + ]); $form->setUseContainer(true); $this->setForm($form); diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php index b2a08ed0255..096d1a72579 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Rating_Edit_Tab_Form extends Mage_Adminhtml_Block_Widget_Form { /** @@ -146,5 +145,4 @@ protected function _getWarningHtml() '; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index c554945b7d2..c7fedc6d012 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Rating_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -79,5 +78,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id' => $row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index f7df2c90110..39bc7e3e224 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Customer_Accounts_Grid extends Mage_Adminhtml_Block_Report_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php index 21faf943230..93731d62d51 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Customer_Orders_Grid extends Mage_Adminhtml_Block_Report_Grid { - public function __construct() { parent::__construct(); @@ -88,5 +87,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php index 40a01e1ebe0..1582afa569e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Customer_Totals_Grid extends Mage_Adminhtml_Block_Report_Grid { - public function __construct() { parent::__construct(); @@ -91,5 +90,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php index b656fa6ba88..d8eaff58ca5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index 6a12ae55c2c..42e29250040 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php index 8fb04e8c765..de5a6b8f48d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Product_Downloads extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php index ff27f03ea8a..effc610bf83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index 991dc65d65a..2e2f4a3e065 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -123,6 +123,5 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php index 38718384eae..2372a5a78a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,8 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Product_Lowstock_Grid extends Mage_Adminhtml_Block_Widget_Grid { -// protected $_saveParametersInSession = true; - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index c8ee4a3eaeb..6384be0625e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ */ class Mage_Adminhtml_Block_Report_Product_Ordered_Grid extends Mage_Adminhtml_Block_Report_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php index 26c07d1e07c..631ed5bf407 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php index 05087165230..c5744f0179c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php index ae98c385b5c..63b6e0699cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php index 23f4b18aa19..b01bc934e03 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Review_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php index bb8ce9526d7..a5de45c03b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Review_Detail extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php index f05d2ba75b9..792fbcfc936 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php index dad20b7f664..b91c9ac46d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Review_Product_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php index 671d8eaf293..9dbb8e00fe1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php index 9bce7adb310..6d4b1712da4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php index 67506b0f9bb..a0875db6e42 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Date { diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php index 90ac5f16bf0..78c1866eac9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php index b114fba0c72..acf84a4e208 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php index 8e890a77894..390dc210af2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php index f73a44ea9c6..e0b3e6f9d11 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php index 1e9b99aec1d..e2b2cfcc4c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php index bbc621545cd..159cac2d539 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php index 5406aa555d7..ff98cbb5be5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Shopcart_Abandoned_Grid extends Mage_Adminhtml_Block_Report_Grid_Shopcart { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index f7c7c79d392..17ae1026e53 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php index aeca0eff8f5..64dcb99a3ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Shopcart_Product_Grid extends Mage_Adminhtml_Block_Report_Grid_Shopcart { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php index b8ad5f6eb8e..49dd5085260 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Tag_Customer_Detail extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php index cfefd0ea60e..a31192dda93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Customer_Detail_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php index c851e0017a4..96f8a13fc98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -107,6 +106,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/customerDetail', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php index 21da940d03b..6319ec4ea5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Tag_Popular_Detail extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php index 4b4d6680316..9de3049d6ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Popular_Detail_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -91,5 +90,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php index a66f2da8f81..7c558b593fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Popular_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -101,5 +100,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/tagDetail', ['id'=>$row->getTagId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php index 10e2a0aa346..f401a9e4c96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Tag_Product_Detail extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php index e52dc89d5be..65f3f910b15 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Product_Detail_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -82,6 +81,5 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php index 8152bfec691..add3692e87c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Tag_Product_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -110,5 +109,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/productDetail', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php index 6f4250d894d..6a99c2ce6eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Report_Wishlist_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -102,6 +101,5 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index ed220eaa225..da5b8bd7cf6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Add_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php index 5ba5353c120..978b89fbdea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index 3615a5a35f2..4b94571d8e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 60b11aa2a8a..7dac93b6d4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Review_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index e4fa0a06533..31aff54ddd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index a9b13ed9c24..ed025082c29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Rating_Detailed extends Mage_Adminhtml_Block_Template { protected $_voteCollection = false; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php index b01548ba42e..629283cbf55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Creditmemo extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'sales_creditmemo'; @@ -35,5 +34,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php index 9797bc3eb11..c25fb016e9e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php @@ -15,17 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales orders grid * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Creditmemo_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -153,5 +154,4 @@ public function getGridUrl() { return $this->getUrl('*/*/*', ['_current' => true]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php index af54997384c..456a22221f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php @@ -15,17 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales orders grid * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Invoice_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -155,5 +156,4 @@ public function getGridUrl() { return $this->getUrl('*/*/grid', ['_current' => true]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index 5b75ccf6364..2aed9d43943 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -605,5 +605,4 @@ public function isShipmentRegular() } return true; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php index 478f154abb4..2fe1476d1c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,5 +81,4 @@ public function getSku() }*/ return $this->getItem()->getSku(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php index e3a9e31e946..abf070f909d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php index 4f3995134e2..2f6ff3288e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Items_Renderer_Configurable extends Mage_Adminhtml_Block_Sales_Items_Abstract { - public function getItem() { return $this->_getData('item');//->getOrderItem(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php index 228d4226b1c..1faf3f6d08f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php index c63c86bb3f9..b860eef6c0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index a62c96c499f..428c9b9c870 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -97,5 +97,4 @@ public function hasSsCardType() } return false; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php index 13aede405c6..fc25ada0573 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Coupons extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php index 411a8f68ab8..be1ca7cb548 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Coupons_Form extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - public function __construct() { parent::__construct(); @@ -39,5 +37,4 @@ public function getCouponCode() { return $this->getParentBlock()->getQuote()->getCouponCode(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php index 70464cd5e4f..5f02ac93da5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Customer extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - public function __construct() { parent::__construct(); @@ -48,5 +47,4 @@ public function getButtonsHtml() ]; return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php index 03fbf07f97e..7c49aa40355 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php @@ -15,17 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales order create block * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Create_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -119,5 +120,4 @@ public function getGridUrl() { return $this->getUrl('*/*/loadBlock', ['block'=>'customer_grid']); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index 0e4db660a15..4e3ed022f46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -82,5 +82,4 @@ public function getCurrentCurrencyCode() { return $this->getStore()->getCurrentCurrencyCode(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php index 6daa3f032aa..16d146a1012 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Form extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index d08a97127a5..098446e7c33 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 2f723a92078..1e6e731b7fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php index e2f60529dff..a64eb945756 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php @@ -15,13 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Create order form header * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Create_Header extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index 2ee2bf84a7d..508490318df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php index 1d9d82da7ba..77de4b2bcac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,14 +25,11 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Newsletter_Form extends Mage_Adminhtml_Block_Widget { - public function __construct() { parent::__construct(); $this->setId('sales_order_create_newsletter_form'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index c6d7b59ffac..3e7066c3185 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index 3e10900ab26..57bdd28ca32 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -15,17 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales create order product search grid giftmessage column renderer * - * @deprecated after 1.4.2.0 - gift column has been removed from search grid - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * @deprecated after 1.4.2.0 - gift column has been removed from search grid */ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Giftmessage extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Checkbox diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php index 46ea8c0c35f..c1f6abcdb87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php index d61a451b79e..7c1da4ba4a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php @@ -177,5 +177,4 @@ public function canDisplayPrice() { return true; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php index 19ad3c36e4c..819e07e2dcb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Compared extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { - protected function _construct() { parent::_construct(); @@ -70,5 +69,4 @@ public function getItemId($item) { return $item->getCatalogCompareItemId(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php index 608718fa663..3dc90d32f1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php @@ -15,13 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default extends Mage_Adminhtml_Block_Sales_Order_Create_Totals { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php index 3ddb7de875d..24a6b58978d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php @@ -15,15 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Subtotal Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Discount extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { //protected $_template = 'tax/checkout/subtotal.phtml'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php index 0ae3963444d..e004d169eea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php @@ -15,15 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Subtotal Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Grandtotal extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { protected $_template = 'sales/order/create/totals/grandtotal.phtml'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php index 4910bd26cc1..c9bf774eb4b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Form extends Mage_Adminhtml_Block_Sales_Order_Abstract { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php index a41d73ceb0a..8f4717a4b1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index a5485b9f7c7..4dfc0573a1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -212,5 +211,4 @@ public function getGridUrl() { return $this->getUrl('*/*/grid', ['_current'=>true]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php index 1a8fa7dbb48..644c04ddedd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php index b93b9ff18c3..add9cb70db8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index 2f6577fabe9..4dbedffb7b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Form extends Mage_Adminhtml_Block_Sales_Order_Abstract { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php index 8e5020fa6de..f10cb6559b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Shipment_Packaging_Grid extends Mage_Adminhtml_Block_Template { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php index e6ff7c01413..fbd5c3de1fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php index 20340f41159..2ca18466bd1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php index d2f2dbd621c..bd7ba8b771b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php @@ -15,11 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Assign order status to order state form + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Status_Assign_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php index 7cdc0304b37..bea9a89317a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Sales_Order_Status_Edit extends Mage_Adminhtml_Block_Sales_Order_Status_New { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php index df2c2a20af5..8be86d7d260 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php @@ -15,11 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Edit status form + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Status_Edit_Form extends Mage_Adminhtml_Block_Sales_Order_Status_New_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php index 34ef62c3885..19b9cb4d3a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Status_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php index 5b877e4bca5..d1b6eef686f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php @@ -15,11 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Create order status form + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Status_New_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php index 3db0788c50e..ed53db8f5b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_View_Form extends Mage_Adminhtml_Block_Template { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index ac1ef1c27c3..f95f4d59c82 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index 7bd53016c2e..fd5ba8103ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index ff31aa41a18..b7e7994c91e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 9fea4754f26..5423f939e81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +23,7 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_View_Items_Renderer_Default extends Mage_Adminhtml_Block_Sales_Items_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index 8632a8e74f0..ec67490f2f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php index d7dd9509b5f..95a43a7c39d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php index 3fc122f8413..a18c4e6ff0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php @@ -15,17 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales orders grid * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Shipment_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** * Initialization */ @@ -178,5 +179,4 @@ public function getGridUrl() { return $this->getUrl('*/*/*', ['_current' => true]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php index 29eb49e848b..6c23d5243a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php index 2a78a4d3f70..b08a1556a7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php index 3ef4ea120e1..18870a0b70d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php index 3d801852a66..24444931120 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php index cb111e84a36..b888114072a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php index 18e97a66ce5..6076a8c6730 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sitemap_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** * Init container */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index beec4cb4305..00cd5b8a2be 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Sitemap_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Init form */ @@ -105,5 +104,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php index e03109527cb..aebc842c34f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +23,10 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -102,5 +102,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['sitemap_id' => $row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php index 748854b1978..a4c59e7e32b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,9 +35,6 @@ class Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset */ protected $_element; - /** - * Constructor - */ protected function _construct() { $this->setTemplate('store/switcher/form/renderer/fieldset.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php index c9d661dd670..827c5dac465 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +36,6 @@ class Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset_Element */ protected $_element; - /** - * Constructor - */ protected function _construct() { $this->setTemplate('store/switcher/form/renderer/fieldset/element.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php index 6fe1c5a3358..17959f24f11 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Account_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php index ba739eb66ac..e389dfbd2a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Account_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php index 620e1c8f763..8b29c098cde 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php index f565826eb83..10143724bf8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php index a6a2eacbd43..0ffddb7f6ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php index 8860d4ba188..0701821fb37 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index 00cc3744652..50798a97e38 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Config_Form extends Mage_Adminhtml_Block_Widget_Form { - const SCOPE_DEFAULT = 'default'; const SCOPE_WEBSITES = 'websites'; const SCOPE_STORES = 'stores'; @@ -730,5 +729,4 @@ public function getStoreCode() { return $this->getRequest()->getParam('store', ''); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index 19b464ad99e..75449b81f10 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Field extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { - /** * @param Varien_Data_Form_Element_Abstract $element * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index d044b381739..2e12e47b706 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 09f1417dc47..900b9ade244 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php index 3c6cff06a8c..a2c41ffb368 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php index 22e97f31f4c..1162b32ac73 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php @@ -15,13 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Renderer for sub-heading in fieldset * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_System_Config_Form_Field_Heading extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php index 4d295a59369..34c3738a56e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +27,8 @@ */ class Mage_Adminhtml_Block_System_Config_Form_Field_Image extends Varien_Data_Form_Element_Image { - /** * Get image preview url - * * @return string */ protected function _getUrl() @@ -47,5 +45,4 @@ protected function _getUrl() return $url; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php index 261f1323f76..2583e92a404 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Config_Form_Field_Import extends Varien_Data_Form_Element_Abstract { - /** * @param array $data */ @@ -63,5 +62,4 @@ function checkConditionName(event) return $html; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php index 4f50938f1d5..c62c49e39e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific extends Varien_Data_Form_Element_Select { - public function getAfterElementHtml() { $javaScript = " @@ -52,5 +51,4 @@ protected function _getSpecificCountryElementId() { return substr($this->getId(), 0, strrpos($this->getId(), 'allowspecific')) . 'specificcountry'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php index 1ef8b9499cc..ae0ab0413b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,5 +36,4 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) } return parent::_getElementHtml($element); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php index 0e8a1196806..7cadf34258d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,5 +41,4 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { } return parent::_getElementHtml($element); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php index 41f886c9c06..668f75ae9e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Fieldset extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { - /** * Render fieldset html * diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php index 2f0dda1839f..da23e76c8d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_System_Config_Form_Fieldset_Modules_DisableOutput extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php index d5a761f8106..d9eab8b1d9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Convert_Gui extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php index e8d57eee272..3517a682648 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php index cb4e3e946bb..10c509579d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Convert_Gui_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php index e24dfd33573..178db5b0b57 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Convert_Gui_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -114,6 +113,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php index 3609983e63f..d30e613c2a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php index 78d02f9c29d..4bdbc9cb7a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Convert_Profile_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php index 9e113c820b3..9acc23570bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php index fe3380f7ce3..b66482420ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php index 6ce1f53a638..b88ab0d318c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Convert_Profile_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -91,6 +90,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php index 2d04a4a8d4c..b27e6344945 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php @@ -103,5 +103,4 @@ protected function getImportFormAction() { return $this->getUrl('*/*/fetchRates'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php index 059a3dda8a0..3a576516299 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php index 539aff2cd3f..158fe1df304 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_System_Design extends Mage_Adminhtml_Block_Template { protected function _prepareLayout() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php index e18e08a98cc..608e87884dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_System_Design_Edit extends Mage_Adminhtml_Block_Widget { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php index dfef61e9872..d62f4533cde 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php @@ -15,11 +15,10 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Design_Edit_Tab_General extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php index e303bafe7aa..9281183db94 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Design_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** * Class constructor */ @@ -117,5 +116,4 @@ public function getGridUrl() { return $this->getUrl('*/*/grid', ['_current' => true]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php index d0094bc92b0..253939c8a1a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Email_Template_Edit extends Mage_Adminhtml_Block_Widget { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php index 280f5515c5c..e3746d9b4c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Email_Template_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php index fa2c2bdfe56..37f3dc5fbb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Email_Template_Grid extends Mage_Adminhtml_Block_Widget_Grid { - protected function _construct() { $this->setEmptyText(Mage::helper('adminhtml')->__('No Templates Found')); @@ -113,6 +112,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php index fcece3b54c6..e9696c86e89 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container { - /** * Class constructor * @@ -88,5 +87,4 @@ public function setBackUrl($url) $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')"); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php index 86eb9458f3a..447fad3c645 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Init form */ @@ -69,5 +68,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php index 91741b0082f..df13c084ca6 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Store_Delete_Group extends Mage_Adminhtml_Block_Template { protected function _prepareLayout() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index 99cbf0702cd..aa9a2d93ca8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,13 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Init class - * - */ public function __construct() { $backupAvailable = diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php index 1c4a96f49ed..d89e4d34682 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Store_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - /** * Class constructor * diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php index 61f0f179f63..2f39db3b1da 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ */ class Mage_Adminhtml_Block_System_Store_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -74,5 +73,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php index 85e7bc9c877..78c056b1b5c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,7 +26,6 @@ * @author Magento Core Team * @deprecated after 1.13.1.0 use Mage_Adminhtml_Block_System_Store_Tree */ - class Mage_Adminhtml_Block_System_Store_Grid_Render_Group extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php index 5cec0dabbc7..c75dfe94289 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,13 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Variable_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); @@ -40,8 +35,6 @@ protected function _construct() } /** - * Getter - * * @return Mage_Core_Model_Variable */ public function getVariable() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php index d56c1786ef6..1572bfb94ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -109,5 +109,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php index 776cbcef68a..6bbf274e822 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Variable_Grid extends Mage_Adminhtml_Block_Widget_Grid { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php index 3b805a6d444..2f9164844db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php index c118598b2bb..5e09fda7346 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Tag_Customer extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { parent::__construct(); @@ -56,5 +55,4 @@ public function __construct() $this->_headerText = Mage::helper('tag')->__("Customers Tagged '%s'", $this->escapeHtml($tagInfo->getName())); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 43845d2d932..94ab6628d79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ */ class Mage_Adminhtml_Block_Tag_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index c0f80f16a5a..10e187a17d0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php index 3f65402cc12..7913a729b1f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tag_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index 5c065623aaa..c0fc9ae1392 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php index e868413ba95..bfecdee8ddb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php @@ -15,21 +15,19 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Admin tag edit block * - * @deprecated after 1.3.2.3 * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * @deprecated after 1.3.2.3 */ - class Mage_Adminhtml_Block_Tag_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'tag_id'; @@ -97,5 +95,4 @@ public function getHeaderText() return Mage::helper('tag')->__('New Tag'); } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php index fb72b6e1e28..92a0acea0c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php @@ -15,18 +15,17 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml tag edit form * - * @deprecated after 1.3.2.3 * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * @deprecated after 1.3.2.3 */ - class Mage_Adminhtml_Block_Tag_Tag_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { public function __construct() @@ -83,5 +82,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index a38379eb4b4..2af52771175 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,9 +29,6 @@ */ class Mage_Adminhtml_Block_Tag_Tag_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php index dbe35b10988..346d3e9cc0f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tax_Class_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php index 0ae5abda22f..ae49619d698 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tax_Class_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php index 5e5e4b42bdf..0187fd88828 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Tax_Class_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -62,5 +61,4 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['id' => $row->getId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php index 5d05c32c54a..5bc43dcb054 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,9 +34,6 @@ class Mage_Adminhtml_Block_Tax_Rate_Form extends Mage_Adminhtml_Block_Widget_For */ protected $_titles = null; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php index 1535d4dce0d..59ca2c1292e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php @@ -15,11 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Tax_Rate_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -93,6 +98,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edit', ['rate' => $row->getTaxCalculationRateId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php index e94e0eef3d1..c6ed56dbf44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Tax_Rate_ImportExport extends Mage_Adminhtml_Block_Widget { public function __construct() @@ -25,5 +30,4 @@ public function __construct() parent::__construct(); $this->setTemplate('tax/importExport.phtml'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php index 3404c58aae2..0689f6022b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php index 718f5db4f73..6353c35f019 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,13 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tax_Rule_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Init class - * - */ public function __construct() { $this->_objectId = 'rule'; diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php index d82bba8be87..d554d94c33e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php index 2e288a7941a..86eb21fe25d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php @@ -15,12 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Adminhtml_Block_Tax_Rule_Grid * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method Mage_Tax_Model_Resource_Calculation_Rule_Collection getCollection() */ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php index 0f6b6892a76..d25996f7565 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index 8aa562dd90e..d9812caf76b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php index 28b5be940c0..527ae958057 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Urlrewrite_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -114,6 +113,5 @@ public function getRowUrl($row) return $this->getUrl('*/*/edit', ['id'=>$row->getId()]); //return $this->getUrl('*/*/view', array('id' => $row->getId())); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php index f2d7a947bfc..c8f664d0b79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php index 4fd2897f783..2a2f83311a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Template { - /** * So called "container controller" to specify group of blocks participating in some action * diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index aaf92fa0283..922857c9ef1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Widget_Form extends Mage_Adminhtml_Block_Widget { - /** * Form Object * @@ -251,5 +250,4 @@ protected function _getAdditionalElementHtml($element) { return ''; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php index 7e146071278..78cc0eefc0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php @@ -180,5 +180,4 @@ public function setDataObject($object) $this->getChild('form')->setDataObject($object); return $this->setData('data_object', $object); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php index 781e0cbafc4..bbaecdd0941 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php index 18fd7adbd2d..0389c13724e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php @@ -15,13 +15,17 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Form element dependencies mapper * Assumes that one element may depend on other element values. * Will toggle as "enabled" only if all elements it depends from toggle as true. + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Widget_Form_Element_Dependence extends Mage_Adminhtml_Block_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php index f5ab1eb1f17..b6b7da97aee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Widget_Form_Element_Gallery extends Mage_Adminhtml_Block_Template implements Varien_Data_Form_Element_Renderer_Interface { - protected $_element = null; public function __construct() @@ -86,6 +85,5 @@ public function getDeleteButtonHtml($image) { return str_replace('#image#', $image, $this->getChildHtml('delete_button')); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php index 39f8261c86b..4c223615bf7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php index e1de3c394f0..60af759dd2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php index e08e6c570d7..99dd2f9f350 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 856e34dd098..73d6ab6e4b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php index d3125d5823b..d9a1efae2cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php @@ -28,7 +28,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract extends Mage_Adminhtml_Block_Abstract implements Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Interface { - /** * Column related to filter * @@ -122,5 +121,4 @@ public function getHtml() { return ''; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index e55f416641d..f667e64a49e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,7 +24,7 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team - * @todo date format + * @todo date format */ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index ed7eee25b26..4e7cd0b122a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,7 +24,7 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team - * @todo date format + * @todo date format */ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php index d56515be05d..3ec0435f900 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php @@ -169,5 +169,4 @@ public function renderCss() { return $this->getColumn()->getCssClass(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php index c3610ca30b3..dd4385d872e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php @@ -28,7 +28,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text { - /** * Renders column * diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php index f2738063cd1..4d460309188 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php @@ -28,7 +28,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** * Renders grid column * @@ -47,5 +46,4 @@ public function render(Varien_Object $row) // TODO run column type renderer return $data; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php index ca21e6083ac..bb17b8ad37f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Date extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php index 15fbe6d0ee8..e5204ee8a1e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php index de466592375..7c1588ae288 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php index b49bca6a1b2..ed127c5daee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Widget_Grid_Container extends Mage_Adminhtml_Block_Widget_Container { - protected $_addButtonLabel; protected $_backButtonLabel; protected $_blockGroup = 'adminhtml'; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php index 3533e17f903..ab342e503aa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php @@ -306,5 +306,4 @@ public function getGroupedItems(): array return $groupedItems; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php index 058171341bc..88abf8d4133 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php index 698dea8b83a..28f15fe2122 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php @@ -64,5 +64,4 @@ public function getViewHtml() { return $this->getChildHtml('plane'); } - } diff --git a/app/code/core/Mage/Adminhtml/Exception.php b/app/code/core/Mage/Adminhtml/Exception.php index 37996f0cf48..53c7f56f425 100644 --- a/app/code/core/Mage/Adminhtml/Exception.php +++ b/app/code/core/Mage/Adminhtml/Exception.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +23,7 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Exception extends Mage_Core_Exception { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php index b3cff5a6b51..59483e692b4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php index 45a0af9162f..df5c30d880a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Model_System_Config_Backend_Currency_Cron extends Mage_Core_Model_Config_Data { - const CRON_STRING_PATH = 'crontab/jobs/currency_rates_update/schedule/cron_expr'; protected function _afterSave() @@ -59,5 +58,4 @@ protected function _afterSave() } return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php index ee516ee9031..112164f28d4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php index bc68f2b3672..f071fb514ce 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php index 8b2d2a60fd0..5a091650100 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php index d0a911b29a8..c578879ec32 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Backend_Design_Exception extends Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array { protected $_eventPrefix = 'core_config_backend_design_exception'; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php index 4795bc576ca..0b6fe033eae 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +23,10 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Backend_Encrypted extends Mage_Core_Model_Config_Data { - /** * Decrypt value after loading * diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php index 7fa76efd38c..97cbddf367a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php index c2247832e12..eb21f266847 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php @@ -15,12 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Backend_Filename extends Mage_Core_Model_Config_Data { - /** * Config path for system log file. */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php index 8ddc8e5d337..9380cd4d63e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php index f80ceaeddbf..a9eb5ae8f3d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Adminhtml_Model_System_Config_Backend_Image extends Mage_Adminhtml_Mo { /** * Getter for allowed extensions of uploaded files - * * @return array */ protected function _getAllowedExtensions() @@ -39,7 +38,6 @@ protected function _getAllowedExtensions() /** * Overwritten parent method for adding validators - * * @param Mage_Core_Model_File_Uploader $uploader */ protected function addValidators(Mage_Core_Model_File_Uploader $uploader) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php index 32ce31d8076..9eca7e831f7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php index 55017b79180..9466bc23aa7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Model_System_Config_Backend_Sitemap_Cron extends Mage_Core_Model_Config_Data { - const CRON_STRING_PATH = 'crontab/jobs/sitemap_generate/schedule/cron_expr'; const CRON_MODEL_PATH = 'crontab/jobs/sitemap_generate/run/model'; @@ -65,5 +64,4 @@ protected function _afterSave() } return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php index eb3d3ac9975..61e2b90ba78 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Backend_Storage_Media_Database extends Mage_Core_Model_Config_Data { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index 6328bbc3e66..fa96a424ac6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Adminhtml_Model_System_Config_Clone_Media_Image extends Mage_Core_Mod { /** * Get fields prefixes - * * @return array */ public function getPrefixes() @@ -54,5 +53,4 @@ public function getPrefixes() return $prefixes; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php index b213aaff40f..6149d9af07a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php index 8b764de49ce..93538927937 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php @@ -15,15 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Configuration source model for Wysiwyg toggling * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php index d1f78c28a84..375c125d121 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Country_Full extends Mage_Adminhtml_Model_System_Config_Source_Country { public function toOptionArray($isMultiselect=false) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php index 323b0e9b6a1..da7cac9adc3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php @@ -15,12 +15,16 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency { - protected static $_options; const CRON_DAILY = 'D'; @@ -47,5 +51,4 @@ public function toOptionArray() } return self::$_options; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php index 5a9258b8b92..f83565fc7e7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,5 +41,4 @@ public function toOptionArray() ['value' => self::FORGOTPASS_FLOW_EMAIL, 'label' => Mage::helper('adminhtml')->__('By Email')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php index 2b29bcb1656..a4081424844 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Customer_Group { protected $_options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php index 47b2c827e5d..b4284633533 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php @@ -15,7 +15,13 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Dev_Dbautoup { @@ -27,5 +33,4 @@ public function toOptionArray() ['value'=>Mage_Core_Model_Resource::AUTO_UPDATE_NEVER, 'label' => Mage::helper('adminhtml')->__('Never (production)')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php index f7872c742d4..580603cfb5f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php @@ -15,12 +15,18 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Email_Identity { protected $_options = null; + public function toOptionArray() { if (is_null($this->_options)) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php index c73e541c7f5..05a15443daf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Enabledisable { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php index 87d981d8a1e..381db8e3c65 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Frequency { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php index 7ada653cfd7..dc95604a449 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php index 41c0245954e..212b8f26333 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Security_Domainpolicy { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php index 51f49809930..9162d3cd964 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php index 4053f90f587..0412b29e339 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php @@ -15,11 +15,15 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Generate options for media database selection + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database { @@ -77,5 +81,4 @@ public function toOptionArray() return $media_storages; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php index b26c0c79f88..0e3493a86a5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php @@ -33,5 +33,4 @@ public function toOptionArray() ['value'=>2, 'label'=>Mage::helper('adminhtml')->__("Both (without and with tax)")], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index 79c2af21877..a089db9dec5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_Controller_Action { - protected $_entityTypeId; /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 95cde6ae22f..27ad0678359 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Catalog_DatafeedsController extends Mage_Adminhtml_Controller_Action { public function indexAction() diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index df9b225ba33..4be6f2b7494 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index 860d03d00de..86e19ad819f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -15,10 +15,13 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team * @deprecated after 1.4.0.0-alpha2 */ class Mage_Adminhtml_Catalog_Product_GroupController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php index f016bdceec2..b18d3be433c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index f5115246548..4a46eaf6b0b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index ce442668f4e..b52df69c4e2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index dc4c95ecddf..8d2e99d1fd9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index 3db25a5ae4e..b24e5f93034 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -15,10 +15,11 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -require_once('CreateController.php'); +require_once 'CreateController.php'; + /** * Adminhtml sales order edit controller * diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index 5018621c498..d3b22ce5790 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index ac1d5fa080f..74aeb618867 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ include_once "ProfileController.php"; diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 460fde5f582..0f26e33a04c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -15,9 +15,14 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_System_DesignController extends Mage_Adminhtml_Controller_Action { /** diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php index 48bdd0e23fd..f043487eaa0 100644 --- a/app/code/core/Mage/Api/Exception.php +++ b/app/code/core/Mage/Api/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php index 3580990c8e1..5396fc3de91 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Role_Generic extends Zend_Acl_Role { - } diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php index ab6153f1824..e3be2ac4fa4 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Role_Group extends Mage_Api_Model_Acl_Role_Generic { - } diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index 836f876914e..74568b1bf45 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -27,7 +27,6 @@ */ class Mage_Api_Model_Resource_Abstract { - /** * Resource configuration * diff --git a/app/code/core/Mage/Api/Model/Server/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php index 8cb7898c9ba..19f1024504a 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Handler.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +27,4 @@ */ class Mage_Api_Model_Server_Handler extends Mage_Api_Model_Server_Handler_Abstract { - } diff --git a/app/code/core/Mage/Api/Model/Server/V2/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php index 0e4d61f50dd..7c1c49a10e3 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php index 165d9fbd450..62dd49849a9 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index 0fe98aa558e..d8e0c7a3166 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -12,17 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wsdl element model * * @category Mage - * @package Mage_Core + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Wsdl_Config_Element extends Varien_Simplexml_Element { diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php index 3fe132d874a..f030d82dced 100644 --- a/app/code/core/Mage/Api/controllers/IndexController.php +++ b/app/code/core/Mage/Api/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php index 4c42c263721..b2ceb40da23 100644 --- a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php @@ -12,22 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api + * @category Mage + * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * Api install - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team - */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php index cf4e3bf3ef8..d00acda925c 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php index 88bec4b583b..4c11ec8da4f 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php index e631ecdbc8e..dd08fd39758 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php index b2e0a94ee13..035f387b7cf 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php index d78de70e173..109f0eb496f 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +24,7 @@ * @category Mage * @package Mage_Api2 * @author Magento Core Team + * * @method Mage_Api2_Model_Acl_Global_Role getRole() * @method Mage_Api2_Block_Adminhtml_Roles_Tab_Info setRole(Mage_Api2_Model_Acl_Global_Role $role) */ diff --git a/app/code/core/Mage/Api2/Exception.php b/app/code/core/Mage/Api2/Exception.php index 1d92ca679fe..ed934dce35c 100644 --- a/app/code/core/Mage/Api2/Exception.php +++ b/app/code/core/Mage/Api2/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Acl.php b/app/code/core/Mage/Api2/Model/Acl.php index 9ca2cadf1fc..1395274d046 100644 --- a/app/code/core/Mage/Api2/Model/Acl.php +++ b/app/code/core/Mage/Api2/Model/Acl.php @@ -56,8 +56,6 @@ class Mage_Api2_Model_Acl extends Zend_Acl protected $_operation; /** - * Constructor - * * @param array $options */ public function __construct($options) diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php index eecd43f60cc..89d1cb2fab8 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Acl/Global.php b/app/code/core/Mage/Api2/Model/Acl/Global.php index daba148f4ac..83041343408 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php index a567e496f59..297e09ce51a 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Dispatcher.php b/app/code/core/Mage/Api2/Model/Dispatcher.php index a3dce4b9a53..af699a0766c 100644 --- a/app/code/core/Mage/Api2/Model/Dispatcher.php +++ b/app/code/core/Mage/Api2/Model/Dispatcher.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php index 9ab0bc95230..08c7c9742c9 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php index 751ad0b6271..9207fd5beb0 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php index 79833afa926..e69702f84a0 100644 --- a/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php @@ -12,17 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Api2 + * @category Mage + * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ -/** - * Installation of Api2 module tables + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Api2_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); /** @var Varien_Db_Adapter_Pdo_Mysql $adapter */ diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php index 40062dd675c..4f34e16539f 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Authorizenet + * @category Mage + * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php index 45358cfcf1b..37bb9a8cb05 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Authorizenet + * @category Mage + * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,9 +34,7 @@ class Mage_Authorizenet_Block_Directpost_Iframe extends Mage_Core_Block_Template protected $_params = []; /** - * Internal constructor * Set template for iframe - * */ protected function _construct() { diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index ec50ad84809..d81f6cb479a 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Authorizenet + * @category Mage + * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php index 93b0cae3c66..749206db25e 100644 --- a/app/code/core/Mage/Backup/Exception.php +++ b/app/code/core/Mage/Backup/Exception.php @@ -12,11 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Backup + * @category Mage + * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Backup + * @author Magento Core Team + */ class Mage_Backup_Exception extends Zend_Exception -{} +{ +} diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index 54400d7b14a..a509a1a9492 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -12,22 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Backup + * @category Mage + * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database backup model * - * @category Mage - * @package Mage_Backup - * @author Magento Core Team + * @category Mage + * @package Mage_Backup + * @author Magento Core Team */ class Mage_Backup_Model_Db { - /** * Buffer length for multi rows * default 100 Kb diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php index 76e8dc8fff4..a1611948a25 100644 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Backup + * @category Mage + * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database backup resource model * - * @category Mage - * @package Mage_Backup - * @author Magento Core Team + * @category Mage + * @package Mage_Backup + * @author Magento Core Team * @deprecated */ class Mage_Backup_Model_Mysql4_Db extends Mage_Backup_Model_Resource_Db diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php index 003e728415c..b57159b73d4 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Db.php +++ b/app/code/core/Mage/Backup/Model/Resource/Db.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Backup + * @category Mage + * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database backup resource model * - * @category Mage - * @package Mage_Backup - * @author Magento Core Team + * @category Mage + * @package Mage_Backup + * @author Magento Core Team */ class Mage_Backup_Model_Resource_Db { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 7b4eadc0e52..4fb0008b1f2 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Extended Attribures Block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method bool getCanEditPrice() * @method $this setCanEditPrice(bool $true) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php index c40e4c339b9..72a1da32c5a 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle selection product grid * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method bool getFirstShow() * @method string getIndex() diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php index a0dcce49bb4..4639f025c6c 100644 --- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php @@ -27,7 +27,6 @@ */ class Mage_Bundle_Model_CatalogIndex_Data_Bundle extends Mage_CatalogIndex_Model_Data_Simple { - /** * Defines when product type has children * diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php index 8fc9693f1be..da6decb1f21 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Product Price Index Resource model * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * @deprecated */ class Mage_Bundle_Model_Mysql4_Price_Index extends Mage_Bundle_Model_Resource_Price_Index diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php index 1623230de23..717ae1f54db 100644 --- a/app/code/core/Mage/Bundle/Model/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Price/Index.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Product Price Index * + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team + * * @method Mage_Bundle_Model_Resource_Price_Index _getResource() * @method Mage_Bundle_Model_Resource_Price_Index getResource() * @method Mage_Bundle_Model_Price_Index setEntityId(int $value) @@ -32,10 +36,6 @@ * @method Mage_Bundle_Model_Price_Index setMinPrice(float $value) * @method float getMaxPrice() * @method Mage_Bundle_Model_Price_Index setMaxPrice(float $value) - * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team */ class Mage_Bundle_Model_Price_Index extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php index 8bd3f6b5f86..ed4aff38f52 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Product Price Index Resource model * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Resource_Price_Index extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php index 734e474104d..8604abfead4 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Adminhtml/controllers/Catalog/ProductController.php'; @@ -23,9 +23,9 @@ /** * Adminhtml bundle product edit * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Adminhtml_Bundle_Product_EditController extends Mage_Adminhtml_Catalog_ProductController { diff --git a/app/code/core/Mage/Bundle/controllers/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Product/EditController.php index 877fd26b3a0..90978b14a45 100644 --- a/app/code/core/Mage/Bundle/controllers/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Product/EditController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php'; @@ -23,12 +23,11 @@ /** * Adminhtml bundle product edit * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * @deprecated after 1.4.2.0 Mage_Bundle_Adminhtml_Product_EditController is used */ class Mage_Bundle_Product_EditController extends Mage_Bundle_Adminhtml_Bundle_Product_EditController { - } diff --git a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php index 7915e977a52..5e3699b25db 100644 --- a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php @@ -12,14 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Setup $installer */ +$installer = $this; $fieldList = [ 'price','special_price','special_from_date','special_to_date', diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php index e4137a8e0b6..2da3ff1ef11 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Bundle + * @category Mage + * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Captcha/Model/Config/Font.php b/app/code/core/Mage/Captcha/Model/Config/Font.php index 95d6879d70d..d054fb4e8f1 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Font.php +++ b/app/code/core/Mage/Captcha/Model/Config/Font.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php index e8d616a829d..6ea1c20885e 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php index 51f79133d1b..d7fdce3b0ad 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php @@ -12,25 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Decimal Attribute Filter Block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Layer_Filter_Decimal extends Mage_Catalog_Block_Layer_Filter_Abstract { - /** - * Initialize Decimal Filter Model - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php index 694a0e5d99c..59d83377380 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php +++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_Gallery extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php index 96c529ae374..bb5a18d0413 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php @@ -27,7 +27,6 @@ */ class Mage_Catalog_Block_Product_View_Additional extends Mage_Core_Block_Template { - protected $_list; public function __construct() diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php index c903e0c2cef..5acbcde9542 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php index c44266090d8..7a1453cfdfb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php index f3c0f0faffa..bdee32007aa 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +27,4 @@ */ class Mage_Catalog_Block_Product_View_Options_Type_Default extends Mage_Catalog_Block_Product_View_Options_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php index 74d3f813249..37ca5d854eb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php index b25cd9c2899..dc08d7f4694 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract { diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php index ee2513be004..5687c38e6e8 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php @@ -27,7 +27,6 @@ */ abstract class Mage_Catalog_Block_Seo_Sitemap_Abstract extends Mage_Core_Block_Template { - /** * Init pager * diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php index 27e03813670..a2fb206f76d 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php @@ -29,7 +29,6 @@ */ class Mage_Catalog_Block_Seo_Sitemap_Category extends Mage_Catalog_Block_Seo_Sitemap_Abstract { - /** * Initialize categories collection * diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php index ff347bd9b0f..8029e7bfcbf 100644 --- a/app/code/core/Mage/Catalog/Exception.php +++ b/app/code/core/Mage/Catalog/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ class Mage_Catalog_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php index b338864bfa5..f0eb9e2affc 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index 160c6c567a3..829fcd5c979 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog image helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Image extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php index 65a2b4d560e..668acde638e 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php index c26f4ed8478..3e4d57a4e5c 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php index 5b5a7145bf1..1dc148f62be 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php index e0bcf96a030..b2ca9727c4c 100644 --- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php @@ -27,7 +27,6 @@ */ class Mage_Catalog_Model_Attribute_Backend_Customlayoutupdate extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - /** * Product custom layout update attribute validate function. * In case invalid data throws exception. diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index a24f88c536e..f270a9e9d7c 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +27,8 @@ */ class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - /** * Save uploaded file and set its name to category - * * @param Varien_Object $object * @return $this */ @@ -64,7 +62,6 @@ public function afterSave($object) if ($e->getCode() != Mage_Core_Model_File_Uploader::TMP_NAME_EMPTY) { Mage::logException($e); } - /** @TODO ??? */ } return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php index 34f52e183df..41c4f251516 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Category Flat Indexer Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Category_Indexer_Flat extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php index bbf168b9da3..d45d49c7407 100644 --- a/app/code/core/Mage/Catalog/Model/Design.php +++ b/app/code/core/Mage/Catalog/Model/Design.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php index c6eb216a98b..5ca7e68b86a 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,8 +23,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team - + * @author Magento Core Team */ class Mage_Catalog_Model_Entity_Product_Attribute_Frontend_Image extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { @@ -39,18 +38,15 @@ public function getUrl($object, $size = null) $image = $object->getData($this->getAttribute()->getAttributeCode()); if (!is_null($size) && file_exists(Mage::getBaseDir('media').'/catalog/product/'. $size . '/' . $image)) { - # image is cached + // image is cached $url = Mage::getBaseUrl('media').'catalog/product/' . $size . '/' . $image; } elseif (!is_null($size)) { - # image is not cached + // image is not cached $url = Mage::getBaseUrl().'catalog/product/image/size/' . $size . '/' . $image; } else { - # image is not cached + // image is not cached $url = Mage::getBaseUrl().'catalog/product/image' . $image; - }/* elseif ($image) { - # using original image - $url = Mage::getBaseUrl('media').'catalog/product/'.$image; - }*/ + } return $url; } } diff --git a/app/code/core/Mage/Catalog/Model/Factory.php b/app/code/core/Mage/Catalog/Model/Factory.php index 367ddfd21bf..7dfeb0112e1 100644 --- a/app/code/core/Mage/Catalog/Model/Factory.php +++ b/app/code/core/Mage/Catalog/Model/Factory.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Catalog factory - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Factory extends Mage_Core_Model_Factory { diff --git a/app/code/core/Mage/Catalog/Model/Index.php b/app/code/core/Mage/Catalog/Model/Index.php index 8165ae6ea42..af447cd9e01 100644 --- a/app/code/core/Mage/Catalog/Model/Index.php +++ b/app/code/core/Mage/Catalog/Model/Index.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Catalog_Model_Index { /** * Rebuild indexes - * * @return $this */ public function rebuild() diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php index 43a4e223706..8d25ab9a6ba 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Decimal Attribute Filter Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method $this setRange(int $value) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index 108e9457df9..542284a66ee 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -34,9 +34,6 @@ class Mage_Catalog_Model_Product_Attribute_Api extends Mage_Catalog_Model_Api_Re */ protected $_entityTypeId; - /** - * Constructor. Initializes default values. - */ public function __construct() { $this->_storeIdSessionField = 'product_store_id'; diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php index e3d74a64212..c3ad2efe3b4 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php index abf8b19bc64..808e54ac6bb 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Attribute_Frontend_Image extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { - /** * @param Varien_Object $object * @param string $size diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php index 7eb4d610d61..a65c99383bf 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ class Mage_Catalog_Model_Product_Attribute_Group extends Mage_Eav_Model_Entity_Attribute_Group { - /** * Check if group contains system attributes * diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php index 3e7a25db18c..ca2a1fbbfe3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,11 +24,11 @@ * @category Mage * @package Mage_Eav * @author Magento Core Team - */class Mage_Catalog_Model_Product_Attribute_Source_Inputtype extends Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype + */ +class Mage_Catalog_Model_Product_Attribute_Source_Inputtype extends Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype { /** * Get product input types as option array - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php index f150b47e229..1edb7481754 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php index bbdea8ce840..fceb34096e0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php index e5d7eb7499c..8c3c7cf351d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Flat Indexer Model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Flat_Indexer _getResource() * @method Mage_Catalog_Model_Resource_Product_Flat_Indexer getResource() * @method int getEntityTypeId() @@ -39,10 +43,6 @@ * @method Mage_Catalog_Model_Product_Flat_Indexer setCreatedAt(string $value) * @method string getUpdatedAt() * @method Mage_Catalog_Model_Product_Flat_Indexer setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Flat_Indexer extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index a3b205f537b..afc8c09c343 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team * * @method $this setImageOpacity(int $value) */ @@ -31,14 +31,12 @@ class Mage_Catalog_Model_Product_Image extends Mage_Core_Model_Abstract { /** * Requested width for the scaled image - * * @var int */ protected $_width; /** * Requested height for the scaled image - * * @var int */ protected $_height; @@ -59,7 +57,6 @@ class Mage_Catalog_Model_Product_Image extends Mage_Core_Model_Abstract /** * If true, images will not be scaled up (when original image is smaller then requested size) - * * @var bool */ protected $_constrainOnly = false; @@ -74,7 +71,6 @@ class Mage_Catalog_Model_Product_Image extends Mage_Core_Model_Abstract /** * Absolute path to and original (full resolution) image - * * @var string */ protected $_baseFile; diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php index fc39f70ff9b..ef8a1937ed9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Eav Indexer Model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Indexer_Eav _getResource() * @method Mage_Catalog_Model_Resource_Product_Indexer_Eav getResource() * @method Mage_Catalog_Model_Product_Indexer_Eav setEntityId(int $value) @@ -30,10 +34,6 @@ * @method Mage_Catalog_Model_Product_Indexer_Eav setStoreId(int $value) * @method int getValue() * @method Mage_Catalog_Model_Product_Indexer_Eav setValue(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Indexer_Eav extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php index 0d702f11a10..c2ae2f4b8bd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Indexer_Flat extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php index 7a78eedd2eb..b912cbc3fe6 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php @@ -27,7 +27,6 @@ */ class Mage_Catalog_Model_Product_Option_Api extends Mage_Catalog_Model_Api_Resource { - /** * Add custom option to product * diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 2506725bf3b..96ee7c106e3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php index fd8da414316..28bd80eaaa1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index 62cc5175e29..ba0a8ed9d9f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index 6409b47bebe..a7d6244bde7 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Type_Grouped extends Mage_Catalog_Model_Product_Type_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php index adb80b9d227..4b239bf71c5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php @@ -12,26 +12,24 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category image attribute frontend * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { const IMAGE_PATH_SEGMENT = 'catalog/category/'; /** - * Return image url - * * @param Varien_Object $object * @return string|null */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index 90f3f0a8811..34a312df3e8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category flat model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php index b5aa68e0b65..dfd855acd10 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category image attribute frontend * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image extends Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php index a679084ce99..fd35c55bbbb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category flat model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat extends Mage_Catalog_Model_Resource_Category_Flat diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php index ef9f139afe0..365bf6bfc8f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Decimal attribute Filter Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal extends Mage_Catalog_Model_Resource_Layer_Filter_Decimal diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php index 11f10bdb93a..819c763dc4c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product image attribute backend * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php index 3ebf8647758..f8ca2b0c2f8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product image attribute frontend * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image extends Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php index 66f0661c84d..ec945364fff 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Flat resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat extends Mage_Catalog_Model_Resource_Product_Flat diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php index 30eb157e136..02482904e20 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Flat Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer extends Mage_Catalog_Model_Resource_Product_Flat_Indexer diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php index 37cc751388d..c3468eb0232 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Eav Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav extends Mage_Catalog_Model_Resource_Product_Indexer_Eav diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php index 7be35e7327f..a0273bf1995 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Eav Decimal Attributes Indexer resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php index c8f5151e977..1246432027e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php @@ -12,19 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default Product Type Price Indexer Resource model * For correctly work need define product type id * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Default diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php index be6cb1e1a12..65b7c3f8dc4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Configurable Products Price Indexer Resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php index d5465f1aab6..1d13e4c6290 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Decimal attribute Filter Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Layer_Filter_Decimal extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php index 2b5dfa62f62..5e82af82e25 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product group price backend attribute model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php index ae2a67a934f..5bc78158043 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,8 +28,6 @@ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** - * After save - * * @param Varien_Object $object * @return $this */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php index cb32dab0736..ade19da3025 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product image attribute frontend * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { @@ -31,7 +31,6 @@ class Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image extends Mage_ /** * Retrieve image url - * * @param Varien_Object $object * @return string|false */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php index 6b2a0aad7d8..bd439d0a9e0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Flat resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Flat extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php index f0b24f8b8de..22cff515c63 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Flat Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Flat_Indexer extends Mage_Index_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php index 620a019ebb5..92f9735fdac 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Eav Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Indexer_Eav extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php index 73dafa1a5db..c97bb82fec7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Eav Decimal Attributes Indexer resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php index c83da007247..f46e6786e48 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php @@ -12,19 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default Product Type Price Indexer Resource model * For correctly work need define product type id * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Indexer_Price_Default extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract implements Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php index 2539d5b3582..840abcbb0c8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Configurable Products Price Indexer Resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Default { diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php index b225b5c46c1..0f461825fd3 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat category on/off backend + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php index 8154cba82d1..33c03fa4ea9 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat product on/off backend + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Catalog/Model/Template/Filter.php b/app/code/core/Mage/Catalog/Model/Template/Filter.php index e37fe7cd3a7..67b91b0d2e6 100644 --- a/app/code/core/Mage/Catalog/Model/Template/Filter.php +++ b/app/code/core/Mage/Catalog/Model/Template/Filter.php @@ -12,19 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Template Filter Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team - * @todo Needs to be reimplemented to get rid of the copypasted methods + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * @todo Needs to be reimplemented to get rid of the copypasted methods */ class Mage_Catalog_Model_Template_Filter extends Varien_Filter_Template { diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php index 19f549ae4f3..eeb31586f87 100644 --- a/app/code/core/Mage/Catalog/controllers/IndexController.php +++ b/app/code/core/Mage/Catalog/controllers/IndexController.php @@ -12,17 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ class Mage_Catalog_IndexController extends Mage_Core_Controller_Front_Action { - /** - * Index action - */ public function indexAction() { $this->_redirect('/'); diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php index ebe62fa8ea4..c6f886f4213 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php index 50cbd0a57ab..8a112c5aea3 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php index 69e80a65c05..8dec7531035 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php @@ -12,11 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $connection = $installer->getConnection(); diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php index 4969f040d9e..2952e9f19c1 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php @@ -12,13 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** @var Mage_Catalog_Model_Resource_Setup $installer */ +/** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); $connection = $installer->getConnection(); diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php index c8a3f2116c9..a4ad6cb332b 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php index cf246ca6347..a9a86ae8536 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php index 4feaf62966b..d337735a3c4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog + * @category Mage + * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php index d08c545a766..742c78aa567 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + */ class Mage_CatalogIndex_Model_Catalog_Index_Flag extends Mage_Core_Model_Flag { protected $_flagCode = 'catalogindex'; diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php index f93d10e730d..46026eb3e4b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + */ class Mage_CatalogIndex_Model_Catalog_Index_Kill_Flag extends Mage_Core_Model_Flag { protected $_flagCode = 'catalogindex_kill'; diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php index dcbf84a52ce..a0b61cd4e43 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Grouped product data retriever * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Data_Grouped extends Mage_CatalogIndex_Model_Data_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index 5f58d4ec34d..7e27a214bbf 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogIndex Index operation model * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @method Mage_CatalogIndex_Model_Resource_Indexer _getResource() * @method Mage_CatalogIndex_Model_Resource_Indexer getResource() * @method int getEntityTypeId() @@ -39,10 +43,6 @@ * @method Mage_CatalogIndex_Model_Indexer setCreatedAt(string $value) * @method string getUpdatedAt() * @method Mage_CatalogIndex_Model_Indexer setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php index d99268ce1b8..7d3853ecc45 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog indexer eav processor * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @method Mage_CatalogIndex_Model_Resource_Indexer_Eav _getResource() * @method Mage_CatalogIndex_Model_Resource_Indexer_Eav getResource() * @method Mage_CatalogIndex_Model_Indexer_Eav setEntityId(int $value) @@ -30,10 +34,6 @@ * @method Mage_CatalogIndex_Model_Indexer_Eav setStoreId(int $value) * @method int getValue() * @method Mage_CatalogIndex_Model_Indexer_Eav setValue(int $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer_Eav extends Mage_CatalogIndex_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php index c9d21d319e1..dc7a525a5fa 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogIndex Grouped Products Data Retriever Resource Model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Data_Grouped extends Mage_CatalogIndex_Model_Resource_Data_Grouped diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php index 44e243b9ccc..b0c676e37b4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Reindexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Indexer extends Mage_CatalogIndex_Model_Resource_Indexer diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php index 3ac60265e3c..584db8e5b1c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Eav indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Indexer_Eav extends Mage_CatalogIndex_Model_Resource_Indexer_Eav diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php index 037cd379acb..05e9ed985d9 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogIndex Grouped Products Data Retriever Resource Model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Data_Grouped extends Mage_CatalogIndex_Model_Resource_Data_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php index 97c50a2899f..7bfef9412ac 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Reindexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Indexer extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php index f6dd7fd1ef0..d2aa69f87b6 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Eav indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Indexer_Eav extends Mage_CatalogIndex_Model_Resource_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php index 9d802058b9f..8ff80ff922c 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php @@ -12,15 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex + * @category Mage + * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - -$installer->startSetup(); - -$installer->endSetup(); +$installer = $this; +$installer->startSetup(); \ No newline at end of file diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php index 633b74267c8..f6b8f034224 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @author Magento Core Team + * @author Magento Core Team */ class Mage_CatalogInventory_Block_Stockqty_Default extends Mage_CatalogInventory_Block_Stockqty_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php index 8d7cbf6314e..6d62b658514 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @author Magento Core Team + * @author Magento Core Team */ class Mage_CatalogInventory_Block_Stockqty_Type_Grouped extends Mage_CatalogInventory_Block_Stockqty_Composite { diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php index 5ea2c1f7cf0..277b42c4efe 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Default Stock Status Indexer Resource Model * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team * @deprecated */ class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Default extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php index 581461d01b2..a2f75a2bea0 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Grouped Products Stock Status Indexer Resource Model * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team * @deprecated */ class Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Grouped extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php index ac4d9bdd860..a984b99a667 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Default Stock Status Indexer Resource Model * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract implements Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface { diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php index 881f7066478..a3aa50c801d 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Grouped Products Stock Status Indexer Resource Model * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default { diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php index 0d9f6ee80ce..3e3a9dfde93 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogInventory + * @category Mage + * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/CatalogRule/Model/Flag.php b/app/code/core/Mage/CatalogRule/Model/Flag.php index ec7b4acb7bc..b8325d43cf2 100644 --- a/app/code/core/Mage/CatalogRule/Model/Flag.php +++ b/app/code/core/Mage/CatalogRule/Model/Flag.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogRule + * @category Mage + * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flag stores status about availability not applied catalog price rules * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Flag extends Mage_Core_Model_Flag { diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php index 434eaaec752..33cd7c71644 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php @@ -12,16 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogRule + * @category Mage + * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index cc500f9f18d..df1eee82b34 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @author Magento Core Team + * @author Magento Core Team */ class Mage_CatalogSearch_Block_Advanced_Form extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php index 72ea95324ec..053499721c5 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog advanced search model * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + * * @method Mage_CatalogSearch_Model_Resource_Fulltext _getResource() * @method Mage_CatalogSearch_Model_Resource_Fulltext getResource() * @method Mage_CatalogSearch_Model_Resource_Fulltext_Collection getCollection() @@ -31,10 +35,6 @@ * @method $this setStoreId(int $value) * @method string getDataIndex() * @method $this setDataIndex(string $value) - * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team */ class Mage_CatalogSearch_Model_Fulltext extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php index 4e52a1331a2..b5ded7dd655 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch fulltext indexer model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Indexer_Fulltext extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php index 751111431ca..310859e68d2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Fulltext Index resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team * @deprecated */ class Mage_CatalogSearch_Model_Mysql4_Fulltext extends Mage_CatalogSearch_Model_Resource_Fulltext diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php index 8b32178446b..c63c5cd67a7 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Fulltext Index Engine resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team * @deprecated */ class Mage_CatalogSearch_Model_Mysql4_Fulltext_Engine extends Mage_CatalogSearch_Model_Resource_Fulltext_Engine diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php index da0af454309..a063ece551f 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php @@ -12,21 +12,20 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch fulltext indexer resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team * @deprecated */ class Mage_CatalogSearch_Model_Mysql4_Indexer_Fulltext extends Mage_CatalogSearch_Model_Resource_Indexer_Fulltext { - } diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php index ca331aa63e4..10140c2cee7 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Fulltext Index resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Resource_Fulltext extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php index c3b62382139..323dd703c91 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Fulltext Index Engine resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Resource_Fulltext_Engine extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php index 9cbcc607eb8..0a17a47aff4 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch fulltext indexer resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Resource_Indexer_Fulltext extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php index 9555dfd8827..7313a763ea6 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogSearch + * @category Mage + * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php index 81797bba3e4..e4e13a17d6c 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Centinel + * @category Mage + * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Centinel - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Centinel_Block_Adminhtml_Validation_Form extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { /** diff --git a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php index d4bdbb10277..42c5cb5a3f4 100644 --- a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Centinel + * @category Mage + * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Centinel Index Controller * - * @category Mage - * @package Mage_Centinel - * @author Magento Core Team + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Adminhtml_Centinel_IndexController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Centinel/controllers/IndexController.php b/app/code/core/Mage/Centinel/controllers/IndexController.php index 0361ea8286f..f565125ca12 100644 --- a/app/code/core/Mage/Centinel/controllers/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/IndexController.php @@ -12,15 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Centinel + * @category Mage + * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Centinel Authenticate Controller * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_IndexController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php index 0f7cffd4663..150bc3a046c 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart item render block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method \Mage_Checkout_Block_Cart_Sidebar getRenderedBlock() */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php index 1b8dd2ff781..890927fab51 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Multishipping_Payment_Info extends Mage_Payment_Block_Info_Container { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php index a47ba260a5d..ef84b82626a 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team + */ class Mage_Checkout_Block_Onepage_Failure extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php index 57e84008f48..52a2d523c65 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Payment_Info extends Mage_Payment_Block_Info_Container { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php index 07eb23dd1d0..c2af3dc3820 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout order review * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Review_Info extends Mage_Sales_Block_Items_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Total/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php index 9a02e0cb2d4..2fd4aebd536 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Default.php +++ b/app/code/core/Mage/Checkout/Block/Total/Default.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method Mage_Sales_Model_Quote_Address_Total getTotal() */ diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php index 616225e8961..b8a90c5767f 100644 --- a/app/code/core/Mage/Checkout/Exception.php +++ b/app/code/core/Mage/Checkout/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team + */ class Mage_Checkout_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php index 9d46da4cb7e..d6a4ad064a7 100644 --- a/app/code/core/Mage/Checkout/controllers/IndexController.php +++ b/app/code/core/Mage/Checkout/controllers/IndexController.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team + */ class Mage_Checkout_IndexController extends Mage_Core_Controller_Front_Action { public function indexAction() diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php index 685e90e9a98..2aede21c0c4 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php @@ -12,15 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Checkout_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); + /** * Create table 'checkout/agreement' */ diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php index 56688515dab..1d4a8f37b12 100644 --- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wysiwyg Images Helper + * + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php index 005f4f48510..17c80085b55 100644 --- a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php +++ b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms Adminhtml Template Filter Model * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Model_Adminhtml_Template_Filter extends Mage_Cms_Model_Template_Filter { diff --git a/app/code/core/Mage/Cms/Model/Template/Filter.php b/app/code/core/Mage/Cms/Model/Template/Filter.php index da8e01dd842..b928ab3d957 100644 --- a/app/code/core/Mage/Cms/Model/Template/Filter.php +++ b/app/code/core/Mage/Cms/Model/Template/Filter.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms Template Filter Model * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Model_Template_Filter extends Mage_Core_Model_Email_Template_Filter { diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php index a3cbf1f590f..a1f7fcb3fcc 100644 --- a/app/code/core/Mage/Cms/controllers/IndexController.php +++ b/app/code/core/Mage/Cms/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php index d36539c7591..f894a7e04d1 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $cmsBlocks = [ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php index de68510b0b5..09ede091280 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $pageContent = <<Privacy Policy page. " . diff --git a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php index d17c0018b2e..caba92bb8b0 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cms + * @category Mage + * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php index 3489933fd3a..9ff0c88cb78 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php @@ -25,7 +25,6 @@ */ class Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable extends Mage_Catalog_Model_Resource_Product_Type_Configurable { - /** * Retrieve Required children ids * Grouped by parent id. diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index 0035877b7d9..88dd6bf468b 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Contacts + * @category Mage + * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Contacts - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Contacts_IndexController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php index c7f172832b4..eca313857b4 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php @@ -12,12 +12,11 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Contacts + * @category Mage + * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php index 77419c9355b..76ab05e2bea 100644 --- a/app/code/core/Mage/Core/Block/Flush.php +++ b/app/code/core/Mage/Core/Block/Flush.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Immediate flush block. To be used only as root * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Block_Flush extends Mage_Core_Block_Abstract { diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php index 243e7a9814b..103991bacba 100644 --- a/app/code/core/Mage/Core/Block/Html/Date.php +++ b/app/code/core/Mage/Core/Block/Html/Date.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team * * @method string getClass() * @method $this setClass(string $value) diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php index 079aeff26da..8fad2815c4b 100644 --- a/app/code/core/Mage/Core/Block/Template/Facade.php +++ b/app/code/core/Mage/Core/Block/Template/Facade.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php index e1b7b862d93..7d2aa7909f7 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Base html block * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Block_Text_Tag_Debug extends Mage_Core_Block_Text_Tag { diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php index 298d57ebb31..5944360a04f 100644 --- a/app/code/core/Mage/Core/Controller/Request/Http.php +++ b/app/code/core/Mage/Core/Controller/Request/Http.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,9 @@ * * Allows dispatching before and after events for each controller action * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Controller_Request_Http extends Zend_Controller_Request_Http { diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php index 1b0f3313899..48612e402ac 100644 --- a/app/code/core/Mage/Core/Controller/Response/Http.php +++ b/app/code/core/Mage/Core/Controller/Response/Http.php @@ -12,31 +12,30 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Custom Zend_Controller_Response_Http class (formally) * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Controller_Response_Http extends Zend_Controller_Response_Http { /** * Transport object for observers to perform - * * @var Varien_Object */ protected static $_transportObject = null; /** * Fixes CGI only one Status header allowed bug - * * @link http://bugs.php.net/bug.php?id=36705 - * * @inheritDoc */ public function sendHeaders() diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php index 525d6f4483b..790852d8194 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Exception.php +++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php @@ -12,15 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Controller exception that can fork different actions, cause forward or redirect * + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Controller_Varien_Exception extends Exception { diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 7ad5989b6a9..1da67b4f6cf 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Controller_Varien_Action getAction() * @method $this setAction(Mage_Core_Controller_Varien_Action $value) * @method bool getNoRender() diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php index 13f2acaa4fb..588e2fae7ba 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_Controller_Varien_Router_Default extends Mage_Core_Controller_Varien_Router_Abstract { /** diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php index 1eb75612d0d..34d40c62c69 100644 --- a/app/code/core/Mage/Core/Exception.php +++ b/app/code/core/Mage/Core/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,6 +25,7 @@ * * @category Mage * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Exception extends Exception { diff --git a/app/code/core/Mage/Core/Helper/File/Storage/Database.php b/app/code/core/Mage/Core/Helper/File/Storage/Database.php index dd2a8d28e11..d72332453c4 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Helper/File/Storage/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database saving file helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_File_Storage_Database extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/Hint.php b/app/code/core/Mage/Core/Helper/Hint.php index a1840ee0add..9dd91649ffd 100644 --- a/app/code/core/Mage/Core/Helper/Hint.php +++ b/app/code/core/Mage/Core/Helper/Hint.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core hint helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Hint extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php index 54f2ae19140..317cbd78830 100644 --- a/app/code/core/Mage/Core/Helper/Http.php +++ b/app/code/core/Mage/Core/Helper/Http.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core Http Helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Http extends Mage_Core_Helper_Abstract { @@ -31,14 +31,12 @@ class Mage_Core_Helper_Http extends Mage_Core_Helper_Abstract /** * Remote address cache - * * @var string */ protected $_remoteAddr; /** * Validate and retrieve user and password from HTTP - * * @param string|null $headers * @return array */ diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index 41fc0544979..a2afc9897aa 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -29,7 +29,6 @@ */ class Mage_Core_Model_App { - const XML_PATH_INSTALL_DATE = 'global/install/date'; const XML_PATH_SKIP_PROCESS_MODULES_UPDATES = 'global/skip_process_modules_updates'; diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index 2f591762062..527aea5acdc 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Emulation model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_App_Emulation extends Varien_Object { diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php index 6865a5ecfde..d7d43fa7dea 100644 --- a/app/code/core/Mage/Core/Model/Config/Element.php +++ b/app/code/core/Mage/Core/Model/Config/Element.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +23,7 @@ * * @category Mage * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Config_Element extends Varien_Simplexml_Element { diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php index 8367f5ca9b6..703ffcdd0a0 100644 --- a/app/code/core/Mage/Core/Model/Date.php +++ b/app/code/core/Mage/Core/Model/Date.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Date conversion model * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Date { diff --git a/app/code/core/Mage/Core/Model/Design.php b/app/code/core/Mage/Core/Model/Design.php index c4ad866be50..bc44dfff339 100644 --- a/app/code/core/Mage/Core/Model/Design.php +++ b/app/code/core/Mage/Core/Model/Design.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Design _getResource() * @method Mage_Core_Model_Resource_Design getResource() * @method int getStoreId() @@ -31,10 +35,6 @@ * @method $this setDateTo(string $value) * @method string getPackage() * @method string getTheme() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Design extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index 1679fda768b..8650bee8913 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php index fc4cbe7c021..9575cd509d6 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Design.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_Model_Design_Source_Design extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { protected $_isFullLabel = false; diff --git a/app/code/core/Mage/Core/Model/Domainpolicy.php b/app/code/core/Mage/Core/Model/Domainpolicy.php index 482bd789417..f781f53d39c 100644 --- a/app/code/core/Mage/Core/Model/Domainpolicy.php +++ b/app/code/core/Mage/Core/Model/Domainpolicy.php @@ -12,14 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Magethrow + * @category Mage * @package Mage_Core * @author Magento Core Team */ diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php index c9a03d128b9..2eccac88598 100644 --- a/app/code/core/Mage/Core/Model/Email.php +++ b/app/code/core/Mage/Core/Model/Email.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,6 +28,10 @@ * - template (file name) * - module (for template) * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method getFromEmail() * @method $this setFromEmail(string $string) * @method getFromName() diff --git a/app/code/core/Mage/Core/Model/Email/Info.php b/app/code/core/Mage/Core/Model/Email/Info.php index 8fd6111b894..c10b79b87f9 100644 --- a/app/code/core/Mage/Core/Model/Email/Info.php +++ b/app/code/core/Mage/Core/Model/Email/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,9 +26,9 @@ * -Bcc: Blind carbon copy to tertiary recipients who receive the message * without anyone else (including the To, Cc, and Bcc recipients) seeing who the tertiary recipients are * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Email_Info extends Varien_Object { diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php index eb5fcf375d4..32516a8ab82 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php index 355841d3c8b..83e04946bbb 100644 --- a/app/code/core/Mage/Core/Model/Encryption.php +++ b/app/code/core/Mage/Core/Model/Encryption.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Model_Encryption { diff --git a/app/code/core/Mage/Core/Model/Factory.php b/app/code/core/Mage/Core/Model/Factory.php index b47171ff57c..201d814f337 100644 --- a/app/code/core/Mage/Core/Model/Factory.php +++ b/app/code/core/Mage/Core/Model/Factory.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Factory class - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Factory { diff --git a/app/code/core/Mage/Core/Model/File/Storage/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Database.php index 710bdf0c183..b170dc6803e 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Database.php @@ -12,23 +12,23 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * File storage database model class * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_File_Storage_Database _getResource() * @method Mage_Core_Model_Resource_File_Storage_Database getResource() * @method string getConnectionName() * @method $this setDirectoryId(int $value) - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_File_Storage_Database extends Mage_Core_Model_File_Storage_Database_Abstract { diff --git a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php index 966cfd9623b..fb148ad1acf 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory database storage model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * * @method Mage_Core_Model_Resource_File_Storage_Directory_Database _getResource() * @method string getConnectionName() diff --git a/app/code/core/Mage/Core/Model/File/Storage/File.php b/app/code/core/Mage/Core/Model/File/Storage/File.php index eb5f237c6d5..fc6eff5282b 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/File/Storage/File.php @@ -12,21 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract model class * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_File_Storage_File _getResource() * @method Mage_Core_Model_Resource_File_Storage_File getResource() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_File_Storage_File extends Mage_Core_Model_File_Storage_Abstract { @@ -285,5 +285,4 @@ public function removeLockedFile($filePath) { $this->getResource()->removeLockedFile($filePath); } - } diff --git a/app/code/core/Mage/Core/Model/File/Storage/Flag.php b/app/code/core/Mage/Core/Model/File/Storage/Flag.php index bc7312e2a13..c921ab00bf5 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Flag.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Flag.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Synchronize process status flag class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_File_Storage_Flag extends Mage_Core_Model_Flag { diff --git a/app/code/core/Mage/Core/Model/File/Validator/Image.php b/app/code/core/Mage/Core/Model/File/Validator/Image.php index 7004efe7e71..b0238e9e4de 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/Image.php +++ b/app/code/core/Mage/Core/Model/File/Validator/Image.php @@ -13,10 +13,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php index 2348debbce4..9ee0abedb06 100644 --- a/app/code/core/Mage/Core/Model/Flag.php +++ b/app/code/core/Mage/Core/Model/Flag.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core Flag model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Flag _getResource() * @method Mage_Core_Model_Resource_Flag getResource() * @method string getFlagCode() @@ -30,10 +34,6 @@ * @method string getLastUpdate() * @method $this setLastUpdate(string $value) * @method bool hasFlagData() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Flag extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Input/Filter.php b/app/code/core/Mage/Core/Model/Input/Filter.php index f0836046797..7fe6dc6fb7d 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter.php +++ b/app/code/core/Mage/Core/Model/Input/Filter.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,10 +93,10 @@ * )); * * - * @see Mage_Core_Model_Input_FilterTest See this class for manual * @category Mage * @package Mage_Core - * @author Magento Api Team + * @author Magento Core Team + * @see Mage_Core_Model_Input_FilterTest See this class for manual */ class Mage_Core_Model_Input_Filter implements Zend_Filter_Interface { diff --git a/app/code/core/Mage/Core/Model/Layout/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php index dbab020965e..7cb59f64329 100644 --- a/app/code/core/Mage/Core/Model/Layout/Element.php +++ b/app/code/core/Mage/Core/Model/Layout/Element.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_Model_Layout_Element extends Varien_Simplexml_Element { /** diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php index 329868a6e30..6d3a58281ed 100644 --- a/app/code/core/Mage/Core/Model/Log/Adapter.php +++ b/app/code/core/Mage/Core/Model/Log/Adapter.php @@ -27,7 +27,6 @@ */ class Mage_Core_Model_Log_Adapter { - /** * Store log file name * diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php index b70ffb94576..c6627b5afcc 100644 --- a/app/code/core/Mage/Core/Model/Message/Error.php +++ b/app/code/core/Mage/Core/Model/Message/Error.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_Model_Message_Error extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php index a2a288affc5..17de353f9b8 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Design extends Mage_Core_Model_Resource_Design diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php index ca17093c199..528020813a9 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * File storage database resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_File_Storage_Database extends Mage_Core_Model_Resource_File_Storage_Database diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php index 860f8698aed..971238920b6 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory storage database resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_File_Storage_Directory_Database extends Mage_Core_Model_Resource_File_Storage_Directory_Database diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php index 86a91f4e005..672b5225658 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Model for synchronization from DB to filesystem * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_File_Storage_File extends Mage_Core_Model_Resource_File_Storage_File diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php index 371de728d58..5b658338d4c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Flag extends Mage_Core_Model_Resource_Flag diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php index 64a6eeb48e4..d02980fdc42 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Store group resource model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Store_Group extends Mage_Core_Model_Resource_Store_Group diff --git a/app/code/core/Mage/Core/Model/Resource/Design.php b/app/code/core/Mage/Core/Model/Resource/Design.php index 1ce5e533582..41c3754c745 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design.php +++ b/app/code/core/Mage/Core/Model/Resource/Design.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core Design Resource Model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php index b93eb384508..f5597110fa7 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * File storage database resource resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_File_Storage_Database extends Mage_Core_Model_Resource_File_Storage_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php index c57e2513a4e..cfe9cb1b106 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory storage database resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_File_Storage_Directory_Database extends Mage_Core_Model_Resource_File_Storage_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php index e54c300606e..c535500264e 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Model for synchronization from DB to filesystem * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_File_Storage_File { @@ -302,5 +302,4 @@ public function removeLockedFile($filePath) @exec("find {$this->getMediaBaseDirectory()} -empty -type d -delete"); // TODO - replace with native PHP? } } - } diff --git a/app/code/core/Mage/Core/Model/Resource/Flag.php b/app/code/core/Mage/Core/Model/Resource/Flag.php index 38c70da49aa..d6bf99c5c79 100644 --- a/app/code/core/Mage/Core/Model/Resource/Flag.php +++ b/app/code/core/Mage/Core/Model/Resource/Flag.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flag model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Flag extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Group.php b/app/code/core/Mage/Core/Model/Resource/Store/Group.php index f46c4e1de7a..6b4c7fe4fe7 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Store group resource model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Store_Group extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php index 7527b30d739..03b93400a4b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php @@ -12,17 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ abstract class Mage_Core_Model_Resource_Type_Db extends Mage_Core_Model_Resource_Type_Abstract { - /** - * Constructor - */ public function __construct() { $this->_entityClass = 'Mage_Core_Model_Resource_Entity_Table'; diff --git a/app/code/core/Mage/Core/Model/Session/Exception.php b/app/code/core/Mage/Core/Model/Session/Exception.php index 4977ba0b9f6..21da808a843 100644 --- a/app/code/core/Mage/Core/Model/Session/Exception.php +++ b/app/code/core/Mage/Core/Model/Session/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,5 +29,4 @@ */ class Mage_Core_Model_Session_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php index 96aa98fef44..3f203f5a846 100644 --- a/app/code/core/Mage/Core/Model/Store/Exception.php +++ b/app/code/core/Mage/Core/Model/Store/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Model_Store_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index ab42bcd0a34..1e99ee56fbf 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Store group model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Store_Group _getResource() * @method Mage_Core_Model_Resource_Store_Group getResource() * @method Mage_Core_Model_Resource_Store_Group_Collection getCollection() @@ -36,10 +40,6 @@ * @method int getGroupId() * @method int getOriginalGroupId() * @method int getOriginalWebsiteId() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Store_Group extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php index 95537d2470f..f87e87594d2 100644 --- a/app/code/core/Mage/Core/Model/Translate/Expr.php +++ b/app/code/core/Mage/Core/Model/Translate/Expr.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Translate expression object * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Translate_Expr { diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index 8a6d01d40ad..e34609ef15e 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Model_Translate_Inline { diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php index 0938fad7bf0..a454784589b 100644 --- a/app/code/core/Mage/Core/controllers/IndexController.php +++ b/app/code/core/Mage/Core/controllers/IndexController.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_IndexController extends Mage_Core_Controller_Front_Action { - public function indexAction() { $this->_forward('noRoute'); diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index a38e70f6aca..69a30dcb937 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php index 8985aa32c53..bcfd1c6a7ec 100644 --- a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/Cron/Exception.php b/app/code/core/Mage/Cron/Exception.php index 4297a17bcb3..3d1760358aa 100644 --- a/app/code/core/Mage/Cron/Exception.php +++ b/app/code/core/Mage/Cron/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cron + * @category Mage + * @package Mage_Cron * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,8 +23,8 @@ * * @category Mage * @package Mage_Cron + * @author Magento Core Team */ class Mage_Cron_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php index 5fae0bf7d48..769c4d30836 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php @@ -12,16 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Cron + * @category Mage + * @package Mage_Cron * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php index cdd78067958..4101f2a9088 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + */ class Mage_Customer_Block_Account_Dashboard_Hello extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php index ea8f51cf22a..b5a26bbd046 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Customer_Block_Account_Dashboard_Info extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php index d098fd3bbf7..b8b95bff75a 100644 --- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php @@ -12,23 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer account navigation sidebar * - * @method $this setEmailValue(string $value) - * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team + * + * @method $this setEmailValue(string $value) */ - class Mage_Customer_Block_Account_Forgotpassword extends Mage_Core_Block_Template { - } diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php index 1de090c964a..71967ad51f1 100644 --- a/app/code/core/Mage/Customer/Block/Address/Edit.php +++ b/app/code/core/Mage/Customer/Block/Address/Edit.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team * * @method $this setBackUrl(string $value) * @method $this setErrorUrl(string $value) diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index d041d230f83..8a472ffdc14 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Block_Address_Renderer_Default extends Mage_Core_Block_Abstract implements Mage_Customer_Block_Address_Renderer_Interface { diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php index 49e022aaa9a..2b56cad46d6 100644 --- a/app/code/core/Mage/Customer/Block/Form/Edit.php +++ b/app/code/core/Mage/Customer/Block/Form/Edit.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Block_Form_Edit extends Mage_Customer_Block_Account_Dashboard { - } diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php index f95a5adc2a1..f5d6624ee4e 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Dob.php +++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method DateTime getTime() * @method $this setTime(string $value) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Gender.php b/app/code/core/Mage/Customer/Block/Widget/Gender.php index 1563711cf1a..cbe7a8b74e9 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Gender.php +++ b/app/code/core/Mage/Customer/Block/Widget/Gender.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Block_Widget_Gender extends Mage_Customer_Block_Widget_Abstract { diff --git a/app/code/core/Mage/Customer/Exception.php b/app/code/core/Mage/Customer/Exception.php index 66a47594529..0e6b1df5148 100644 --- a/app/code/core/Mage/Customer/Exception.php +++ b/app/code/core/Mage/Customer/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + */ class Mage_Customer_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php index 812c6f4b69e..2b8e97a75ea 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Date Data Model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Attribute_Data_Date extends Mage_Eav_Model_Attribute_Data_Date { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php index 550fe25d943..f5d6bbac15f 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute File Data Model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Attribute_Data_File extends Mage_Eav_Model_Attribute_Data_File { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php index fbe0d848fba..f6639ccfa8b 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Hidden text Data Model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Attribute_Data_Hidden extends Mage_Eav_Model_Attribute_Data_Hidden { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php index a5ac65cad8b..97f0289190a 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Image File Data Model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Attribute_Data_Image extends Mage_Eav_Model_Attribute_Data_Image { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php index b8e8799a66d..064c63fa95e 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Model_Customer_Attribute_Source_Group extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php index 0dbf8af5aa6..c71fbf1e626 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer group resource model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Entity_Group extends Mage_Customer_Model_Resource_Group { diff --git a/app/code/core/Mage/Customer/Model/Flowpassword.php b/app/code/core/Mage/Customer/Model/Flowpassword.php index 8e4c2707c8e..ef839839d59 100644 --- a/app/code/core/Mage/Customer/Model/Flowpassword.php +++ b/app/code/core/Mage/Customer/Model/Flowpassword.php @@ -12,23 +12,23 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer flow password info Model * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method Mage_Customer_Model_Resource_Flowpassword_Collection getCollection() * @method $this setEmail(string $value) * @method $this setIp(string $value) * @method $this setRequestedDate(string $value) - * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team */ class Mage_Customer_Model_Flowpassword extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Form.php b/app/code/core/Mage/Customer/Model/Form.php index f5e8f25ec2a..3d0d1e756e6 100644 --- a/app/code/core/Mage/Customer/Model/Form.php +++ b/app/code/core/Mage/Customer/Model/Form.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Form Model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Form extends Mage_Eav_Model_Form { diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php index c93179597bd..30f0b5f96b9 100644 --- a/app/code/core/Mage/Customer/Model/Group.php +++ b/app/code/core/Mage/Customer/Model/Group.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer group model * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method Mage_Customer_Model_Resource_Group _getResource() * @method Mage_Customer_Model_Resource_Group getResource() * @method Mage_Customer_Model_Resource_Group_Collection getCollection() @@ -29,10 +33,6 @@ * @method string getCustomerGroupCode() * @method $this setCustomerGroupCode(string $value) * @method $this setTaxClassId(int $value) - * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team */ class Mage_Customer_Model_Group extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php b/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php index 2dd93c72197..8a37668d4a8 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php +++ b/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer flow password info resource model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Flowpassword extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Resource/Group.php b/app/code/core/Mage/Customer/Model/Resource/Group.php index 29a3ecbe219..bc33a518c7e 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer group resource model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Group extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php index 258b1e511c5..bb5cacf2bf3 100644 --- a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php +++ b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $installer */ diff --git a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php index 96a92de2b38..a379263a448 100644 --- a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php +++ b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $this */ $installer = $this; - $installer->startSetup(); $connection = $installer->getConnection(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php index 62106cfdd8d..37537690a9f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Customer + * @category Mage + * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php index 002ea41f77c..af3e2f703f3 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php @@ -12,25 +12,25 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch export model * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Batch_Export _getResource() * @method Mage_Dataflow_Model_Resource_Batch_Export getResource() * @method int getBatchId() * @method Mage_Dataflow_Model_Batch_Export setBatchId(int $value) * @method int getStatus() * @method Mage_Dataflow_Model_Batch_Export setStatus(int $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Batch_Export extends Mage_Dataflow_Model_Batch_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php index 1d814e8b01d..5fa00aacee9 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php @@ -12,25 +12,25 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch import model * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Batch_Import _getResource() * @method Mage_Dataflow_Model_Resource_Batch_Import getResource() * @method int getBatchId() * @method Mage_Dataflow_Model_Batch_Import setBatchId(int $value) * @method int getStatus() * @method Mage_Dataflow_Model_Batch_Import setStatus(int $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Batch_Import extends Mage_Dataflow_Model_Batch_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php index 472a0b5da5c..588928e19e7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert.php +++ b/app/code/core/Mage/Dataflow/Model/Convert.php @@ -27,7 +27,6 @@ */ class Mage_Dataflow_Model_Convert { - static public function convert($class, $method, $data, array $vars= []) { if (is_string($class)) { @@ -42,5 +41,4 @@ static public function convert($class, $method, $data, array $vars= []) $action->run(); return $action->getData(); } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php index efaec29ca22..f5d60ffbda5 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php @@ -30,7 +30,6 @@ abstract class Mage_Dataflow_Model_Convert_Action_Abstract implements Mage_Dataflow_Model_Convert_Action_Interface { - /** * Action parameters * diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php index 3ea2a8af310..04d2bc672e5 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php @@ -29,7 +29,6 @@ abstract class Mage_Dataflow_Model_Convert_Adapter_Abstract extends Mage_Dataflow_Model_Convert_Container_Abstract implements Mage_Dataflow_Model_Convert_Adapter_Interface { - /** * Adapter resource instance * diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php index 89c26644406..618b3ab29e0 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Adapter_Http extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function load() { if (!$_FILES) { @@ -88,5 +87,4 @@ public function loadFile() } return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php index 5b5e7b77f42..098e4392d54 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php @@ -62,5 +62,4 @@ public function save() // no save implemented return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php index 24117061d6b..d223e313a59 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php @@ -27,7 +27,6 @@ */ class Mage_Dataflow_Model_Convert_Adapter_Zend_Cache extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function getResource() { if (!$this->_resource) { @@ -50,5 +49,4 @@ public function save() $this->getResource()->save($this->getData(), $this->getVar('id')); return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php index 45c3df1b288..cf58c13fbe6 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Adapter_Zend_Db extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function getResource() { if (!$this->_resource) { @@ -45,5 +44,4 @@ public function save() { return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php index 9b1a766db3c..13dc0128691 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Dataflow_Model_Convert_Container_Collection { - protected $_items = []; protected $_defaultClass = 'Mage_Dataflow_Model_Convert_Container_Generic'; @@ -65,5 +64,4 @@ public function hasItem($name) { return isset($this->_items[$name]); } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php index b1f31bd0c9f..f879fdd2ae2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Container_Generic extends Mage_Dataflow_Model_Convert_Container_Abstract { - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php index e6f0d22d183..64b1a6eb378 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Exception extends Varien_Exception { - const NOTICE = 'NOTICE'; const WARNING = 'WARNING'; const ERROR = 'ERROR'; @@ -71,5 +70,4 @@ public function setPosition($position) $this->_position = $position; return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php index 156d2a76073..36bf0f38f96 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Iterator_Http extends Mage_Dataflow_Model_Convert_Adapter_Abstract { @@ -52,5 +52,4 @@ public function load() } return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 975025c4679..7a122b4f87c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Parser_Xml_Excel extends Mage_Dataflow_Model_Convert_Parser_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index 5bbbc89bda0..851d19b7d9c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -27,7 +27,6 @@ abstract class Mage_Dataflow_Model_Convert_Profile_Abstract implements Mage_Dataflow_Model_Convert_Profile_Interface { - protected $_actions; protected $_containers; diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php index 434346f4777..9b3394c516a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Dataflow_Model_Convert_Profile_Collection { - protected $_xml; protected $_containers; @@ -192,5 +191,4 @@ public function importProfileXml($name) return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php index 6c24c9e413d..3862eaa735f 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,11 +25,10 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Validator_Dryrun extends Mage_Dataflow_Model_Convert_Validator_Abstract { - public function validate() { if ($this->getVar('dry_run') || $this->getProfile()->getDryRun()) { @@ -37,5 +36,4 @@ public function validate() } return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php index 780c093d7da..111d1043949 100644 --- a/app/code/core/Mage/Dataflow/Model/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Import.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DataFlow Import Model * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Import _getResource() * @method Mage_Dataflow_Model_Resource_Import getResource() * @method int getSessionId() @@ -31,17 +35,11 @@ * @method Mage_Dataflow_Model_Import setValue(string $value) * @method int getStatus() * @method Mage_Dataflow_Model_Import setStatus(int $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Import extends Mage_Core_Model_Abstract { - protected function _construct() { $this->_init('dataflow/import'); } - } diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php index 5eb7d738cb0..c2fb7804fdc 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch export resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team * @deprecated */ class Mage_Dataflow_Model_Mysql4_Batch_Export extends Mage_Dataflow_Model_Resource_Batch_Export diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php index 1d9363d9cbb..17b12665c56 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch import resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team * @deprecated */ class Mage_Dataflow_Model_Mysql4_Batch_Import extends Mage_Dataflow_Model_Resource_Batch_Import diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php index f948929dbfe..2e3cb86dc4a 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DataFlow Import resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team * @deprecated */ class Mage_Dataflow_Model_Mysql4_Import extends Mage_Dataflow_Model_Resource_Import diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php index cc5a38d11d8..e5191f71b41 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert history resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team * @deprecated */ class Mage_Dataflow_Model_Mysql4_Profile_History extends Mage_Dataflow_Model_Resource_Profile_History diff --git a/app/code/core/Mage/Dataflow/Model/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Profile/History.php index 7d02ee47d70..ceea333a163 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Profile/History.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert history * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Profile_History _getResource() * @method Mage_Dataflow_Model_Resource_Profile_History getResource() * @method int getProfileId() @@ -31,10 +35,6 @@ * @method Mage_Dataflow_Model_Profile_History setUserId(int $value) * @method string getPerformedAt() * @method Mage_Dataflow_Model_Profile_History setPerformedAt(string $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Profile_History extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php index db9280e8d5a..52031851def 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch export resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Resource_Batch_Export extends Mage_Dataflow_Model_Resource_Batch_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php index 7baf595c171..f02873972df 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Dataflow Batch import resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Resource_Batch_Import extends Mage_Dataflow_Model_Resource_Batch_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Import.php index 0ff8e6b57dc..53083d5e750 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DataFlow Import resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Resource_Import extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php index ae1797c4d22..155d9ed807a 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -12,24 +12,23 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert history resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Resource_Profile_History extends Mage_Core_Model_Resource_Db_Abstract { /** * Define main table - * */ protected function _construct() { diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php index dd84872e3a4..7e25b5f7cd0 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php @@ -12,36 +12,36 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert HTTP adapter * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ - class Mage_Dataflow_Model_Session_Adapter_Http extends Mage_Dataflow_Model_Convert_Adapter_Abstract - { - public function load() - { - if (!$_FILES) { +class Mage_Dataflow_Model_Session_Adapter_Http extends Mage_Dataflow_Model_Convert_Adapter_Abstract +{ + public function load() + { + if (!$_FILES) { ?>
File to upload:
setAllowedExtensions(['csv','xml']); - $path = Mage::app()->getConfig()->getTempVarDir().'/import/'; + $uploader->setAllowedExtensions(['csv', 'xml']); + $path = Mage::app()->getConfig()->getTempVarDir() . '/import/'; $uploader->save($path); if ($uploadFile = $uploader->getUploadedFileName()) { $session = Mage::getModel('dataflow/session'); @@ -50,31 +50,14 @@ public function load() $session->setUserId(Mage::getSingleton('admin/session')->getUser()->getId()); $session->save(); $sessionId = $session->getId(); - $newFilename = 'import_'.$sessionId.'_'.$uploadFile; - rename($path.$uploadFile, $path.$newFilename); + $newFilename = 'import_' . $sessionId . '_' . $uploadFile; + rename($path . $uploadFile, $path . $newFilename); $session->setFile($newFilename); $session->save(); - $this->setData(file_get_contents($path.$newFilename)); + $this->setData(file_get_contents($path . $newFilename)); Mage::register('current_dataflow_session_id', $sessionId); - /* - $read = @fopen($path.$newFilename, "r"); - if ($read) { - $i = 0; - while (!feof($read)) { - - $buffer = fgets($read, 4096); - $import = Mage::getModel('dataflow/import'); - $import->setSerialNumber($i); - $import->setSessionId($sessionId); - $import->setSessionId($value); - $i++; - } - fclose($read); - } - */ } - } - return $this; - } - - } + } + return $this; + } +} diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php index e009e5fb153..08d59f9648d 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php @@ -130,5 +130,4 @@ public function unparse() return $this; } - } diff --git a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php index 14e9e61a709..89dd3cd0264 100644 --- a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php index 5ffb55fe4d9..54d6dfdb5b7 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Dataflow + * @category Mage + * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php index 60300fce952..7f39eae97b4 100644 --- a/app/code/core/Mage/Directory/Exception.php +++ b/app/code/core/Mage/Directory/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Directory + * @author Magento Core Team + */ class Mage_Directory_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php index eef5744f4f0..446b9612fdc 100644 --- a/app/code/core/Mage/Directory/Model/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Country/Format.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory country format model * + * @category Mage + * @package Mage_Directory + * @author Magento Core Team + * * @method Mage_Directory_Model_Resource_Country_Format _getResource() * @method Mage_Directory_Model_Resource_Country_Format getResource() * @method Mage_Directory_Model_Resource_Country_Format_Collection getCollection() @@ -30,14 +34,9 @@ * @method $this setType(string $value) * @method string getFormat() * @method $this setFormat(string $value) - * - * @category Mage - * @package Mage_Directory - * @author Magento Core Team */ class Mage_Directory_Model_Country_Format extends Mage_Core_Model_Abstract { - protected function _construct() { $this->_init('directory/country_format'); diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php index 47981a3733c..6ab3d33c83d 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Filter.php +++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Currency filter * - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Model_Currency_Filter implements Zend_Filter_Interface { diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php index 55c11522e4e..1b7b3d6d9fe 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php index b9623fe71e4..a7347dfa7ee 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory country format resource model * - * @category Mage - * @package Mage_Directory - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team * @deprecated */ class Mage_Directory_Model_Mysql4_Country_Format extends Mage_Directory_Model_Resource_Country_Format diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Format.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php index e9f182c8d06..d599775eaa1 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory country format resource model * - * @category Mage - * @package Mage_Directory - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Model_Resource_Country_Format extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php index 97a7a7f3ca7..d1b8fe4334c 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php index 0a7efd66bd0..7143f715644 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -12,15 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * @var Mage_Core_Model_Resource_Setup $this - */ +/** @var Mage_Core_Model_Resource_Setup $this */ $installer = $this; $installer->getConnection()->insert( $installer->getTable('core/config_data'), diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php index 014bf4a3a39..bf712827e01 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php index dbe001d5a8f..4426cc7277b 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Directory + * @category Mage + * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php index c27aa4a0c78..9ae6ba32855 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 5ed0b7c74fc..51e878c88ee 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml catalog product downloadable items tab and form * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface { diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php index cc213e849eb..268e3acac64 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php index 6bddc4c7706..1272cc63e65 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php index de926df43b2..026d19c0182 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable order item render block * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Sales_Order_Item_Renderer_Downloadable extends Mage_Sales_Block_Order_Item_Renderer_Default { diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php index 11243d405f9..83a75c765a9 100644 --- a/app/code/core/Mage/Downloadable/Helper/Download.php +++ b/app/code/core/Mage/Downloadable/Helper/Download.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Products Download Helper * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Helper_Download extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index 935a286c3af..b99829dc04a 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Products File Helper * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Helper_File extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php index 026c7fa5126..b09f3ecf7ed 100644 --- a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php @@ -12,22 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable product data retriever * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_CatalogIndex_Data_Downloadable extends Mage_CatalogIndex_Model_Data_Virtual { - /** * Retrieve product type code * diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php index a37955060f6..d62b0cc8146 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable File upload controller * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Adminhtml_Downloadable_FileController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php index 805d5dcb506..5acbef895dd 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Adminhtml/controllers/Catalog/ProductController.php'; @@ -23,16 +23,12 @@ /** * Adminhtml downloadable product edit * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Adminhtml_Downloadable_Product_EditController extends Mage_Adminhtml_Catalog_ProductController { - /** - * Varien class constructor - * - */ protected function _construct() { $this->setUsedModuleName('Mage_Downloadable'); diff --git a/app/code/core/Mage/Downloadable/controllers/CustomerController.php b/app/code/core/Mage/Downloadable/controllers/CustomerController.php index a633b3959cb..2eae19a4721 100644 --- a/app/code/core/Mage/Downloadable/controllers/CustomerController.php +++ b/app/code/core/Mage/Downloadable/controllers/CustomerController.php @@ -27,7 +27,6 @@ */ class Mage_Downloadable_CustomerController extends Mage_Core_Controller_Front_Action { - /** * Check customer authentication */ diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php index 5604b879aa5..93bc652046b 100644 --- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php +++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php @@ -12,22 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Download controller * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_DownloadController extends Mage_Core_Controller_Front_Action { - /** * Return core session object * diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php index 3a109e053d4..df6cd82ecab 100644 --- a/app/code/core/Mage/Downloadable/controllers/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/FileController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php'; @@ -23,9 +23,9 @@ /** * Downloadable File upload controller * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated after 1.4.2.0 Mage_Downloadable_Adminhtml_Downloadable_FileController is used */ class Mage_Downloadable_FileController extends Mage_Downloadable_Adminhtml_Downloadable_FileController diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php index 6c0952c9d5f..43526221214 100644 --- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php'; @@ -23,9 +23,9 @@ /** * Adminhtml downloadable product edit * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated after 1.4.2.0 Mage_Downloadable_Adminhtml_Downloadable_Product_EditController is used */ class Mage_Downloadable_Product_EditController extends Mage_Downloadable_Adminhtml_Downloadable_Product_EditController diff --git a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php index b890940d646..4391c03b7a0 100644 --- a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php @@ -12,11 +12,12 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ $installer = $this; diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php index 79522de0132..6f74071186b 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Downloadable + * @category Mage + * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** @var Mage_Catalog_Model_Resource_Setup $this */ +/** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php index 38a9339399b..938697ee2ec 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php @@ -27,7 +27,6 @@ */ abstract class Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract extends Mage_Adminhtml_Block_Widget { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php index c4cf34f40e2..d5de0b08045 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php @@ -27,7 +27,6 @@ */ abstract class Mage_Eav_Block_Adminhtml_Attribute_Grid_Abstract extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php index a203fd02ab6..9dc187286d2 100644 --- a/app/code/core/Mage/Eav/Exception.php +++ b/app/code/core/Mage/Eav/Exception.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php index a255a455b6a..94e1939f41c 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php index 5bb01ba121e..2f8c45df798 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php index cff178fe3bd..0794f2d16e6 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php index b08d4b5d64e..27a5c510ab7 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php index 7e206b0ccbc..ac719dc3916 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php index fdac9e36a4f..f510bc106d7 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index 085d1b430a4..c782dbc9fff 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php index 36a316a86b8..109658a8349 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php index f2017d17995..fa7d00d10b7 100644 --- a/app/code/core/Mage/Eav/Model/Entity.php +++ b/app/code/core/Mage/Eav/Model/Entity.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php index 768d9c1c0b8..df68c96bf19 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php index 374bc6a29bd..e6e09c02b49 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +27,4 @@ */ class Mage_Eav_Model_Entity_Attribute_Backend_Default extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - } diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php index e56538e93bc..b354f13ddb6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php index 2906b05803c..b68c0910954 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php @@ -27,7 +27,6 @@ */ class Mage_Eav_Model_Entity_Attribute_Backend_Time_Created extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - /** * Returns date format if it matches a certain mask. * @param string $date diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php index bac0582ea1b..e50df684f03 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php index 1dd751904c8..2fc5b712f8a 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php @@ -27,7 +27,6 @@ */ abstract class Mage_Eav_Model_Entity_Attribute_Frontend_Abstract implements Mage_Eav_Model_Entity_Attribute_Frontend_Interface { - /** * Reference to the attribute instance * diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php index 0907f8345a8..ede3f61e13a 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php index d89042ddc65..9fd2416a5b2 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,5 +25,4 @@ */ class Mage_Eav_Model_Entity_Attribute_Frontend_Default extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { - } diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php index d4e9ef5b50f..18e36cd470d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php @@ -15,10 +15,14 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Eav + * @author Magento Core Team + * * @method Mage_Eav_Model_Resource_Entity_Attribute_Group _getResource() * @method Mage_Eav_Model_Resource_Entity_Attribute_Group getResource() * @method Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection getCollection() @@ -34,10 +38,6 @@ * @method int getSortOrder() * @method $this setSortOrder(int $value) * @method int getDefaultId() - * - * @category Mage - * @package Mage_Eav - * @author Magento Core Team */ class Mage_Eav_Model_Entity_Attribute_Group extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Eav/Model/Form.php b/app/code/core/Mage/Eav/Model/Form.php index ed56b7bfcf8..c1cae2a3f46 100644 --- a/app/code/core/Mage/Eav/Model/Form.php +++ b/app/code/core/Mage/Eav/Model/Form.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Form/Element.php b/app/code/core/Mage/Eav/Model/Form/Element.php index d4177d687b3..7141c29e9cc 100644 --- a/app/code/core/Mage/Eav/Model/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Form/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Form/Fieldset.php index f2ba5b3c9db..4db8e076c7c 100644 --- a/app/code/core/Mage/Eav/Model/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Form/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php index bfb31f8a6a0..007ce16fcfe 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php index 1dd911551a8..5660bfaba5c 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php index 1302c03f6d4..b6a17a77e78 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php index b8263f9b1e3..4306f93019b 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php index 5792d7510d4..33f969e8a9a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php index 766b68f599d..ada3b35d3d5 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php index c80d7da0ff8..998507b77dd 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php @@ -15,12 +15,11 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php index ead618bf3b3..8b188368a0b 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php index 1396f77084d..55d03966ca5 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php index 4c66908a9c5..3156054e613 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php index 8d3d8db8afe..886c1c08ae8 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php index 01c240f10c2..97c79975dc0 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php @@ -12,17 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @deprecated after 1.3.2.4 * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team + * @deprecated after 1.3.2.4 */ class Mage_GiftMessage_Block_Message_Form extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php index c3d431de942..bd9c669c3b3 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php @@ -12,17 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @deprecated after 1.3.2.4 * @category Mage * @package Mage_GiftMessage * @author Magento Core Team + * @deprecated after 1.3.2.4 * * @method $this setCanDisplayContainer(bool $value) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php index baa0e1ab36e..1beaa52476d 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team * * @method $this setDontDisplayContainer(bool $value) */ diff --git a/app/code/core/Mage/GiftMessage/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php index 20dacba7f4e..c6a45f8b0b2 100644 --- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php +++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php @@ -12,17 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @deprecated after 1.3.2.4 * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team + * @deprecated after 1.3.2.4 */ class Mage_GiftMessage_IndexController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php index 14f403e9734..000d83cbeb7 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php @@ -12,14 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GiftMessage + * @category Mage + * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $installer */ - $installer = $this; $installer->startSetup(); diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php index db200887393..e335f1938ac 100644 --- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php +++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GoogleAnalytics + * @category Mage + * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php b/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php index b8909bdb908..1e41f23aca2 100644 --- a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_GoogleAnalytics + * @category Mage + * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run("INSERT INTO `{$this->getTable('core/config_data')}` (scope, scope_id, path, value)" diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php index f2618ebe4e0..df46569fee6 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php @@ -12,24 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export edit block * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Block_Adminhtml_Export_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php index ef8aee03cf4..e33818257ff 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export edit form block * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Block_Adminhtml_Export_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php index 4eaf478cac8..d7d8653899b 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export filter block * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team * * @method bool hasOperation() */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php index edcf7dd5872..a20bb1e0fe4 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import edit block * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Block_Adminhtml_Import_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php index 59233d2f675..42b5ba66e0e 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import edit form block * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Block_Adminhtml_Import_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/ImportExport/Model/Export.php b/app/code/core/Mage/ImportExport/Model/Export.php index fe78fbe8fa1..eefb196d9f1 100644 --- a/app/code/core/Mage/ImportExport/Model/Export.php +++ b/app/code/core/Mage/ImportExport/Model/Export.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Export extends Mage_ImportExport_Model_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php index edc7d6105d2..2cf9b0e99bc 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export entity product type grouped model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Export_Entity_Product_Type_Grouped extends Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index 24ab7fa4e99..7358f09c55d 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Import extends Mage_ImportExport_Model_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php index a77e060dbbb..eca2d95ea59 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import entity grouped product type model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Import_Entity_Product_Type_Grouped extends Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php index 188fda46612..07acc32ea62 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source export entity model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Source_Export_Entity { diff --git a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php index e5deb95fedd..4c11840f9e9 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model of export formats * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Source_Export_Format { diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php index b6e72bb16e4..caecec3ed5b 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source import entity model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Source_Import_Entity { diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index d5cfd4ab768..166e9b0057e 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export controller * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Adminhtml_ExportController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index 585194c7e3a..bd6abbf14e5 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import controller * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Adminhtml_ImportController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php index 338b7b86f29..62175e3cea6 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ImportExport + * @category Mage + * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_ImportExport_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php index 9013b986a74..8950852d45c 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Index + * @author Magento Core Team + */ class Mage_Index_Block_Adminhtml_Process_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'process_id'; diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php index 56b173e9697..a798e21245a 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Index + * @author Magento Core Team + */ class Mage_Index_Block_Adminhtml_Process_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 9f0012a4428..7e917d5fbaa 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Index + * @author Magento Core Team + */ class Mage_Index_Block_Adminhtml_Process_Grid extends Mage_Adminhtml_Block_Widget_Grid { /** diff --git a/app/code/core/Mage/Index/Exception.php b/app/code/core/Mage/Index/Exception.php index e50cc0c51ef..d8fafc9c21b 100644 --- a/app/code/core/Mage/Index/Exception.php +++ b/app/code/core/Mage/Index/Exception.php @@ -12,20 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Exception -* * @category Mage * @package Mage_Index * @author Magento Core Team */ class Mage_Index_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php index 2be362c4040..325b825075a 100644 --- a/app/code/core/Mage/Index/Model/Event.php +++ b/app/code/core/Mage/Index/Model/Event.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Index + * @author Magento Core Team + * * @method Mage_Index_Model_Resource_Event _getResource() * @method Mage_Index_Model_Resource_Event getResource() * @method $this setType(string $value) @@ -33,10 +37,6 @@ * @method Varien_Object getDataObject() * @method $this setDataObject(Varien_Object $value) * @method bool hasCreatedAt() - * - * @category Mage - * @package Mage_Index - * @author Magento Core Team */ class Mage_Index_Model_Event extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index 7a0f2707a1c..fa3c61b71bb 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Indexer strategy + * + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Indexer { diff --git a/app/code/core/Mage/Index/Model/Lock/Storage/Db.php b/app/code/core/Mage/Index/Model/Lock/Storage/Db.php index ee016ef7fb3..b14a9901987 100644 --- a/app/code/core/Mage/Index/Model/Lock/Storage/Db.php +++ b/app/code/core/Mage/Index/Model/Lock/Storage/Db.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database lock storage * - * @category Mage - * @package Mage_Core - * @author Magento Core Team core@magentocommerce.com + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Lock_Storage_Db implements Mage_Index_Model_Lock_Storage_Interface { diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event.php b/app/code/core/Mage/Index/Model/Mysql4/Event.php index 457f2d3d545..13ae5872b2b 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Event.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team * @deprecated */ class Mage_Index_Model_Mysql4_Event extends Mage_Index_Model_Resource_Event diff --git a/app/code/core/Mage/Index/Model/Resource/Event.php b/app/code/core/Mage/Index/Model/Resource/Event.php index b2e58616a1d..f0c009b18f5 100644 --- a/app/code/core/Mage/Index/Model/Resource/Event.php +++ b/app/code/core/Mage/Index/Model/Resource/Event.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index Event Resource Model * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_Event extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php index ba4414b8cd9..c4b52eb09fc 100644 --- a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php @@ -12,15 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Index + * @category Mage + * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Index_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Install/Block/End.php b/app/code/core/Mage/Install/Block/End.php index 925d704cd63..a453c5b3eb8 100644 --- a/app/code/core/Mage/Install/Block/End.php +++ b/app/code/core/Mage/Install/Block/End.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Installation ending block * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Block_End extends Mage_Install_Block_Abstract { diff --git a/app/code/core/Mage/Install/Controller/Router/Install.php b/app/code/core/Mage/Install/Controller/Router/Install.php index 83a9f1a1955..7a3bd0a77b5 100644 --- a/app/code/core/Mage/Install/Controller/Router/Install.php +++ b/app/code/core/Mage/Install/Controller/Router/Install.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Install + * @author Magento Core Team + */ class Mage_Install_Controller_Router_Install extends Mage_Core_Controller_Varien_Router_Standard { /** diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php index b3f6b0cdca7..01ee8d60672 100644 --- a/app/code/core/Mage/Install/Model/Config.php +++ b/app/code/core/Mage/Install/Model/Config.php @@ -27,7 +27,6 @@ */ class Mage_Install_Model_Config extends Varien_Simplexml_Config { - const XML_PATH_WIZARD_STEPS = 'wizard/steps'; const XML_PATH_CHECK_WRITEABLE = 'check/filesystem/writeable'; const XML_PATH_CHECK_EXTENSIONS = 'check/php/extensions'; @@ -139,5 +138,4 @@ public function getExtensionsForCheck() return $res; } - } diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php index 05b69953c5d..cd86aa9adb3 100644 --- a/app/code/core/Mage/Install/Model/Installer/Console.php +++ b/app/code/core/Mage/Install/Model/Installer/Console.php @@ -26,7 +26,6 @@ */ class Mage_Install_Model_Installer_Console extends Mage_Install_Model_Installer_Abstract { - /** * Available options * @@ -471,5 +470,4 @@ public function checkConsole($url=null) header('Location: ' . $url); return false; } - } diff --git a/app/code/core/Mage/Install/Model/Installer/Data.php b/app/code/core/Mage/Install/Model/Installer/Data.php index a5e6d9af20a..bbfb3f9c10e 100644 --- a/app/code/core/Mage/Install/Model/Installer/Data.php +++ b/app/code/core/Mage/Install/Model/Installer/Data.php @@ -55,5 +55,4 @@ public function getErrors() { return $this->_errors; } - } diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php index 3ac0dc1854a..3f683025b24 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db.php +++ b/app/code/core/Mage/Install/Model/Installer/Db.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Model_Installer_Db extends Mage_Install_Model_Installer_Abstract { diff --git a/app/code/core/Mage/Install/Model/Installer/Env.php b/app/code/core/Mage/Install/Model/Installer/Env.php index c2cc0f8c990..16c05851285 100644 --- a/app/code/core/Mage/Install/Model/Installer/Env.php +++ b/app/code/core/Mage/Install/Model/Installer/Env.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Model_Installer_Env extends Mage_Install_Model_Installer_Abstract { diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php index d9b874e25f9..8f411083acc 100644 --- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php +++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Model_Installer_Filesystem extends Mage_Install_Model_Installer_Abstract { diff --git a/app/code/core/Mage/Install/controllers/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php index b9a4ca589d8..68ff7f4eb61 100644 --- a/app/code/core/Mage/Install/controllers/IndexController.php +++ b/app/code/core/Mage/Install/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Install + * @category Mage + * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_IndexController extends Mage_Install_Controller_Action { - public function preDispatch() { $this->setFlag('', self::FLAG_NO_CHECK_INSTALLATION, true); @@ -38,5 +37,4 @@ public function indexAction() { $this->_forward('begin', 'wizard', 'install'); } - } diff --git a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php index fe4e3b48662..f4faa862ddd 100644 --- a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php index 674c88b5711..28fa4365a63 100644 --- a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php @@ -15,12 +15,11 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index 8f5d344366d..e63cb3faef4 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Media + * @category Mage + * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Media - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Media_Model_File_Image extends Mage_Core_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 5925fbee322..91ca628052e 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Media + * @category Mage + * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Media - * @author Magento Core Team + * @author Magento Core Team * * @method string getFileName() * @method $this setFileName(string $value) @@ -32,28 +32,24 @@ class Mage_Media_Model_Image extends Mage_Core_Model_Abstract { /** * Image config instance - * * @var Mage_Media_Model_Image_Config_Interface */ protected $_config; /** * Image resource - * * @var resource */ protected $_image; /** * Tmp image resource - * * @var resource */ protected $_tmpImage; /** * Params for filename generation - * * @var array */ protected $_params = []; @@ -65,7 +61,6 @@ protected function _construct() /** * Set media image config instance - * * @param Mage_Media_Model_Image_Config_Interface $config * @return Mage_Media_Model_Image */ @@ -77,7 +72,6 @@ public function setConfig(Mage_Media_Model_Image_Config_Interface $config) /** * Retrieve media image config instance - * * @return Mage_Media_Model_Image_Config_Interface */ public function getConfig() diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php index 2f6d98a4bf6..64019abee49 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** * Queue link table name * diff --git a/app/code/core/Mage/Newsletter/Model/Template/Filter.php b/app/code/core/Mage/Newsletter/Model/Template/Filter.php index e811ff141a9..a0d7dc21ff4 100644 --- a/app/code/core/Mage/Newsletter/Model/Template/Filter.php +++ b/app/code/core/Mage/Newsletter/Model/Template/Filter.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Newsletter + * @category Mage + * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Template Filter Model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Template_Filter extends Mage_Widget_Model_Template_Filter { diff --git a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php index d88947f8de0..9a3659e936d 100644 --- a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Newsletter + * @category Mage + * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php index 105db96d4e8..3bece6c9dfd 100644 --- a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php @@ -12,14 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Newsletter + * @category Mage + * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; $newsletterContent = << + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php index 2be921ff7d1..089c106c45d 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php index 7559605e04b..58708d3dfd5 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php index 03f94d62753..873e31ee345 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php index f3d2fd2bdfb..7cc3f0329ac 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php index 4cb6be73540..4b22ec8d84f 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Exception.php b/app/code/core/Mage/Oauth/Exception.php index b606ed8fcd2..02987ff6537 100644 --- a/app/code/core/Mage/Oauth/Exception.php +++ b/app/code/core/Mage/Oauth/Exception.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * oAuth Exception - * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Exception extends Zend_Exception { diff --git a/app/code/core/Mage/Oauth/controllers/InitiateController.php b/app/code/core/Mage/Oauth/controllers/InitiateController.php index 6f225a976ff..a396bff3efd 100644 --- a/app/code/core/Mage/Oauth/controllers/InitiateController.php +++ b/app/code/core/Mage/Oauth/controllers/InitiateController.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * oAuth initiate controller - * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_InitiateController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php index b38b8f8ddee..e49bd73888e 100644 --- a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php @@ -12,17 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Oauth + * @category Mage + * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ -/** - * Installation of OAuth module tables + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Oauth_Model_Resource_Setup $this */ $installer = $this; - $installer->startSetup(); /** @var Varien_Db_Adapter_Pdo_Mysql $adapter */ diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php index 8c74bff2273..deee4a7027b 100644 --- a/app/code/core/Mage/Page/Block/Html.php +++ b/app/code/core/Mage/Page/Block/Html.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Page + * @category Mage + * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Page - * @author Magento Core Team + * @author Magento Core Team * * @method string getLayoutCode() * @method bool getIsHandle() diff --git a/app/code/core/Mage/Page/Block/Html/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php index d16aef41ee5..b5cdb519899 100644 --- a/app/code/core/Mage/Page/Block/Html/Footer.php +++ b/app/code/core/Mage/Page/Block/Html/Footer.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Page + * @category Mage + * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Page - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Page_Block_Html_Footer extends Mage_Core_Block_Template { - /** * @var string */ diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index 7e2e1b81b2b..ac12858e347 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Page + * @category Mage + * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index e1cf23c7126..1fb96206193 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Page + * @category Mage + * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Template/Container.php b/app/code/core/Mage/Page/Block/Template/Container.php index ddac9a76f60..661d7b142c4 100644 --- a/app/code/core/Mage/Page/Block/Template/Container.php +++ b/app/code/core/Mage/Page/Block/Template/Container.php @@ -27,7 +27,6 @@ */ class Mage_Page_Block_Template_Container extends Mage_Core_Block_Template { - /** * Set default template * diff --git a/app/code/core/Mage/Page/Block/Template/Links/Block.php b/app/code/core/Mage/Page/Block/Template/Links/Block.php index 2df2ebb7753..3af27bcae77 100644 --- a/app/code/core/Mage/Page/Block/Template/Links/Block.php +++ b/app/code/core/Mage/Page/Block/Template/Links/Block.php @@ -27,7 +27,6 @@ */ class Mage_Page_Block_Template_Links_Block extends Mage_Core_Block_Template { - /** * First link flag * diff --git a/app/code/core/Mage/Page/Helper/Html.php b/app/code/core/Mage/Page/Helper/Html.php index 0261f4e9adf..2047c6606df 100644 --- a/app/code/core/Mage/Page/Helper/Html.php +++ b/app/code/core/Mage/Page/Helper/Html.php @@ -12,18 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Page + * @category Mage + * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Html helper - * - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Helper_Html extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/PageCache/Helper/Data.php b/app/code/core/Mage/PageCache/Helper/Data.php index 896d1a0c17c..fa3070f9594 100644 --- a/app/code/core/Mage/PageCache/Helper/Data.php +++ b/app/code/core/Mage/PageCache/Helper/Data.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PageCache + * @category Mage + * @package Mage_PageCache * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Page cache data helper * - * @category Mage - * @package Mage_PageCache - * @author Magento Core Team + * @category Mage + * @package Mage_PageCache + * @author Magento Core Team */ class Mage_PageCache_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index 127d1388f2b..e92877b3c19 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paygate + * @category Mage + * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paygate data helper + * + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team */ class Mage_Paygate_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php index a1e7914a687..38bbe32e4df 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paygate + * @category Mage + * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team + * * @method Mage_Paygate_Model_Resource_Authorizenet_Debug _getResource() * @method Mage_Paygate_Model_Resource_Authorizenet_Debug getResource() * @method string getRequestBody() @@ -33,10 +37,6 @@ * @method Mage_Paygate_Model_Authorizenet_Debug setRequestDump(string $value) * @method string getResultDump() * @method Mage_Paygate_Model_Authorizenet_Debug setResultDump(string $value) - * - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team */ class Mage_Paygate_Model_Authorizenet_Debug extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php index 27931bb6756..1a4cd081ee4 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paygate + * @category Mage + * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team * @deprecated */ class Mage_Paygate_Model_Mysql4_Authorizenet_Debug extends Mage_Paygate_Model_Resource_Authorizenet_Debug diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php index 5996c2612e8..1f6360157b4 100644 --- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php @@ -12,25 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paygate + * @category Mage + * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Resource authorizenet debug model * - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team */ class Mage_Paygate_Model_Resource_Authorizenet_Debug extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('paygate/authorizenet_debug', 'debug_id'); diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php index d9fe4b9e5f6..5f6c002d90d 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paygate + * @category Mage + * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Payment/Block/Form.php b/app/code/core/Mage/Payment/Block/Form.php index ec2b7a87c68..5c8d4b728a7 100644 --- a/app/code/core/Mage/Payment/Block/Form.php +++ b/app/code/core/Mage/Payment/Block/Form.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payment method form base block + * + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ class Mage_Payment_Block_Form extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php index ba3b315c65d..4195b54c5b0 100644 --- a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php +++ b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php @@ -27,7 +27,6 @@ */ class Mage_Payment_Block_Form_Banktransfer extends Mage_Payment_Block_Form { - /** * Instructions text * diff --git a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php index 6097610eb54..7b9146cf60b 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php @@ -27,7 +27,6 @@ */ class Mage_Payment_Block_Form_Cashondelivery extends Mage_Payment_Block_Form { - /** * Instructions text * diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php index 7dc8aefd2fb..c77c455b1ca 100644 --- a/app/code/core/Mage/Payment/Block/Info.php +++ b/app/code/core/Mage/Payment/Block/Info.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Base payment iformation block * + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + * * @method bool hasIsSecureMode() */ class Mage_Payment_Block_Info extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Payment/Block/Info/Checkmo.php b/app/code/core/Mage/Payment/Block/Info/Checkmo.php index 6bbbace516d..2592e223bbe 100644 --- a/app/code/core/Mage/Payment/Block/Info/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Info/Checkmo.php @@ -25,7 +25,6 @@ */ class Mage_Payment_Block_Info_Checkmo extends Mage_Payment_Block_Info { - protected $_payableTo; protected $_mailingAddress; diff --git a/app/code/core/Mage/Payment/Exception.php b/app/code/core/Mage/Payment/Exception.php index 1a21b6b18fb..126029719a4 100644 --- a/app/code/core/Mage/Payment/Exception.php +++ b/app/code/core/Mage/Payment/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Payment - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Payment_Exception extends Exception { diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index 112d1eb976b..111b95e2446 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -12,15 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payment module base helper * + * @category Mage + * @package Mage_Payment * @author Magento Core Team */ class Mage_Payment_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/core/Mage/Payment/Model/Info.php b/app/code/core/Mage/Payment/Model/Info.php index c069886f6ce..66ed4d9e3b6 100644 --- a/app/code/core/Mage/Payment/Model/Info.php +++ b/app/code/core/Mage/Payment/Model/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Payment - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Sales_Model_Order getOrder() * @method Mage_Sales_Model_Quote getQuote() diff --git a/app/code/core/Mage/Payment/Model/Info/Exception.php b/app/code/core/Mage/Payment/Model/Info/Exception.php index 3736a740150..cd77f20d00a 100644 --- a/app/code/core/Mage/Payment/Model/Info/Exception.php +++ b/app/code/core/Mage/Payment/Model/Info/Exception.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,5 +29,4 @@ */ class Mage_Payment_Model_Info_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php index 829d51205a8..118bf01ee7e 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php @@ -27,7 +27,6 @@ */ class Mage_Payment_Model_Method_Cashondelivery extends Mage_Payment_Model_Method_Abstract { - /** * Payment method code * diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php index 5639e4038de..b3f3eb6a015 100644 --- a/app/code/core/Mage/Payment/Model/Method/Free.php +++ b/app/code/core/Mage/Payment/Model/Method/Free.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Payment + * @category Mage + * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php index 99bb0fe4946..119145a5807 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Settlement reports transaction details * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_Settlement_Details extends Mage_Adminhtml_Block_Widget_Form_Container { diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php index 49fcdc1b454..dadd34f30aa 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Settlement reports transaction details * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_Settlement_Details_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php index 8738e22ebff..afa5441a7f3 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml paypal settlement reports grid block * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php index 621b9935f74..f6f846664aa 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php index b0eb9fe10a0..2feb21c8823 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for deprecated PayPal solutions * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated extends Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php index fa749ce2d7f..483b642e8ab 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fielset renderer which expanded by default * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded extends Mage_Adminhtml_Block_System_Config_Form_Fieldset diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php index 3438a5c7d1f..bbb50bd3898 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php @@ -12,15 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for PayPal global settings - * @author Magento Core Team + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated since 1.7.0.1 */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Global diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php index d2f3eb2267e..067cd29e924 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for PayPal solutions group * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Group extends Mage_Adminhtml_Block_System_Config_Form_Fieldset diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php index c104d5a6725..0c8d5ced137 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Renderer for PayPal banner in System Configuration * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Hint extends Mage_Adminhtml_Block_Abstract diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php index d4cf1205916..a5ee559526d 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Bml/Form.php b/app/code/core/Mage/Paypal/Block/Bml/Form.php index e8326a585e3..e2f9338c99c 100644 --- a/app/code/core/Mage/Paypal/Block/Bml/Form.php +++ b/app/code/core/Mage/Paypal/Block/Bml/Form.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bill Me Later payment form + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Bml_Form extends Mage_Paypal_Block_Express_Form { diff --git a/app/code/core/Mage/Paypal/Block/Express/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php index 79b33ec55f3..96974730ba0 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Form.php +++ b/app/code/core/Mage/Paypal/Block/Express/Form.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Standard payment "form" + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Express_Form extends Mage_Paypal_Block_Standard_Form { diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php index 147f7958eb5..a30906c6912 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Paypal - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Paypal_Block_Express_Review_Details extends Mage_Checkout_Block_Cart_Totals { diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php index 58837e4ea62..97bb2e3ca19 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ class Mage_Paypal_Block_Hosted_Pro_Form extends Mage_Payment_Block_Form { /** - * Internal constructor * Set info template for payment step * */ diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php index 3757788d5e5..d2794de62de 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,9 +28,7 @@ class Mage_Paypal_Block_Hosted_Pro_Iframe extends Mage_Paypal_Block_Iframe { /** - * Internal constructor * Set payment method code - * */ protected function _construct() { @@ -40,7 +38,6 @@ protected function _construct() /** * Get iframe action URL - * * @return string */ public function getFrameActionUrl() diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php index 9f6e0f274f1..5146557881e 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Iframe.php b/app/code/core/Mage/Paypal/Block/Iframe.php index 1cfeb6dba10..1d3f1be8cd0 100644 --- a/app/code/core/Mage/Paypal/Block/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Iframe.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,14 +29,12 @@ class Mage_Paypal_Block_Iframe extends Mage_Payment_Block_Form { /** * Whether the block should be eventually rendered - * * @var bool */ protected $_shouldRender = false; /** * Order object - * * @var Mage_Sales_Model_Order */ protected $_order; diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php index 059f1a937de..42e77c48283 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ class Mage_Paypal_Block_Payflow_Advanced_Form extends Mage_Paypal_Block_Payflow_Link_Form { /** - * Internal constructor * Set payment method code * */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php index 4a6a05b8b98..bc9cfa4ae7f 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,7 +38,6 @@ protected function _construct() /** * Get frame action URL - * * @return string */ public function getFrameActionUrl() diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php index 99a5fb9945a..236c73a1c71 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +27,4 @@ */ class Mage_Paypal_Block_Payflow_Advanced_Info extends Mage_Paypal_Block_Payflow_Link_Info { - } diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php index 0e6ab94857b..fbcbfced7ba 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ class Mage_Paypal_Block_Payflow_Link_Form extends Mage_Payment_Block_Form { /** - * Internal constructor * Set payment method code * */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php index a4a6a6c7970..822cad7caa0 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php index 9122ce46263..7914f1ed119 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Payment/Info.php b/app/code/core/Mage/Paypal/Block/Payment/Info.php index 746d577c056..04af6e62bf8 100644 --- a/app/code/core/Mage/Paypal/Block/Payment/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payment/Info.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal common payment info block * Uses default templates + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Payment_Info extends Mage_Payment_Block_Info_Cc { diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php index e66bbbf97e7..df3dcf16913 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Form.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Standard payment "form" + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Standard_Form extends Mage_Payment_Block_Form { diff --git a/app/code/core/Mage/Paypal/Exception.php b/app/code/core/Mage/Paypal/Exception.php index 9fe3fbaafc6..9e111a6b4a8 100644 --- a/app/code/core/Mage/Paypal/Exception.php +++ b/app/code/core/Mage/Paypal/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + */ class Mage_Paypal_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index 9b778a7232a..dc68fd7e0fe 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paypal Data helper + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Paypal/Helper/Hss.php b/app/code/core/Mage/Paypal/Helper/Hss.php index 3d123d16068..d57bbac475e 100644 --- a/app/code/core/Mage/Paypal/Helper/Hss.php +++ b/app/code/core/Mage/Paypal/Helper/Hss.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Hosted Sole Solution helper + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Helper_Hss extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index 7a09e89d161..7e02acab4f8 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -12,17 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * * PayPal Direct Module * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Direct extends Mage_Payment_Model_Method_Cc { diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index d2a16d5b5eb..101f0961a1d 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -12,15 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * - * PayPal Express Module + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Express extends Mage_Payment_Model_Method_Abstract implements Mage_Payment_Model_Recurring_Profile_MethodInterface diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro.php b/app/code/core/Mage/Paypal/Model/Hostedpro.php index 7c1d023557d..c13819470f5 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro.php @@ -12,20 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Website Payments Pro Hosted Solution payment gateway model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Model_Hostedpro extends Mage_Paypal_Model_Direct { /** diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php index 7c6a6f0af7c..a8d5f0d7e9d 100644 --- a/app/code/core/Mage/Paypal/Model/Info.php +++ b/app/code/core/Mage/Paypal/Model/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +24,10 @@ * Aware of all PayPal payment methods * Collects and provides access to PayPal-specific payment data * Provides business logic information about payment flow + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Info { diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php index ae5fbf14175..2c01acfa3cd 100644 --- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php +++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php @@ -342,5 +342,4 @@ public function getConfigPaymentAction() { return $this->_pro->getConfig()->getPaymentAction(); } - } diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php index 89040179931..28435cb24b0 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for available settlement report fetching intervals + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_FetchingSchedule { diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php index df0c3f2f1e1..7511602d5e8 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php @@ -12,20 +12,22 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for available paypal express payment actions + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_PaymentActions_Express { /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Paypal/controllers/ExpressController.php b/app/code/core/Mage/Paypal/controllers/ExpressController.php index b201cb7c5c1..12303bdd13d 100644 --- a/app/code/core/Mage/Paypal/controllers/ExpressController.php +++ b/app/code/core/Mage/Paypal/controllers/ExpressController.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Express Checkout Controller + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_ExpressController extends Mage_Paypal_Controller_Express_Abstract { diff --git a/app/code/core/Mage/Paypal/controllers/HostedproController.php b/app/code/core/Mage/Paypal/controllers/HostedproController.php index 7ad943aad8c..f1fdd2a1d11 100644 --- a/app/code/core/Mage/Paypal/controllers/HostedproController.php +++ b/app/code/core/Mage/Paypal/controllers/HostedproController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php index 574be0276bf..cf01b466ac4 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php index 92e7601c1be..e957e5bfdde 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php index 458129c9b68..7aeffd5588d 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php index ad4237127e1..2b5ebf93f73 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php index 366d0d53c3a..70bf2274816 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php @@ -12,18 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Paypal + * @category Mage + * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Paypal_Model_Resource_Setup $installer */ $installer = $this; - -/** - * Prepare database for install - */ $installer->startSetup(); /** diff --git a/app/code/core/Mage/PaypalUk/Block/Bml/Form.php b/app/code/core/Mage/PaypalUk/Block/Bml/Form.php index b9643a5a149..407c033717e 100644 --- a/app/code/core/Mage/PaypalUk/Block/Bml/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Bml/Form.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bill Me Later payment form + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Block_Bml_Form extends Mage_Paypal_Block_Bml_Form { diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Form.php b/app/code/core/Mage/PaypalUk/Block/Express/Form.php index ff1d9d58ef2..dc50c4de60a 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Form.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team + */ class Mage_PaypalUk_Block_Express_Form extends Mage_Paypal_Block_Express_Form { /** @@ -25,5 +30,4 @@ class Mage_PaypalUk_Block_Express_Form extends Mage_Paypal_Block_Express_Form * @var string */ protected $_methodCode = Mage_Paypal_Model_Config::METHOD_WPP_PE_EXPRESS; - } diff --git a/app/code/core/Mage/PaypalUk/Helper/Data.php b/app/code/core/Mage/PaypalUk/Helper/Data.php index ff835badfb7..0417742811c 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -12,16 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PaypalUk data helper + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/PaypalUk/Model/Direct.php b/app/code/core/Mage/PaypalUk/Model/Direct.php index 4e10b683931..20481b41bb9 100644 --- a/app/code/core/Mage/PaypalUk/Model/Direct.php +++ b/app/code/core/Mage/PaypalUk/Model/Direct.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPalUk Direct Module + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Direct extends Mage_Paypal_Model_Direct { diff --git a/app/code/core/Mage/PaypalUk/Model/Express.php b/app/code/core/Mage/PaypalUk/Model/Express.php index 024b3f949c1..2e796f6faf6 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express.php +++ b/app/code/core/Mage/PaypalUk/Model/Express.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * PayPalUk Express Module + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Express extends Mage_Paypal_Model_Express { diff --git a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php index 1b2f713febd..34d7131ab4b 100644 --- a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php +++ b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php @@ -12,16 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Express Checkout Controller + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ - class Mage_PaypalUk_ExpressController extends Mage_Paypal_Controller_Express_Abstract { /** diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php index a729caeaff6..f2ea73e307e 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php @@ -12,11 +12,11 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_PaypalUk + * @category Mage + * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; diff --git a/app/code/core/Mage/Persistent/Helper/Data.php b/app/code/core/Mage/Persistent/Helper/Data.php index dd70ffa7d82..719da1828f7 100644 --- a/app/code/core/Mage/Persistent/Helper/Data.php +++ b/app/code/core/Mage/Persistent/Helper/Data.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Persistent + * @category Mage + * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Persistent/controllers/IndexController.php b/app/code/core/Mage/Persistent/controllers/IndexController.php index 752afedc564..ad998187373 100644 --- a/app/code/core/Mage/Persistent/controllers/IndexController.php +++ b/app/code/core/Mage/Persistent/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Persistent + * @category Mage + * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php index 887d7d90125..917d96d3b34 100644 --- a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Persistent + * @category Mage + * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index fcf4103c5cb..684437b57c0 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -12,16 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Poll + * @category Mage + * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Poll data helper + * @category Mage + * @package Mage_Poll + * @author Magento Core Team */ class Mage_Poll_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php index a455f01c6d9..cd511c6c9cf 100644 --- a/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php @@ -12,14 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Poll + * @category Mage + * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; $pollModel = Mage::getModel('poll/poll'); diff --git a/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php index 13fb5b45037..1df368b4f69 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php @@ -12,16 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Poll + * @category Mage + * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; - $installer->startSetup(); /** diff --git a/app/code/core/Mage/ProductAlert/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php index afeb9716a1a..72b94b362b3 100644 --- a/app/code/core/Mage/ProductAlert/Helper/Data.php +++ b/app/code/core/Mage/ProductAlert/Helper/Data.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ProductAlert + * @category Mage + * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @author Magento Core Team */ class Mage_ProductAlert_Helper_Data extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php index c394e3dc6fb..eb7ac469c13 100644 --- a/app/code/core/Mage/ProductAlert/Model/Email.php +++ b/app/code/core/Mage/ProductAlert/Model/Email.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ProductAlert + * @category Mage + * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php index c5cb5a3e3df..ab196ec51de 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php @@ -12,23 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ProductAlert + * @category Mage + * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * ProductAlert install - * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team - */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + /** * Create table 'productalert/price' */ diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php index 64e7e409b06..6d0f63549fc 100644 --- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php +++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rating - * @author Magento Core Team + * @author Magento Core Team * * @method $this setEntityId(int $value) */ diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index e48325d6946..23ab7ab656f 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -12,16 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Rating data helper + * @category Mage + * @package Mage_Rating + * @author Magento Core Team */ class Mage_Rating_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php index fac81374c01..40f728d598e 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating entity resource * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @category Mage + * @package Mage_Rating + * @author Magento Core Team * @deprecated */ class Mage_Rating_Model_Mysql4_Rating_Entity extends Mage_Rating_Model_Resource_Rating_Entity diff --git a/app/code/core/Mage/Rating/Model/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Rating/Entity.php index 2f68533f6bd..33f73250f3a 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Rating/Entity.php @@ -12,25 +12,24 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Ratings entity model * + * @category Mage + * @package Mage_Rating + * @author Magento Core Team + * * @method Mage_Rating_Model_Resource_Rating_Entity _getResource() * @method Mage_Rating_Model_Resource_Rating_Entity getResource() * @method string getEntityCode() * @method Mage_Rating_Model_Rating_Entity setEntityCode(string $value) - * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team */ - class Mage_Rating_Model_Rating_Entity extends Mage_Core_Model_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php index b1a420834bf..43c14b2bec9 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating entity resource * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @category Mage + * @package Mage_Rating + * @author Magento Core Team */ class Mage_Rating_Model_Resource_Rating_Entity extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php index 1d6e77134ee..6d81a5906aa 100644 --- a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php @@ -12,18 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Rating data install - * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php index 526ef3cfd3a..3a492f0e3bb 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php @@ -12,22 +12,14 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rating + * @category Mage + * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * Rating install - * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team - */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Reports/Exception.php b/app/code/core/Mage/Reports/Exception.php index a6cc4fd7497..ba2d22d1c3c 100644 --- a/app/code/core/Mage/Reports/Exception.php +++ b/app/code/core/Mage/Reports/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + */ class Mage_Reports_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index d1124499270..5f0c5206a88 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Reports data helper + * @category Mage + * @package Mage_Reports + * @author Magento Core Team */ class Mage_Reports_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Event.php b/app/code/core/Mage/Reports/Model/Event.php index b296ab233c7..39b8bacfb5d 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Flag.php b/app/code/core/Mage/Reports/Model/Flag.php index a470b10d380..8df9a3ea3b6 100644 --- a/app/code/core/Mage/Reports/Model/Flag.php +++ b/app/code/core/Mage/Reports/Model/Flag.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php index ef5c9a2bf4e..70155e6ee5d 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Report events resource model * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @category Mage + * @package Mage_Reports + * @author Magento Core Team * @deprecated */ class Mage_Reports_Model_Mysql4_Event extends Mage_Reports_Model_Resource_Event diff --git a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php index da7845bc892..d1987b9b4d6 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Reports_Model_Resource_Accounts_Collection extends Mage_Reports_Model_Resource_Customer_Collection { - /** * Join created_at and accounts fields * diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php index 00d7abf3dd0..5dd5e2633da 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Report events resource model * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @category Mage + * @package Mage_Reports + * @author Magento Core Team */ class Mage_Reports_Model_Resource_Event extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php index 8e0810a0be9..5bd4d102422 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Reports_Model_Resource_Quote_Collection extends Mage_Sales_Model_Resource_Quote_Collection { - const SELECT_COUNT_SQL_TYPE_CART = 1; protected $_selectCountSqlType = 0; diff --git a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php index 242722fe7a7..84c1ffcfc81 100644 --- a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; -/* - * Prepare database for data upgrade - */ $installer->startSetup(); + /* * Report Event Types default data */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php index 721f42dd934..07230fff8a3 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php @@ -12,18 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Reports + * @category Mage + * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; -/* - * Prepare database for tables install - */ $installer->startSetup(); + /** * Create table 'reports/event_type' */ diff --git a/app/code/core/Mage/Review/Block/Form.php b/app/code/core/Mage/Review/Block/Form.php index 07132ca3d02..2a40fb9583e 100644 --- a/app/code/core/Mage/Review/Block/Form.php +++ b/app/code/core/Mage/Review/Block/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Review + * @category Mage + * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team * * @method bool getAllowWriteReviewFlag() * @method $this setAllowWriteReviewFlag(bool $value) diff --git a/app/code/core/Mage/Review/Block/Helper.php b/app/code/core/Mage/Review/Block/Helper.php index 1dce7ba956c..2dea7aea2a5 100644 --- a/app/code/core/Mage/Review/Block/Helper.php +++ b/app/code/core/Mage/Review/Block/Helper.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Review + * @category Mage + * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php index b56066e1cff..81cdaf6c131 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -12,15 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Review + * @category Mage + * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default review helper * + * @category Mage + * @package Mage_Review * @author Magento Core Team */ class Mage_Review_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php index 0a92649ea16..e2513681ef9 100644 --- a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php @@ -12,18 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Review + * @category Mage + * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Review data install - * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Rss/Block/Order/Details.php b/app/code/core/Mage/Rss/Block/Order/Details.php index 25ddd10c7ff..e31bbf16b9b 100644 --- a/app/code/core/Mage/Rss/Block/Order/Details.php +++ b/app/code/core/Mage/Rss/Block/Order/Details.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rss + * @category Mage + * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Rss + * @author Magento Core Team */ class Mage_Rss_Block_Order_Details extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Rss/Helper/Catalog.php b/app/code/core/Mage/Rss/Helper/Catalog.php index 8ba2c47b75c..294a54edadf 100644 --- a/app/code/core/Mage/Rss/Helper/Catalog.php +++ b/app/code/core/Mage/Rss/Helper/Catalog.php @@ -27,7 +27,6 @@ */ class Mage_Rss_Helper_Catalog extends Mage_Core_Helper_Abstract { - /** * @return string */ @@ -42,5 +41,4 @@ public function getTagFeedUrl() } return $url; } - } diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php index 6bde36e253a..d8a076218e1 100644 --- a/app/code/core/Mage/Rss/Helper/Data.php +++ b/app/code/core/Mage/Rss/Helper/Data.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rss + * @category Mage + * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index 7c323e5a59f..217e687ce30 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -12,17 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rss + * @category Mage + * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Poll index controller * - * @file IndexController.php - * @author Magento Core Team + * @category Mage + * @package Mage_Rss + * @author Magento Core Team */ class Mage_Rss_IndexController extends Mage_Rss_Controller_Abstract { diff --git a/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php index 32708b126ec..307f1bd4b76 100644 --- a/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php @@ -12,14 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rss + * @category Mage + * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ - $installer = $this; $this->deleteConfigData(Mage_Rss_Helper_Data::XML_PATH_RSS_ACTIVE); diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php index c1c799576bf..eaea690541f 100644 --- a/app/code/core/Mage/Rule/Block/Editable.php +++ b/app/code/core/Mage/Rule/Block/Editable.php @@ -12,17 +12,20 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rule + * @category Mage + * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + */ class Mage_Rule_Block_Editable extends Mage_Core_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { /** - * Render element - * * @param Varien_Data_Form_Element_Abstract $element * @see Varien_Data_Form_Element_Renderer_Interface::render() * @return string diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 80d760cd76c..14f623c0311 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -12,16 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rule + * @category Mage + * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Rule data helper + * @category Mage + * @package Mage_Rule + * @author Magento Core Team */ class Mage_Rule_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/Rule/Model/Environment.php b/app/code/core/Mage/Rule/Model/Environment.php index 28d16e2969e..e032fc11653 100644 --- a/app/code/core/Mage/Rule/Model/Environment.php +++ b/app/code/core/Mage/Rule/Model/Environment.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Rule + * @category Mage + * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Rule_Model_Environment * + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + * * @method $this setNow(int $value) */ class Mage_Rule_Model_Environment extends Varien_Object diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php index d8d8f873edc..ba51ec60a6e 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php @@ -28,5 +28,4 @@ */ class Mage_Rule_Model_Resource_Rule_Collection extends Mage_Rule_Model_Resource_Rule_Collection_Abstract { - } diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php index e8071c5faf7..7645c7f9696 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml billing agreements grid * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php index 5900f456454..af53317b506 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml billing agreement view plane * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View_Form extends Mage_Adminhtml_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php index b6e0958afb3..8836e902157 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml billing agreement info tab * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * * @method $this setCreatedAt(string $formatDate) * @method $this setCustomerEmail(string $value) diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php index 87a84c38592..edfe872e359 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile editing form * Can work in scope of product edit form + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Recurring_Profile_Edit_Form extends Mage_Adminhtml_Block_Abstract { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php index 64e80fa1ef0..f3e9795bdc0 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Recurring profiles grid + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Recurring_Profile_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php index 7b6ee9d93fc..1c7d71ed0d5 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Recurring_Profile_View_Getawayinfo extends Mage_Adminhtml_Block_Widget { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php index 35f7dfd57ee..b964a058406 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Recurring_Profile_View_Info extends Mage_Adminhtml_Block_Widget { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php index 83c6c3076b0..b51015c5f1a 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php @@ -12,14 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile information tab + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method string getLabel() */ class Mage_Sales_Block_Adminhtml_Recurring_Profile_View_Tab_Info extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php index b5e2e97a165..827f5df1b36 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Details.php b/app/code/core/Mage/Sales/Block/Order/Details.php index e64fbc1525d..9ba4773d37e 100644 --- a/app/code/core/Mage/Sales/Block/Order/Details.php +++ b/app/code/core/Mage/Sales/Block/Order/Details.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +23,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Block_Order_Details extends Mage_Core_Block_Template { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php index f1b1353a939..5739aeb0fcf 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php index ff5e5e45e39..b79eadc1eb1 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php index dcfe1c5c79d..50333743143 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/History.php b/app/code/core/Mage/Sales/Block/Order/History.php index f97ae75f76d..e5fb48cd00b 100644 --- a/app/code/core/Mage/Sales/Block/Order/History.php +++ b/app/code/core/Mage/Sales/Block/Order/History.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +23,13 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Sales_Model_Resource_Order_Collection getOrders() * @method $this setOrders(Mage_Sales_Model_Resource_Order_Collection $value) */ class Mage_Sales_Block_Order_History extends Mage_Core_Block_Template { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Sales/Block/Order/Info.php b/app/code/core/Mage/Sales/Block/Order/Info.php index bd1e89e3ea1..48871e649b4 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info.php +++ b/app/code/core/Mage/Sales/Block/Order/Info.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice view comments form * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Order_Info extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php index ac312dc97be..96a547e96ba 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order item render block * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Order_Item_Renderer_Default extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php index fd9129df5cc..c0c5ccc26c8 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order item render block for grouped product type * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Order_Item_Renderer_Grouped extends Mage_Sales_Block_Order_Item_Renderer_Default { diff --git a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php index 7dfaedb6854..4e2b293b2d1 100644 --- a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php +++ b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Block_Widget_Guest_Form extends Mage_Core_Block_Template implements Mage_Widget_Block_Interface { /** diff --git a/app/code/core/Mage/Sales/Exception.php b/app/code/core/Mage/Sales/Exception.php index 988157ad635..f248c4f6135 100644 --- a/app/code/core/Mage/Sales/Exception.php +++ b/app/code/core/Mage/Sales/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/Sales/Helper/Data.php b/app/code/core/Mage/Sales/Helper/Data.php index 35f1ceff961..795de997f07 100644 --- a/app/code/core/Mage/Sales/Helper/Data.php +++ b/app/code/core/Mage/Sales/Helper/Data.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales module base helper * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Helper_Data extends Mage_Core_Helper_Data { diff --git a/app/code/core/Mage/Sales/Helper/Guest.php b/app/code/core/Mage/Sales/Helper/Guest.php index 6c511533eb3..6f4c4dc0e7c 100644 --- a/app/code/core/Mage/Sales/Helper/Guest.php +++ b/app/code/core/Mage/Sales/Helper/Guest.php @@ -12,16 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales module base helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Helper_Guest extends Mage_Core_Helper_Data { diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php index 2ec8f837f37..073b670a079 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Sales_Model_Entity_Order_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract { - protected function _construct() { $this->_init('sales/order_address'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php index d937faf94e9..d2a39da3b0b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +23,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Model_Entity_Order_Status_History extends Mage_Eav_Model_Entity_Abstract { - public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php index e8559beeec6..4a74fa88fcf 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Sales_Model_Entity_Order_Status_History_Collection extends Mage_Eav_Model_Entity_Collection_Abstract { - protected function _construct() { $this->_init('sales/order_status_history'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php index e3a348e1349..82b9ac629a2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php index e0a448b2b84..e1e6fbc82d5 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php index 5aafa166e34..ac98fb74c0b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index 7c4faef95ac..771cef6ab79 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -25,7 +25,6 @@ */ class Mage_Sales_Model_Entity_Sale_Collection extends Varien_Object implements IteratorAggregate { - /** * Read connection * diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php index 4f06a44ab1f..e2cc30483b5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order status history resource * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Order_Status_History extends Mage_Sales_Model_Resource_Order_Status_History diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php index 533886d2b09..971d76e2ec0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php index d9ae5979f82..3157f8f2bcd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php index e96d073f6b2..39dc0c79b50 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php index c86c7fbfa6c..25ccb3fe288 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php @@ -27,7 +27,6 @@ */ class Mage_Sales_Model_Order_Creditmemo_Api extends Mage_Sales_Model_Api_Resource { - /** * Initialize attributes mapping */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php index f38cc9b985e..ed5ee7f2cdf 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Order_Creditmemo_Total_Discount extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php index 6f321b5face..0a06d8b8706 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Order_Creditmemo_Total_Grand extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php index f40246a6fc4..50428c15073 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Order_Invoice_Total_Discount extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php index cf588e08ee8..9aa3fe9397c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + */ class Mage_Sales_Model_Order_Invoice_Total_Grand extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php index 2a41436e687..a3a177f27dd 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php index be6ef344b67..2cc721e504d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +27,6 @@ */ class Mage_Sales_Model_Order_Pdf_Items_Creditmemo_Grouped extends Mage_Sales_Model_Order_Pdf_Items_Creditmemo_Default { - /** - * Draw process - */ public function draw() { $type = $this->getItem()->getOrderItem()->getRealProductType(); diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php index f2dc4dab214..f0f67137397 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php index a80993817ec..71ddcb2cc3d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +27,6 @@ */ class Mage_Sales_Model_Order_Pdf_Items_Invoice_Grouped extends Mage_Sales_Model_Order_Pdf_Items_Invoice_Default { - /** - * Draw process - */ public function draw() { $type = $this->getItem()->getOrderItem()->getRealProductType(); diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php index a5bcf2d2cf3..513bef89df0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php index 352b13e28e7..58c42d600ea 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +24,7 @@ * @category Mage * @package Mage_Sales * @author Magento Core Team + * * @method string getAmountPrefix() * @method bool getDisplayZero() * @method int getFontSize() diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php index 2c1e849d762..1f927e779aa 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order status history comments * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Status_History _getResource() * @method Mage_Sales_Model_Resource_Order_Status_History getResource() * @method string getComment() @@ -36,10 +40,6 @@ * @method $this setStoreId(int $value) * @method int getIsVisibleOnFront() * @method $this setIsVisibleOnFront(int $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Status_History extends Mage_Sales_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php index 09d16c7da0f..a01fe001c15 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Sales_Model_Quote_Address_Total_Discount + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php index 35b5b6b9807..3cfdbdc1fc4 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Model to calculate grand total or an order * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Grand extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php index 4dc6e3c6f5b..54ff49a07a8 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Total model for recurring profile initial fee + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Recurring_Initial extends Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php index 0a3c8d1a37d..67060f5f883 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php @@ -12,31 +12,28 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order status history resource * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Status_History extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_resource'; /** * Model initialization - * */ protected function _construct() { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php index 6bebde2ee3a..2c7e0610b2d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address attribute frontend resource model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php index 79dbe7faae2..9836463fdb4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address attribute frontend discount resource model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php index 7217625d836..14d94f4ba07 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address attribute frontend grand resource model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php index f065934fe5f..fa6f33c9314 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php @@ -27,7 +27,6 @@ */ class Mage_Sales_Model_Resource_Sale_Collection extends Varien_Data_Collection_Db { - /** * Totals data * diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php index 24f5f7caa25..05c3524e59e 100644 --- a/app/code/core/Mage/Sales/controllers/DownloadController.php +++ b/app/code/core/Mage/Sales/controllers/DownloadController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +25,8 @@ * @package Mage_Sales * @author Magento Core Team */ - class Mage_Sales_DownloadController extends Mage_Core_Controller_Front_Action { - /** * Custom options downloader * diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php index ad5f80de6fc..d3c627ac989 100644 --- a/app/code/core/Mage/Sales/controllers/GuestController.php +++ b/app/code/core/Mage/Sales/controllers/GuestController.php @@ -12,20 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales orders controller * * @category Mage - * @package MAbout This Orderage_Sales - * @author Magento Core Team + * @package Mage_Sales + * @author Magento Core Team */ - class Mage_Sales_GuestController extends Mage_Sales_Controller_Abstract { /** diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php index 46affa8e95f..bc2bbef9d8c 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php index 27b585d6bd7..3e2f1c86d46 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sales + * @category Mage + * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ diff --git a/app/code/core/Mage/SalesRule/Exception.php b/app/code/core/Mage/SalesRule/Exception.php index 903bc5fefc1..7b4badced98 100644 --- a/app/code/core/Mage/SalesRule/Exception.php +++ b/app/code/core/Mage/SalesRule/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + */ class Mage_SalesRule_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index 699f4fb1937..c594dcbcb3a 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * SalesRule data helper + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php index e9952919ca9..a19142da329 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Discount calculation model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Quote_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php index 71238409e5d..1123a86c2a6 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_SalesRule_Model_Quote_Freeshipping + * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Quote_Freeshipping extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php index 5437658fa72..21d014f0c75 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Nominal discount total + * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Quote_Nominal_Discount extends Mage_SalesRule_Model_Quote_Discount { diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php index f7c366e19e4..cd6e2daabb4 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_SalesRule_Model_Rule_Condition_Product_Found * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + * * @method setValueOption(array $array) */ class Mage_SalesRule_Model_Rule_Condition_Product_Found extends Mage_SalesRule_Model_Rule_Condition_Product_Combine diff --git a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php index 4ad282d76b3..3fe2268e6b7 100644 --- a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php +++ b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_SalesRule + * @category Mage + * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Options for Code Format Field in Auto Generated Specific Coupon Codes configuration section * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_System_Config_Source_Coupon_Format { diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index d5db7852390..c6944615d95 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sendfriend + * @category Mage + * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sendfriend Data Helper * - * @category Mage - * @package Mage_Sedfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sedfriend + * @author Magento Core Team */ class Mage_Sendfriend_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Shipping/Exception.php b/app/code/core/Mage/Shipping/Exception.php index e8da459aaea..3adb607520c 100644 --- a/app/code/core/Mage/Shipping/Exception.php +++ b/app/code/core/Mage/Shipping/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + */ class Mage_Shipping_Exception extends Zend_Exception { - } diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index 08a51a2f2ad..db67c44df6f 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Shipping data helper + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php index b09e3324e8c..7096aabe620 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +23,13 @@ * * @category Mage * @package Mage_Shipping - * @author Magento Core Team + * @author Magento Core Team * * @method int getFreeBoxes() * @method $this setFreeBoxes(int $value) */ class Mage_Shipping_Model_Carrier_Flatrate extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - protected $_code = 'flatrate'; protected $_isFixed = true; diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index 91e836df171..9ada6e4cc6f 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +23,10 @@ * * @category Mage * @package Mage_Shipping - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Shipping_Model_Carrier_Freeshipping extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - /** * Carrier's code * diff --git a/app/code/core/Mage/Shipping/Model/Info.php b/app/code/core/Mage/Shipping/Model/Info.php index 3ea04c6babd..5e6e8ab6886 100644 --- a/app/code/core/Mage/Shipping/Model/Info.php +++ b/app/code/core/Mage/Shipping/Model/Info.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Shipping_Model_Info * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method int getOrderId() * @method string getProtectCode() * @method $this setProtectCode(string $value) diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php index 624e04c514b..6ce9f39c394 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php @@ -32,5 +32,4 @@ */ class Mage_Shipping_Model_Rate_Result_Abstract extends Varien_Object { - } diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php index b6801714334..d5472afa90a 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php @@ -12,15 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Shipping_Model_Rate_Result_Error * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method $this setCarrier(string $value) * @method $this setCarrierTitle(string $value) * @method $this setErrorMessage(string $value) diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php index e2c0ea8ebec..2af4241cb3f 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Source_HandlingAction { diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php index fd1978650b2..4e5fccfeda7 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Source_HandlingType { diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php index db356cfcda3..1cc8d8fe27f 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Shipping + * @category Mage + * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + */ class Mage_Shipping_Model_Tracking_Result_Error extends Mage_Shipping_Model_Tracking_Result_Abstract { /** diff --git a/app/code/core/Mage/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index 80e170b5f24..5e56bd7f2ec 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -12,19 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Sitemap + * @category Mage + * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Sitemap data helper - * - * @category Mage - * @package Mage_Sitemap + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team */ class Mage_Sitemap_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index 483a912b512..38e269cf85c 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tag + * @category Mage + * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Tag data helper + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ class Mage_Tag_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index 69a6586c684..dd00cf47a8a 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tag + * @category Mage + * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Tag_IndexController extends Mage_Core_Controller_Front_Action { /** diff --git a/app/code/core/Mage/Tax/Block/Checkout/Discount.php b/app/code/core/Mage/Tax/Block/Checkout/Discount.php index 1e8500794c5..991c5c48890 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Discount.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Discount.php @@ -12,18 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Subtotal Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ - class Mage_Tax_Block_Checkout_Discount extends Mage_Checkout_Block_Total_Default { //protected $_template = 'tax/checkout/subtotal.phtml'; diff --git a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php index 35f84b72a00..e36233a71f5 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php @@ -12,18 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Subtotal Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ - class Mage_Tax_Block_Checkout_Grandtotal extends Mage_Checkout_Block_Total_Default { protected $_template = 'tax/checkout/grandtotal.phtml'; diff --git a/app/code/core/Mage/Tax/Exception.php b/app/code/core/Mage/Tax/Exception.php index 5e28a15e125..aa6ea22fa5b 100644 --- a/app/code/core/Mage/Tax/Exception.php +++ b/app/code/core/Mage/Tax/Exception.php @@ -12,13 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + */ class Mage_Tax_Exception extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index 1a747afc712..35ad0d95b8f 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -12,14 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Catalog data helper + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Config/Price/Include.php b/app/code/core/Mage/Tax/Model/Config/Price/Include.php index 6db47b682e1..f5c053e5880 100644 --- a/app/code/core/Mage/Tax/Model/Config/Price/Include.php +++ b/app/code/core/Mage/Tax/Model/Config/Price/Include.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Config_Price_Include extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php index 6090999365e..c31a4aa0a7c 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + */ class Mage_Tax_Model_Sales_Pdf_Grandtotal extends Mage_Sales_Model_Order_Pdf_Total_Default { /** diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php index f05642a97a2..50106650c3b 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php @@ -12,14 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax discount totals calculation model + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php index 6de8c6c4c77..31d325c3cce 100644 --- a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php @@ -12,13 +12,15 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Tax + * @category Mage + * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; + /** * install tax classes */ diff --git a/app/code/core/Mage/Uploader/Helper/Data.php b/app/code/core/Mage/Uploader/Helper/Data.php index 71ffca4fa6f..a045d4dfade 100644 --- a/app/code/core/Mage/Uploader/Helper/Data.php +++ b/app/code/core/Mage/Uploader/Helper/Data.php @@ -12,18 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Uploader + * @category Mage + * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Uploader data helper - * - * Class Mage_Uploader_Helper_Data + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team */ class Mage_Uploader_Helper_Data extends Mage_Core_Helper_Abstract { - } diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php index ed2f349e3e3..c35dce2f8fc 100644 --- a/app/code/core/Mage/Uploader/Helper/File.php +++ b/app/code/core/Mage/Uploader/Helper/File.php @@ -12,20 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Uploader + * @category Mage + * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * File Helper - * - * @category Mage - * @package Mage_Uploader - * @author Magento Core Team + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team */ - class Mage_Uploader_Helper_File extends Mage_Core_Helper_Abstract { /** @@ -749,5 +746,4 @@ public function getDataMaxSizeInBytes() } return (int)$parsedSize; } - } diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php index 9e4c10ddc09..224d797f653 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -12,15 +12,15 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Usa data helper - * + * @category Mage + * @package Mage_Usa * @author Magento Core Team */ class Mage_Usa_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php index 2c7160c472f..2bc7ea8aafa 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php @@ -27,7 +27,6 @@ */ abstract class Mage_Usa_Model_Shipping_Carrier_Abstract extends Mage_Shipping_Model_Carrier_Abstract { - const USA_COUNTRY_ID = 'US'; const PUERTORICO_COUNTRY_ID = 'PR'; const GUAM_COUNTRY_ID = 'GU'; diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index bb48d1e5e90..c6caa637898 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +23,12 @@ * * @category Mage * @package Mage_Usa - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Dhl extends Mage_Usa_Model_Shipping_Carrier_Dhl_Abstract implements Mage_Shipping_Model_Carrier_Interface { - /** * Code of the carrier * diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php index 0c042a9c05e..881187dac20 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php index 0bd540a33d5..fdda5ae515c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php index e468ca69a3d..16c78ed86c7 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php index bb1ac2d2e2f..63197ac1ac2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Usa + * @author Magento Core Team + */ class Mage_Usa_Model_Shipping_Carrier_Dhl_Source_Dutypaymenttype { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php index 7f66c7390b0..9569aae10fb 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Usa + * @author Magento Core Team + */ class Mage_Usa_Model_Shipping_Carrier_Dhl_Source_Freemethod extends Mage_Usa_Model_Shipping_Carrier_Dhl_Source_Method { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index c8dd99fdbbe..662d3212488 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +29,6 @@ class Mage_Usa_Model_Shipping_Carrier_Fedex extends Mage_Usa_Model_Shipping_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - /** * Code of the carrier * diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php index 31cb7bdb8c4..f448711b944 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php index f807e8b1816..c13ee1e7a74 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php index 48f168c9ff9..52fc6152709 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Usa * @author Magento Core Team */ - class Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod extends Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php index c45d5040f72..0e2b2ae1b9d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Usa + * @author Magento Core Team + */ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_DestType { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php index 310801682f2..ed83ae00ce2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Usa + * @author Magento Core Team + */ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Freemethod extends Mage_Usa_Model_Shipping_Carrier_Ups_Source_Method { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php index 260e850c7f1..ed19a2a80ae 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php @@ -12,12 +12,17 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Usa + * @category Mage + * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Usa + * @author Magento Core Team + */ class Mage_Usa_Model_Shipping_Carrier_Usps_Source_Freemethod extends Mage_Usa_Model_Shipping_Carrier_Usps_Source_Method { public function toOptionArray() diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php index 42b169734be..6dd3b061eb6 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -12,22 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Weee + * @category Mage + * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * WEEE data helper - * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Helper_Data extends Mage_Core_Helper_Abstract { - /** * Config Path for FPT */ diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Display.php b/app/code/core/Mage/Weee/Model/Config/Source/Display.php index 108af1c7b22..736418db793 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Display.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Display.php @@ -12,14 +12,19 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Weee + * @category Mage + * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Config_Source_Display { - /** * @return array */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php index 90bfe6ba217..a15e00a4d05 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php @@ -12,10 +12,10 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Widget * @author Magento Core Team */ - class Mage_Widget_Block_Adminhtml_Widget_Form extends Mage_Adminhtml_Block_Widget_Form { /** diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php index a6c9292b383..c617a984acb 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php @@ -12,25 +12,21 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance edit container * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php index 640a341142d..de0a9dffeb7 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance edit form * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php index 4d2f903a13f..7f15785f6a2 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance grid block * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Block_Adminhtml_Widget_Instance_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Widget/Helper/Data.php b/app/code/core/Mage/Widget/Helper/Data.php index 8e114abbdb0..55e370a3def 100644 --- a/app/code/core/Mage/Widget/Helper/Data.php +++ b/app/code/core/Mage/Widget/Helper/Data.php @@ -12,15 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Widget Data helper - * * @category Mage * @package Mage_Widget * @author Magento Core Team diff --git a/app/code/core/Mage/Widget/Model/Template/Filter.php b/app/code/core/Mage/Widget/Model/Template/Filter.php index 0628f3eba40..b4456c37821 100644 --- a/app/code/core/Mage/Widget/Model/Template/Filter.php +++ b/app/code/core/Mage/Widget/Model/Template/Filter.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Widget + * @category Mage + * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Template Filter Model * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Model_Template_Filter extends Mage_Cms_Model_Template_Filter { diff --git a/app/code/core/Mage/Widget/Model/Widget/Config.php b/app/code/core/Mage/Widget/Model/Widget/Config.php index 4e1cbe47627..b72284ada20 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Config.php +++ b/app/code/core/Mage/Widget/Model/Widget/Config.php @@ -27,7 +27,6 @@ */ class Mage_Widget_Model_Widget_Config extends Varien_Object { - /** * Return config settings for widgets insertion plugin based on editor element config * diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php index ed586ebd7a2..f9fe26875f2 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Wishlist + * @category Mage + * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist block customer item cart column * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Image extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column { diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php index 1ea2a5a4fbb..4f3a22943cd 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -12,15 +12,13 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Wishlist + * @category Mage + * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Wishlist Data Helper - * * @category Mage * @package Mage_Wishlist * @author Magento Core Team diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index 735ebf8ff96..00060e88f26 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -12,18 +12,18 @@ * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Wishlist + * @category Mage + * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist front controller * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team * * @method float getQty() * @method int getProductId()